3313 files changed, 49911 insertions, 17932 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 58ddc04892..c67c6e9601 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,2128 @@
+Sat Apr 17 04:48:35 UTC 2021
+academic/cblas: Updated for version 3.9.1.
+academic/lapacke: Updated for version 3.9.1.
+academic/octave: Updated for version 6.2.0.
+academic/pari: Updated for version 2.13.1.
+academic/sundials: Fix download link.
+audio/mixxx: Use protobuf3 as a dependency.
+audio/nas: Force single make job.
+desktop/dmenu2: Removed (unmaintained upstream).
+desktop/lxpanel: Updated for version 0.10.1.
+desktop/screenkey: Updated for version 1.4.
+desktop/xss-lock: Added (using external locker as X screensaver)
+development/Sphinx: Updated for version 3.5.4.
+development/eovim: Updated for version 0.2.0.
+development/google-go-lang: Updated for version 1.16.3.
+development/jupyter-ipykernel: Updated for version 5.5.3.
+development/lepton-eda: Updated for version 1.9.14.
+development/nim: Updated for version 1.4.6.
+development/nodejs: Fix tarball extension.
+development/postman: Updated for version 8.2.1
+development/tea: updated for version 60.0.3
+games/armagetronad: Updated for version 0.2.9.1.0.
+gis/osm2pgsql: Updated for version 1.4.2.
+gis/rasterio: Updated for version 1.2.2.
+graphics/lilypond: Updated for version 2.22.0.
+graphics/vuescan: Updated MD5SUMs.
+libraries/blas: Updated for version 3.9.1.
+libraries/iddawc: Compress man pages.
+libraries/iddawc: updated for version 0.9.9
+libraries/lapack: Updated for version 3.9.1.
+libraries/libfm-extra: Updated for version 1.3.2.
+libraries/libfm: Updated for version 1.3.2.
+libraries/libxkbcommon: Updated for version 1.2.1.
+libraries/libxlsxwriter: Updated for version 1.0.2.
+libraries/rhonabwy: updated for version 0.9.999
+libraries/skalibs: Updated for version 2.10.0.3.
+libraries/xblas: Use a versioned tarball.
+multimedia/gnash: Updated for version 0.8.11dev_20190130.
+multimedia/plexmediaserver: Updated for v 1.22.2.4282_a97b03fad.
+network/basilisk-bin: Updated for version 2021.03.17.
+network/brave-browser: Updated for version 1.23.71.
+network/hostapd: Patched for P2P/wpa_supplicant vulnerabilities.
+network/keepalived: Updated for version 2.2.2.
+network/nweb: Added (tiny web server in C).
+network/palemoon-bin: Updated for version 29.1.1.
+network/palemoon: Updated for version 29.1.1.
+network/qutebrowser-tox: Updated for version 2.2.0.
+network/qutebrowser: Updated for version 2.2.0.
+network/signal-desktop: Updated for version 5.0.0.
+network/spamassassin: Updated for version 3.4.6.
+network/unbound: Updated for version 1.13.1.
+office/calcurse: Updated for version 4.7.1.
+office/calibre-bin: Updated for version 5.15.0.
+perl/perl-Math-GMPz: Updated for version 0.50.
+perl/perl-Sidef: Updated for version 3.98.
+python/decorator: Updated for version 5.0.6.
+python/decorator: Updated for version 5.0.7.
+python/internetarchive: Updated for version 2.0.1.
+python/python-neovim: Updated for version 0.4.3.
+python/python-prometheus_client: Updated for version 0.10.1.
+python/python3-aiohttp: Updated for version 3.7.4.post0.
+python/python3-astroid: Updated for version 2.5.3.
+python/python3-ptyprocess: Updated for version 0.7.0.
+python/python3-seaborn: Updated for version 0.11.1.
+python/scikit-learn: Updated for version 0.24.1.
+python/typed_ast: Updated for version 1.4.3.
+system/android-file-transfer: Updated for version 4.2.
+system/ansible: Updated for version 2.9.20.
+system/clamav: Fix permissions to allow users to run clamscan.
+system/execline: Updated for version 2.8.0.1.
+system/lxtask: Updated for version 0.1.10.
+system/lxterminal: Updated for version 0.4.0.
+system/netdata: Updated for version 1.29.3.
+system/newLd: Update script.
+system/pax: Updated for version 20201030 (switch to MirBSD pax).
+system/pcmanfm: Updated for version 1.3.2.
+system/qdirstat: Updated for version 1.7.1.
+system/s6-linux-init: Updated for version 1.0.6.2.
+system/s6-rc: Updated for version 0.5.2.2.
+system/s6: Updated for version 2.10.0.3.
+system/telegraf: Updated for version 1.18.1.
+system/wine-staging: Updated for version 6.5.
++--------------------------+
+Sat Apr 10 10:06:04 UTC 2021
+academic/Gridcoin-Research: Updated for version 5.3.1.0
+academic/boinc: Updated for version 7.16.16
+academic/sword-data-kjv: Updated for version 1.8.1_1.
+academic/wxMaxima: Updated for version 21.01.0.
+audio/ardour: Updated for version 6.6.
+audio/ncmpcpp: Update maintainer email.
+audio/vimpc: Update maintainer email.
+development/QtPy: Added (Qt abstraction layer for Python)
+development/apache-maven: Updated for version 3.8.1.
+development/dotnet-runtime: Updated for version 3.1.13.
+development/dotnet-sdk: Updated for version 3.1.407.
+development/ghi: Update maintainer email.
+development/github-cli: Updated for version 1.8.1
+development/jupyter-ipykernel: Updated for version 5.3.4.
+development/jupyter-ipywidgets: Updated for version 7.6.3.
+development/jupyter-nbclient: Added (execution contexts).
+development/jupyter-nbconvert: Updated for version 6.0.7.
+development/jupyter-nbformat: Updated for version 5.1.3.
+development/jupyter-notebook: Updated for version 6.3.0.
+development/jupyter-qtconsole: Update dependencies.
+development/jupyter-qtconsole: Updated for version 5.0.1.
+development/jupyter_client: Remove Python 2 support.
+development/jupyter_client: Updated for version 6.1.13.
+development/jupyter_console: Change dependencies.
+development/jupyter_console: Updated for version 6.4.0.
+development/jupyter_core: Remove Python 2 support.
+development/jupyterlab_pygments: Added (theme for Pygments).
+development/mongodb-compass: Updated for version 1.26.1.
+development/neovim: Update homepage.
+development/nim: Updated for version 1.4.4.
+development/nodejs-bin: Updated for version 14.16.1.
+development/nodejs: Updated for version 12.22.1.
+development/racer: Updated for version 2.1.45.
+development/robotframework: Updated for version 4.0.1.
+development/sbcl: Updated for version 2.1.3.
+development/sdcc: Updated for version 4.1.0.
+development/slibtool: Updated for version 0.5.33.
+development/xkeys-sdk: Added (SDK for X-Keys)
+games/VASSAL: Updated for version 3.5.5.
+games/crispy-doom: Updated for version 5.10.1.
+games/freeciv: wrong md5sum
+games/steam: Updated for version 1.0.0.69
+gis/Fiona: Updated for version 1.8.19.
+gis/geopandas: Updated for version 0.9.0.
+gis/osm2pgsql: Updated for version 1.4.1.
+gis/pgsql-ogr-fdw: Updated for version 1.1.0.
+gis/qgis: Support PROJ 8.
+gis/spatialite_gui: Add a fix for the newer proj.
+graphics/mtpaint: Updated for version 3.50.
+graphics/vuescan: Updated for version 9.7.52.
+ibraries/lua-luv: Updated for version 1.36.0_0.
+libraries/Jinja2: Updated for version 2.11.3.
+libraries/aspnetcore-runtime: Updated for version 3.1.13.
+libraries/libcpuid: Updated for version 0.5.1.
+libraries/libfastjson: Updated for version 0.99.9.
+libraries/libprelude: Added (Prelude SIEM/sensor library)
+libraries/librelp: Updated for version 1.10.0.
+libraries/libvterm: Updated for version 0.1.4.
+libraries/libxkbcommon: Updated for version 1.2.0.
+libraries/libxnvctrl: Updated for version 460.67.
+libraries/luasec: Updated for version 1.0.
+libraries/opencv: Updated for version 4.5.2
+libraries/tox-extension-messages: Added (extension library for tox).
+libraries/toxext: Added (extension library for tox).
+libraries/unibilium: Updated for version 2.1.1.
+misc/mosquitto: Updated for version 2.0.10
+multimedia/LBRY: Updated for version 0.50.2.
+multimedia/droidcam: Added (Chat Program).
+multimedia/plexmediaserver: Updated for v 1.22.1.4275_48e10484b.
+multimedia/pyradio: Update maintainer email.
+multimedia/srt-to-vtt-cl: Added (convert srt files to webtvv)
+network/Electrum: Updated for version 4.1.1.
+network/anydesk: Updated for version 6.1.0.
+network/brave-browser: Updated for version 1.22.71.
+network/emailrelay: Updated for version 2.2.
+network/libteam: Added (Library for controlling networking).
+network/mumble: Updated for version 1.3.4
+network/murmur: Updated for version 1.3.4
+network/newsboat: Updated for version 2.23.
+network/openfortivpn: Updated for version 1.16.0.
+network/privoxy: Updated for version 3.0.32.
+network/prosody: Updated for version 0.11.8.
+network/protonmail-bridge: Fix download URL.
+network/qutebrowser-tox: Update pdfjs.
+network/signal-desktop: Updated for version 1.40.1.
+network/spamassassin: Updated for version 3.4.5.
+network/speedtest-cli: Updated for version 2.1.3.
+network/sslscan: Updated for version 2.0.9.
+network/teams: Added missing doinst.sh file.
+network/verm: Updated for version 1.5.2.
+network/wendzelnntpd: Added (Easy-to-use NNTP Server).
+office/MasterPDFEditor: Updated for version 5.7.53.
+office/ghostwriter: Fix for -current.
+office/mairix: Update maintainer email.
+office/mu: Update maintainer email.
+office/notmuch: Update maintainer email.
+office/nts: Update maintainer email.
+office/sc-im: Update maintainer email.
+office/taskjuggler: Update maintainer email.
+office/teapot: Update maintainer email.
+office/tnote: Update maintainer email.
+office/tpp: Update maintainer email.
+office/tudu: Update maintainer email.
+office/watson: Update maintainer email.
+python/Pygments: Updated for version 2.8.1.
+python/apprise: Added (Multiplatform Push Notifications)
+python/async_generator: Added (async iterators).
+python/backcall: Updated for version 0.2.0.
+python/bleach: Updated for version 3.3.0.
+python/decorator: Updated for version 5.0.5.
+python/nest_asyncio: Added (nested async event loops).
+python/parso: Updated for version 0.8.2.
+python/python-PySnooper: Updated for version 0.4.3.
+python/python-emoji: Updated for version 1.2.0.
+python/python-neovim: Update homepage.
+python/python-prometheus_client: Updated for version 0.10.0.
+python/python3-aiorpcX-legacy: Added (async RPC implementation)
+python/python3-jupyter-ipykernel: Removed (use jupyter-ipykernel).
+python/python3-packaging: Updated for version 20.9.
+python/python3-prompt_toolkit: Updated for version 3.0.18.
+python/python3-pylint: Updated for version 2.7.4.
+python/python3-stagger: Fix URL.
+python/sphinxcontrib-applehelp: Updated for version 1.0.2.
+python/sphinxcontrib-htmlhelp: Updated for version 1.0.3.
+ruby/chronic: Update maintainer email.
+ruby/ncurses-ruby: Update maintainer email.
+ruby/ruby-build: Updated for version 20210405.
+ruby/rubygem-mail: Update maintainer email.
+ruby/rubygem-mime-types-data: Update maintainer email.
+ruby/rubygem-mime-types: Update maintainer email.
+ruby/rubygem-mini_mime: Update maintainer email.
+ruby/rubygem-multi_json: Update maintainer email.
+ruby/rubygem-pygments: Update maintainer email.
+ruby/rubygem-sync: Update maintainer email.
+ruby/rubygem-term-ansicolor: Update maintainer email.
+ruby/rubygem-tins: Update maintainer email.
+ruby/sequel4: Update maintainer email.
+ruby/sqlite3: Update maintainer email.
+system/CPU-X: Updated for version 4.2.0.
+system/atop: Fix build.
+system/avfs: Updated for version 1.1.4.
+system/clamav: Updated for version 0.103.2.
+system/exa: Updated for version 0.10.0.
+system/fzf: Updated for version 0.27.0.
+system/intelmas: Updated for version 1.7.
+system/jenkins: Updated for version 2.277.2.
+system/letsencrypt: Updated for version 1.14.0.
+system/porg: Update maintainer email.
+system/powershell: Updated for version 7.1.3.
+system/rsyslog: Updated for version 8.2102.0.
+system/skim: Updated for version 0.9.4.
+system/worker: Updated for version 4.8.0.
++--------------------------+
+Sat Apr  3 01:49:17 UTC 2021
+academic/ds9: Updated for version 8.2.1.
+academic/rpy2: Updated for version 3.4.3.
+audio/tauonmb: Added (TauonMusicBox Player)
+desktop/kwalletcli: Updated for version 3.03.
+development/Sphinx: Updated for version 3.5.3.
+development/byacc: Updated for version 20210328.
+development/composer: Updated for version 2.0.11
+development/d-tools: Updated for version 2.096.0
+development/dmd: Updated for version 2.096.0
+development/eclipse-platform: Updated for version 4.19.
+development/git-extras: Added (GIT Utilities).
+development/github-cli: Updated for version 1.8.0.
+development/hexnet: Added (network terminal).
+development/hopper: Updated for version 4.7.3.
+development/jdk16: Added (Java Platform SDK).
+development/jupyter-nbformat: Updated for version 5.1.2.
+development/jupyter_client: Updated for version 6.1.11.
+development/jupyter_core: Updated for version 4.7.1.
+development/komodo-edit: Updated for version 12.0.1.
+development/komodo-ide: Updated for version 12.0.1.
+development/kotlin: Updated for version 1.4.32.
+development/nodejs: Updated for version 12.20.1.
+development/pkgconf: Updated for version 1.7.4.
+development/postman: Updated for version 8.0.10.
+development/shc: Updated for version 4.0.3.
+development/sqlcl: Updated for version 20.4.2.35.2359.
+development/sqldeveloper: Updated for version 20.4.1.407.0006.
+development/universal-ctags: Updated for version af30512
+development/vscode-bin: Updated for version 1.55.0.
+games/0ad: Update README.
+games/VASSAL: Updated for version 3.5.3.
+games/VASSAL: Updated for version 3.5.4.
+games/endgame-singularity: Added (Simulation)
+games/freeciv: updated for version 2.6.4
+games/mgba: Updated for version 0.9.0
+gis/OWSLib: Updated for version 0.23.0.
+gis/gdal: Updated for version 3.2.2.
+gis/geos: Updated for version 3.9.1.
+gis/gj2ascii: Update for Python 3.
+gis/osm2pgrouting: Updated for version 2.3.7.
+gis/pyproj: Updated for version 3.0.1.
+gis/python-pygeos: Updated for version 0.9.
+gis/qgis: Updated for version 3.18.1.
+gis/rasterio: Updated for version 1.2.1.
+graphics/Blender: Enable build with ffmpeg4
+graphics/vuescan: Updated MD5SUMs.
+libraries/libfaketime: Updated for version 0.9.9.
+libraries/libgxps: Updated for version 0.3.2.
+libraries/libuv: Updated for version 1.41.0.
+misc/ghostpcl: Updated for version 9.54.0.
+network/bluejeans: Updated for version 2.21.3.2.
+network/brave-browser: Updated for version 1.22.70.
+network/davmail: Updated for version 5.5.1.
+network/ngrok: Added (Tunnel local servers).
+network/protonmail-bridge: Updated for version 1.6.9.
+network/protonmail-import-export-app: Updated for version 1.3.1.
+network/proxychains: Fix $DOWNLOAD, i486 -> i586.
+network/qutebrowser-tox: Updated for version 2.1.1.
+network/qutebrowser: Updated for version 2.1.1.
+network/rclone: 32 bit is unsupported now.
+network/syncthing: Updated for version 1.14.0.
+network/teams: Updated for version 1.4.00.7556
+network/teamviewer: Updated for version 15.16.8.
+network/tightvnc: Fix script.
+network/tor-browser: Updated for version 10.0.15.
+network/vivaldi: Updated for version 3.7.2218.52.
+network/weechat: Updated for version 3.1.
+network/wire: Updated for version 3.24.2939.
+network/zoom-linux: Updated for version 5.6.13632.0328
+office/etmtk: Updated for version 3.2.37.
+office/taskopen: Updated for version 1.1.5.
+office/zim: Updated for version 0.73.5.
+python/arrow: Updated for version 0.17.0.
+python/python3-astroid: Updated for version 2.5.2.
+python/python3-hsaudiotag3k: Added (hsaudiotag Python3 library)
+python/python3-ipython: Updated for version 7.22.0.
+python/python3-isounidecode: Added (ISOunidecode Python3 library)
+python/python3-plexapi: Added (PlexAPI Python3 library)
+python/python3-pulsectl: Added (Pulse-control Python3 library)
+python/python3-pylyrics: Added (PyLyrics Python3 library)
+python/python3-pypresence: Added (Pypresence Python3 library)
+python/python3-pysdl2: Added (PySDL2 Python3 library)
+python/python3-stagger: Added (Stagger Python3 library)
+python/python3-tekore: Added (Tekore Python3 library)
+python/tzlocal: Updated for version 2.1.
+system/Iosevka-slab: Updated for version 5.1.1.
+system/Iosevka: Updated for version 5.1.1.
+system/bat: Updated for version 0.18.0.
+system/dust: Updated for version 0.5.4.
+system/intel-microcode: Updated for version 20210216.
+system/kapacitor: Updated for version 1.5.9
+system/netdata: Updated for version 1.30.0.
+system/prometheus: Updated for version 2.26.0.
+system/pspg: Updated for version 4.5.0.
+system/rar2fs: Updated for version 1.29.4
+system/softhsm: Updated for version 2.6.1.
+system/vagrant: Updated for version 2.2.15.
++--------------------------+
+Sat Mar 27 03:24:01 UTC 2021
+academic/bcftools: Updated for version 1.12.
+academic/gcompris-qt: Updated for version 1.1.
+academic/samtools: Updated for version 1.12.
+audio/pulseaudio-ctl: Updated for version 1.69.
+desktop/bukubrow: Updated for version 5.2.0.
+desktop/gmrun: Updated for version 1.1w.
+development/git-lfs: Updated for version 2.13.3.
+development/hugo: Updated for version 0.82.0.
+development/meson: Version bump to 0.57.1 and update copyright year
+development/slibtool: Updated for version 0.5.32.
+development/tidy-html5: Updated for version 5.7.28.
+development/tiled: updated for version 1.5.0
+games/ags: updated for version 3.5.0.31
+games/atari++: Add optional no-confirm-quit patch.
+graphics/openimageio: Clean source directory correctly
+graphics/vuescan: Updated MD5SUMs.
+libraries/htslib: Updated for version 1.12.
+libraries/libinput: Updated for version 1.17.1.
+libraries/libwacom: Updated for version 1.9.
+libraries/ocl-icd: Updated for version 2.2.14.
+libraries/orcania: updated for version 2.2.0
+libraries/rhonabwy: updated for version 0.9.99
+libraries/ulfius: updated for version 2.7.2
+libraries/yder: updated for version 1.4.13
+misc/font-unscii: Updated for version 2.1.
+multimedia/plexmediaserver: Updated for 1.22.1.4228_724c56e62.
+network/axel: Updated for version 2.17.10.
+network/discord: Version bump to 0.0.14 and update copyright year
+network/dropbox: Updated for version 2.6.0.
+network/onioncat: Updated for version 0.3.8.
+network/openresolv: Version bump to 3.12.0 and update copyright year
+network/opera-developer: Updated for version 76.0.3995.0.
+network/opera: Updated for version 75.0.3969.93.
+network/qutebrowser-tox: OpenSSL Updated to 1.1.1k.
+network/rclone: Updated for version 1.54.1.
+network/telegram: Updated for version 2.7.1.
+network/tor-browser: Updated for version 10.0.14.
+network/vivaldi: Updated for version 3.7.2218.49.
+network/zeek: Updated for version 3.0.13.
+network/zoom-linux: Updated for version 5.6.13558.0321
+office/calibre-bin: Updated for version 5.14.0.
+office/fop: Update embedded {font,pdf}box.
+office/pandoc-bin: Updated for version 2.13.
+office/task: Updated for version 2.5.3.
+office/timetrap: Updated for version 1.15.2.
+perl/MoarVM: Updated for version 2021.03
+perl/nqp: Updated for version 2021.03
+perl/rakudo: Updated for version 2021.03
+python/mypy: Updated for version 0.812.
+python/python3-isort: Updated for version 5.8.0.
+python/python3-lazy-object-proxy: Updated for version 1.6.0.
+python/python3-openpyxl: Updated for version 3.0.7.
+python/python3-soupsieve: Updated for version 2.2.1.
+python/thonny: Updated for version 3.3.6.
+ruby/sequel: Updated for version 5.42.0.
+system/atop: Updated for version 2.6.0.
+system/jdupes: updated for version 1.19.2
+system/lirc: Add pygobject3-python3 to REQUIRES
+system/mksh: Updated for version R59c.
++--------------------------+
+Sat Mar 20 04:01:39 UTC 2021
+academic/Gridcoin-Research: Updated for version 5.3.0.0
+academic/fet: Updated for version 5.49.1.
+academic/maxima: Updated for version 5.44.0.
+audio/cmus: Updated for version 2.9.1.
+audio/jack: Updated for version 1.9.17.
+audio/mda-lv2: Updated for version 1.2.6.
+audio/qjackctl: Updated for version 0.9.1.
+development/CImg: Updated for version 2.9.6
+development/cc65: Updated for version 2.19.
+development/cmake-202x: Updated for version 3.19.6.
+development/codelite: Updated for version 15.0.
+development/dwz: Updated for version 0.14.
+development/hugo: Updated for version 0.81.0.
+development/octant: Updated for version 0.17.0.
+development/valgrind: Updated for version 3.17.0.
+development/vscode-bin: Updated for version 1.54.3.
+development/vscodium: Added (Visual Studio Code FOSS Binary Release)
+games/commandergenius: Updated for version 2.7.7.
+games/domination: Updated for version 1.2.3.
+games/freedink: Update REQUIRES.
+games/innoextract: Updated for version 1.9
+graphics/mozjpeg: Updated for version 4.0.3.
+graphics/vuescan: Updated for version 9.7.51.
+libraries/allegro: Build option to allow disabling native_dialog (gtk3) addon
+libraries/bullet: Updated for version 3.09.
+libraries/cryptopp: Updated for version 8.5.0.
+libraries/uriparser: Updated for version 0.9.5.
+libraries/wayland: Updated for version 1.19.0.
+multimedia/LBRY: Updated for version 0.50.1.
+multimedia/MediathekView: Updated for version 13.7.1.
+network/brave-browser: Updated for version 1.21.77.
+network/fdns: Added (Firejail DNS-over-HTTPS Proxy Server)
+network/munge: Updated for version 0.5.14.
+network/prettyping: Added (Ping wrapper)
+network/protonmail-bridge: Updated for version 1.6.6.
+network/qbittorrent: Updated for version 4.3.1.
+network/qutebrowser: Add adblock notes to README.
+network/sfeed: Updated for version 0.9.22.
+network/slurm: Updated for version 20.11.4.
+network/telegram: Updated for version 2.7.0.
+network/tor: Updated for version 0.4.5.7.
+network/varnish: Updated for version 6.5.1.
+network/wire: Updated for version 3.23.2938.
+network/wireguard-tools: Updated for version 1.0.20210315.
+office/MasterPDFEditor: Updated for version 5.7.40.
+office/onlyoffice-desktopeditors: Updated for version 6.2.0.
+office/pdfstudio: Updated for version 2020.4.0.
+office/pdfstudioviewer: Updated for version 2020.4.0.
+perl/nqp: Fix download URL.
+perl/rakudo: Fix download URL.
+python/josepy: Updated for version 1.8.0.
+python/python-mysql-replication: Fix package documentation.
+python/python3-aiorpcX: Updated for version 0.21.0.
+system/aide: Updated for version 0.17.3.
+system/chkrootkit: Updated for version 0.54.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.29.
+system/fzf: Updated for version 0.26.0.
+system/man-db: Updated for version 2.9.4.
+system/modules: Updated for version 4.7.0.
+system/monitorix: Updated for version 3.13.1.
+system/mpack: Updated upstream URL.
+system/nvidia-driver: Updated for version 460.67.
+system/nvidia-kernel: Updated for version 460.67.
+system/openmpi: Updated for version 4.1.0.
+system/osquery-bin: Updated for version 4.7.0.
+system/prometheus: Updated for version 2.25.2
+system/rox-filer: Patch added.
+system/system76-power: Updated for version 1.1.16.
+system/telegraf: Updated for version 1.18.0
+system/usermin: Updated for version 1.823.
+system/webmin: Updated for version 1.973.
+system/xarchiver: Updated for version 0.5.4.17
++--------------------------+
+Sat Mar 13 02:08:06 UTC 2021
+academic/ngspice: KiCAD build fixes.
+development/ShellCheck-bin: Simplify ARCH kicker.
+development/dbeaver-ce: Updated for version 21.0.0.
+development/f2c: Fix VERSION.
+development/mongodb-compass: Updated for version 1.26.0.
+development/postman: Updated for version 8.0.7
+development/robotframework: Updated for version 4.0.
+development/sbcl: Updated for version 2.1.2.
+development/tig: Updated for version 2.5.3.
+development/vscode-bin: Updated for version 1.54.2.
+games/endless-sky: allows for building on both -current and -14.2
+graphics/gscan2pdf: Fix DEP.
+graphics/vuescan: Updated for version 9.7.50.
+libraries/dumb: build both static and shared libraries
+libraries/ntl: Updated for version 11.4.4.
+libraries/skalibs: Updated for version 2.10.0.2.
+multimedia/plexmediaserver: Updated for 1.22.0.4163_d8c4875dd.
+network/AdGuardHome: Updated for version 0.105.2.
+network/qutebrowser-tox: Updated for version 2.1.0.
+network/qutebrowser: Updated for version 2.1.0.
+network/wireshark: Updated for version 3.4.4.
+office/calibre-bin: Updated for version 5.13.0.
+python/defusedxml: Updated for version 0.7.1.
+python/python-mysql-replication: Updated for version 0.23.
+python/python-precis-i18n: Updated for version 1.0.3.
+python/python3-astroid: Updated for version 2.5.1.
+python/python3-pylint: Updated for version 2.7.2.
+ruby/ruby-build: Updated for version 20210309.
+system/Iosevka-slab: Updated for version 5.0.5.
+system/Iosevka: Updated for version 5.0.5.
+system/execline: Updated for version 2.8.0.0.
+system/jenkins: Updated for version 2.277.1.
+system/opendoas: Added (port of doas from OpenBSD)
+system/rEFInd: Updated for version 0.13.1
+system/refind: Updated for version 0.13.1
+system/s6-linux-init: Updated for version 1.0.6.1.
+system/s6: Updated for version 2.10.0.2.
++--------------------------+
+Sat Mar  6 04:13:01 UTC 2021
+academic/Gridcoin-Research: Updated for version 5.2.0.0
+academic/STAR: Updated for version 2.7.8a.
+academic/fet: Updated for version 5.49.0.
+audio/apulse: Updated for version 0.1.13, new maintainer.
+audio/drumstick: Added (C++ MIDI libraries using Qt5 objects)
+audio/vmpk: Updated for version 0.7.1.
+desktop/hushboard: Fix version in .info.
+development/f2c: Updated for version 2020916.
+development/gedit-plugins: Changed DOWNLOAD URL.
+development/gedit: Changed DOWNLOAD URL.
+development/git-crypt: Added (transparent file encryption in git)
+development/github-cli: Updated for version 1.7.0
+development/kotlin: Updated for version 1.4.31.
+development/radare2: Updated for version 5.1.1.
+development/vscode-bin: Updated for version 1.54.1.
+development/xnedit: Updated for version 1.2.2.
+games/Genesis-Plus-GX: Updated for version 2020.01.05_74ad967.
+games/ags: Updated for version 3.5.0.30.
+games/beetle-psx-libretro: Updated for version 2020.02.03_e5e83cd.
+games/empire: Updated for version 4.4.1.
+games/uqm: Updated for version 0.8.0.
+games/uqm_3domusic: Updated for version 0.8.0.
+games/uqm_remixes: Updated for version 0.8.0.
+graphics/gscan2pdf: Updated for version 2.11.0
+graphics/vuescan: Updated MD5SUMs.
+libraries/dumb: Added (Dynamic Universal Music Bibliotheque)
+libraries/libxkbcommon: Updated for version 1.1.0.
+libraries/xforms: Patch for newer gcc
+misc/jmri: Updated for version 4.22.
+multimedia/LBRY: Updated for version 0.49.5.
+network/acme.sh: Updated for version 2.8.8.
+network/brave-browser: Updated for version 1.21.73.
+network/dissenter-browser: Removed (unmaintained upstream).
+network/neomutt: Updated for version 20210205.
+network/qbittorrent-qt5: Removed (renamed as qbittorent).
+network/qbittorrent: Updated for version 4.3.0.1 (switch to qt5).
+network/scapy: Updated for version 2.4.4.
+network/tor-browser: Updated for version 10.0.13.
+network/waterfox: Removed (doesn't run on 14.2 anymore).
+network/youtube-dl: Updated for version 2021.02.22.
+network/zoom-linux: Updated for version 5.5.7938.0228
+office/hebcal: Updated for version 4.24.
+office/todo.txt-cli: Added (CLI frontend for todo.txt)
+perl/perl-Date-Manip: Updated for version 6.85.
+perl/perl-IO-Socket-SSL: Updated for version 2.070.
+perl/perl-Image-Sane: Updated for version 5
+python/defusedxml: Updated for version 0.7.0.
+python/python-socks: Added (SOCKS proxy connector for aiohttp)
+python/python3-aiohttp-socks: Updated for version 0.6.0.
+python/python3-aiohttp: Updated for version 3.7.4.
+python/python3-lazy-object-proxy: Updated for version 1.5.2.
+python/python3-pylint: Updated for version 2.7.1.
+python/websocket-client: Updated for version 0.58.0.
+system/compsize: Updated for version 1.5.
+system/dosbox-dev: updated for version 0.75_pre4441
+system/f2fs_tools: Updated for version 1.14.0.
+system/intelmas: Updated for version 1.6.
+system/kegs: Updated for version 1.05.
+system/lddsafe: Added (safe replacement for ldd)
+system/letsencrypt: Updated for version 1.13.0.
+system/netdata: Updated for version 1.29.3.
+system/passwordsafe: Updated for version 1.13.0.
+system/rmw: Updated for version 0.7.06.
+system/s3fs-fuse: Updated for version 1.89.
++--------------------------+
+Sat Feb 27 01:26:19 UTC 2021
+academic/pyCRAC: Updated for version 1.5.0.
+audio/podget: Updated for version 0.8.8.
+desktop/hushboard: Added (Mute your microphone while typing.)
+development/d-tools: Updated for version 2.095.1
+development/dmd: Updated for version 2.095.1
+development/github-cli: Updated for version 1.6.2
+development/postman: Updated for version 8.0.6
+development/universal-ctags: Updated for version 1ed3fb2
+games/VASSAL: Updated for version 3.5.1.
+games/colem: Updated for version 5.5.
+games/doomretro: Updated for version 4.0.3.
+games/mednaffe: Updated for version 0.9.1.
+games/prboom-plus: Updated for version 2.6um.
+games/srb2: Updated for version 2.2.8.
+games/stella: Add no-upgrade note to README.
+games/trackballs: Updated for version 1.3.2.
+games/wordwarvi: Updated for version 1.0.4.
+gis/qgis: Updated for version 3.18.0.
+gis/rasterio: Updated for version 1.2.0.
+graphics/converseen: Updated for version 0.9.9.0.
+graphics/psftools: Updated for version 1.1.1.
+graphics/vuescan: Updated for version 9.7.46.
+graphics/xmedcon: Updated for version 0.17.0.
+libraries/imlib2: Updated for version 1.7.1.
+libraries/libpgf: Update DOWNLOAD link.
+libraries/libslack: Updated for version 0.7.1
+libraries/liburcu: Updated for version 0.12.2.
+libraries/olm: Updated for version 3.2.2.
+misc/po4a: Updated for version 0.63.
+misc/vttest: Updated for version 2.7.20210210.
+multimedia/ffmpeg4: Updated for version 4.3.2
+multimedia/plexmediaserver: Updated for 1.21.4.4079_1b7748a7b.
+network/XD: Added (I2P BitTorrent Client written in GO)
+network/atftp: Updated for version 0.7.4.
+network/connman: Orphaned.
+network/krb5: Updated for version 1.19.1.
+network/prosody-mod-cloud-notify: Updated for version hg4464.
+network/prosody-mod-http-upload: Updated for version hg4443.
+network/prosody-mod-smacks: Updated for version hg4463.
+network/sslscan: Updated for version 2.0.8.
+network/telegram: Updated for version 2.6.1.
+network/tor-browser: Updated for version 10.0.12.
+network/wireguard-tools: Updated for version 1.0.20210223.
+office/calibre-bin: Updated for version 5.12.0.
+office/coolreader: Updated for version 3.2.54.
+office/fop: Updated for version 2.6.
+office/pdfjam: Removed (included in TexLive)
+perl/MoarVM: Updated for version 2021.02
+perl/nqp: Updated for version 2021.02
+perl/perl-File-Remove: Updated for version 1.60
+perl/perl-Role-Tiny: Updated for version 2.002004.
+perl/perl-Unicode-LineBreak: Updated for version 2019.001.
+perl/rakudo: Updated for version 2021.02
+python/josepy: Updated for version 1.7.0.
+python/python3-astroid: Updated for version 2.5.
+python/python3-pylint: Updated for version 2.7.0.
+ruby/rubygem-ast: Updated for version 2.4.2.
+system/Iosevka-slab: Updated for version 5.0.2.
+system/Iosevka: Updated for version 5.0.2.
+system/btrbk: Updated for version 0.31.0.
+system/ded: Updated for version 20210110.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.27.
+system/exomizer: Updated for version 3.1.0.
+system/joyce: Updated for version 2.2.14.
+system/libsignal-protocol-c: Updated for version 2.3.3.
+system/linuxconsoletools: Updated for version 1.7.1.
+system/lshw: Updated for version B.02.19.2.
+system/netdata: Updated for version 1.29.2.
+system/nvidia-driver: Updated for version 460.56.
+system/nvidia-kernel: Updated for version 460.56.
+system/opensc: Updated for version 0.21.0.
+system/openstego: Updated for version 0.8.0.
+system/password-store: Fix fish completion.
+system/pcsc-lite: Updated for version 1.9.1.
+system/phoronix-test-suite: Updated for version 10.2.2
+system/prometheus: Updated for version 2.25.0.
+system/stegseek: Added (fast steghide cracker)
+system/tomb: Updated for version 2.9.
+system/victor-mono-fonts: Updated for version 1.4.2.
++--------------------------+
+Sat Feb 20 17:05:55 UTC 2021
+academic/convertall: Updated for version 0.8.0.
+accessibility/svkbd: Updated for version 0.2.2.
+desktop/wmtime: Updated for version 1.4.
+desktop/xtrlock: Updated for version 2.15.
+development/github-cli: Updated for version 1.6.1.
+development/hopper: Updated for version 4.7.1.
+development/jenv: Added (Java environment management tool)
+games/CorsixTH: Fix build if lua52/53 present.
+games/freeorion: Fix build.
+games/frotz: Fix non-libmodplug build.
+games/fs2open: Fix build when wx-2.8 present.
+games/ioquake3: Do not write to $CWD.
+games/meandmyshadow: Fix lua build.
+games/megaglest: Fix build.
+games/nestopia: Fix build.
+games/pioneer: Fix lua build.
+games/ppsspp: Use correct github URLs.
+games/qxw: Updated for version 20200708.
+games/unvanquished: Fix build.
+games/vkQuake: Updated for version 1.05.2.
+games/warsow: Updated for version 2.1.2.
+graphics/plotutils: Rebuilt.
+graphics/vuescan: Updated MD5SUMs.
+graphics/vulkan-sdk-bin: Updated for version 1.2.162.1.
+libraries/MyGUI: Use correct github URL.
+libraries/SDL2: Updated for version 2.0.14.
+libraries/libxnvctrl: Updated for version 460.39.
+libraries/mujs: Updated for version 1.1.0
+libraries/ogre: Fix build if assimp present.
+libraries/zint: Updated for version 2.9.1.
+multimedia/coriander: Updated for version 2.0.3.
+multimedia/lightspark: Updated for version 0.8.4.1.
+multimedia/plexmediaserver: Updated for 1.21.3.4046_3c1c83ba4.
+multimedia/rtmpdump: Updated for version 20210219_f1b83c1.
+multimedia/vokoscreenNG: Add profile script for XDG_SESSION_TYPE.
+network/AdGuardHome: Updated for version 0.105.1.
+network/bottle: Updated for version 0.12.19.
+network/ddclient: Fix rc init script.
+network/i2pd: Updated for version 2.36.0.
+network/libiscsi: Updated for version 1.19.0.
+network/nicotine+: Updated for version 3.0.0.
+network/pirate-get: Updated for version 0.4.0.
+network/protonmail-bridge: Updated for version 1.6.3.
+network/signal-desktop: Updated for version 1.40.0.
+network/sslscan: Updated for version 2.0.7.
+network/telegram: Updated for version 2.5.9.
+network/tor: Updated for version 0.4.5.6.
+network/wavemon: Updated for version 0.9.3.
+network/wireguard-linux-compat: Updated for version 1.0.20210219.
+network/yle-dl: Updated for version 20210212.
+network/zoom-linux: Updated for version 5.5.7011.0206.
+perl/perl-ExtUtils-Install: Updated for version 2.20.
+perl/perl-Gtk3: Updated for version 0.038.
+perl/perl-PDF-API2: Updated for version 2.038.
+python/mypy_extensions: Fix missing dep.
+python/py-cpuinfo: Updated for version 7.0.0.
+python/pycryptodomex: Updated for version 3.10.1.
+python/python3-pylint: Updated for version 2.6.2.
+python/testpath: Fix install dir.
+system/afio: Updated for version 2.5.2.
+system/chronograf: Updated for version 1.8.10
+system/clamav: Updated for version 0.103.1.
+system/dosbox-x: Use correct github URL.
+system/gnu-unifont: Updated for version 13.0.06.
+system/restic: Updated for version 0.12.0.
+system/s6-linux-init: Updated for version 1.0.6.0.
+system/s6-rc: Updated for version 0.5.2.1.
+system/telegraf: Updated for version 1.17.3.
+system/victor-mono-fonts: Added (monospaced font)
++--------------------------+
+Sat Feb 13 23:29:23 UTC 2021
+academic/aris: Updated for version 2. New maintainer.
+academic/cdo: Updated for version 1.9.10.
+academic/gwyddion: Updated for version 2.58.
+academic/nco: Updated for version 4.9.7.
+academic/ngspice: Updated for version 34.
+desktop/fvwm3: Rebuilt.
+desktop/gmrun: Updated for version 1.0w.
+desktop/lxhotkey: Updated for version 0.1.1.
+development/Fennel: Updated for version 0.8.1.
+development/dpkg: Update download URLs.
+development/postman: Updated for version 8.0.4.
+development/racer: Updated for version 2.1.44.
+development/tig: Updated for version 2.5.2.
+development/vscode-bin: Updated for version 1.53.2.
+games/FlightGear-data: Updated for version 2020.3.6.
+games/FlightGear: Updated for version 2020.3.6.
+graphics/Blender: Add support for embree
+graphics/OpenSubdiv: Updated for version 3.4.3 + new maintainer
+graphics/openimageio: Adapt for libtiff-4.{1,2}
+graphics/vuescan: Updated MD5SUMs.
+libraries/SimGear: Updated for version 2020.3.6.
+libraries/dcmtk: Updated for version 3.6.6
+libraries/libslack: Updated for version 0.7
+libraries/libwacom: Updated for version 1.8.
+libraries/libxkbcommon: Updated for version 1.0.3.
+libraries/lua-readline: Updated for version 2.9.
+libraries/skalibs: Updated for version 2.10.0.1.
+libraries/srt: Update maintainer info in slackbuild.
+libraries/zeromq: Updated for version 4.3.4.
+misc/mosquitto: Updated for version 2.0.7
+misc/rlwrap: Updated for version 0.45.
+multimedia/plexmediaserver: Updated for 1.21.3.4014_58bd20c02.
+multimedia/vokoscreen: Removed.
+multimedia/vokoscreenNG: Added (screencast creator)
+network/AdGuardHome: Updated for version 0.105.0.
+network/bombadillo: Added (bombadillo non-web browser)
+network/brave-browser: Updated for version 1.20.103.
+network/nbd: Updated for version 3.21
+network/opera-developer: Updated for version 75.0.3953.0.
+network/opera: Updated for version 74.0.3911.75.
+network/palemoon: Updated for version 29.0.1.
+network/qutebrowser: New requirements. Simplify SlackBuild.
+network/sfeed: Updated for version 0.9.21.
+network/teamviewer: Updated for version 15.14.5.
+network/telegram: Fix MD5SUM.
+network/uTox: Updated for version 0.18.1
+network/youtube-dl: Updated for version 2021.02.10.
+office/calibre-bin: Updated for version 5.11.0.
+office/pandoc-bin: Updated for version 2.11.4.
+perl/perl-Cairo-GObject: Updated for version 1.005
+perl/perl-LWP-Protocol-https: Updated for version 6.10.
+perl/perl-Math-GMPq: Updated for version 0.46.
+perl/perl-Math-GMPz: Updated for version 0.49.
+perl/perl-Math-MPFR: Updated for version 4.16.
+perl/perl-Mozilla-CA: Updated for version 20200520.
+perl/perl-Sidef: Updated for version 3.97.1.
+python/BeautifulSoup4: Fix python3 build.
+python/importlib-resources: Added (Python stdlib function backport).
+python/pybind11: Use CMake
+python/python-evdev: Updated for version 1.4.0.
+python/python-zipp: Fixed missing version in setup.cfg.
+python/python3-aiohttp-socks: Updated for version 0.5.5.
+python/python3-aiohttp: Updated for version 3.7.3.
+python/python3-aiorpcX: Updated for version 0.19.1.
+python/python3-mpmath: Updated for version 1.2.1.
+python/python3-multidict: Updated for version 5.1.0.
+python/python3-soupsieve: Updated for version 2.2.
+python/setuptools-scm: Updated for version 3.4.1.
+python/suds-jurko: Change download and homepage links.
+python/thonny: Change install localtion.
+python/typing-extensions: Reverted to 3.7.4.1 to match typing.
+system/bat: Update VERSION.
+system/dget: Update download URLs.
+system/execline: Updated for version 2.7.0.1.
+system/firejail: Updated for version 0.9.64.4
+system/jenkins: Updated for version 2.263.4. New maintainer.
+system/localepurge: Update download URLs.
+system/logwatch: Updated for version 7.5.5.
+system/mpich: Updated for version 3.4.1
+system/netdata: Updated for version 1.29.1.
+system/s6: Updated for version 2.10.0.1.
+system/slackroll: Updated for version git0c6ab0b.
+system/worker: Updated for version 4.7.0.
+system/zfs-on-linux: Fix build script.
++--------------------------+
+Sat Feb  6 18:41:17 UTC 2021
+desktop/fvwm3: Updated for go 1.14.x..
+development/decklink-sdk: Updated for version 12.0
+development/gede: Updated for version 2.17.1.
+development/hugo: Fix md5sum.
+development/kotlin: Updated for version 1.4.30.
+development/mongodb-compass: Updated for version 1.25.0.
+development/perf: Autodetect kernel version.
+development/sbt: Updated for version 1.4.7.
+development/vscode-bin: Updated for version 1.53.
+games/VASSAL: Updated for version 3.5.0.
+games/ags: updated for version 3.5.0.29
+games/ioquake3: Updated for version 1.36_05180e3.
+gis/OWSLib: Updated for version 0.22.0.
+gis/pgrouting: Updated for version 3.1.3.
+gis/postgis: Updated for version 3.1.1.
+gis/pyshp: Updated for version 2.1.3.
+graphics/openscad-mcad: Added (Parametric CAD Library)
+graphics/vuescan: Updated for version 9.7.46.
+haskell/haskell-double-conversion: Added (convert float/strings)
+libraries/Botan: Updated for version 2.17.3.
+libraries/hoel: updated for version 1.4.17
+libraries/iddawc: updated for version 0.9.8
+libraries/libbtbb: Updated for version 2020.12.R1.
+libraries/oath-toolkit: Updated for version 2.6.6.
+libraries/pymediainfo: Updated script and homepage.
+libraries/srt: Added (Secure, Reliable, Transport)
+libraries/ulfius: updated for version 2.7.1
+misc/KeePass: Updated for version 2.47.
+network/c-toxcore: Updated for version 0.2.12.
+network/darkhttpd: updated for version 1.13
+network/dropbox: Updated for version 115.4.601.
+network/glewlwyd: updated for version 2.5.2
+network/krb5: Updated for version 1.19.
+network/prosody-mod-cloud-notify: Updated for version hg4429.
+network/prosody-mod-smacks: Updated for version hg4413.
+network/qTox: Updated for version 1.17.3.
+network/qutebrowser-tox: Updated for version 2.0.2.
+network/qutebrowser: Updated for version 2.0.2.
+network/tor-browser: Updated for version 10.0.10.
+network/tor: Updated for version 0.4.4.7.
+network/ubertooth: Updated for version 2020.12.R1.
+network/vivaldi: Updated for version 3.6.2165.36.
+network/weechat: Updated for version 3.0.1.
+network/wireshark: Updated for version 3.4.3.
+network/zoom-linux: Updated for version 5.5.6981.0202
+office/MasterPDFEditor: Updated for version 5.7.20.
+office/keepassxc: Updated for version 2.6.4.
+office/lyx: Removed qt5 dependency.
+perl/perl-IO-Socket-SSL: Updated for version 2.069.
+perl/perl-Path-Tiny: Updated for version 0.118.
+python/internetarchive: Updated for version 1.9.9.
+python/python3-jedi: Updated for version 0.18.0.
+system/dosbox-dev: updated for version 0.75_pre4430
+system/epson-inkjet-printer-escpr2: Move download URL.
+system/epson-inkjet-printer-escpr: Move download URL.
+system/firejail: Updated for version 0.9.64.2.
+system/fzf: Updated for version 0.25.1.
+system/kbfs: Updated for version 5.6.1.
+system/keybase: Updated for version 5.6.1.
+system/letsencrypt: Updated for version 1.12.0.
+system/netdata: Updated for version 1.29.0.
+system/parallel: Updated for version 20210122. New maintainer.
+system/phoronix-test-suite: Updated for version 10.2.1.
+system/scdoc: Added (small man page generator)
+system/sqlcipher: Updated for version 4.4.2.
+system/ttf-mononoki: Updated for version 1.3.
+system/usermin: Updated for version 1.820.
+system/webmin: Updated for version 1.970.
+system/zfs-on-linux: Updated for version 0.8.6.
++--------------------------+
+Sat Jan 30 03:30:17 UTC 2021
+academic/galculator: Fix build on current.
+academic/meep: Updated for version 1.17.1.
+academic/mpb: Updated for version 1.11.1.
+desktop/Xfce-Theme-Manager: Fix homepage.
+desktop/dunst: don't clobber config
+desktop/jgmenu: Updated for version 4.3.0.
+desktop/kdocker: Added (dock applications into the systray)
+development/KKEdit: Fix homepage, download.
+development/bpython: Updated for version 0.21.
+development/fly: Updated for version 6.7.4.
+development/google-go-lang: Updated for version 1.14.14.
+development/postman: Updated for version 8.0.1.
+development/scala: New maintainer.
+games/VASSAL: Updated for version 3.4.13.
+games/xonotic: updated .info
+libraries/libwacom: Updated for version 1.7.
+libraries/pylast: Updated for version 4.1.0.
+libraries/python-ruamel.yaml: Add optional python3 support.
+misc/asterixInspector: Updated for version 0.13.1.
+multimedia/LBRY: Updated for version 0.49.4.
+multimedia/MuseScore: Updated for version 3.6.
+multimedia/plexmediaserver: Updated for v 1.21.2.3943_a91458577.
+multimedia/vlc: Updated for version 3.0.12
+network/dokuwiki: Add new info.
+network/enet: Updated for version 1.3.17 + new maintainer
+network/gnirehtet-bin: Update slackbuild email.
+network/opera-developer: Updated for version 75.0.3946.0.
+network/opera: Updated for version 73.0.3856.344.
+network/protonmail-bridge: Updated for version 1.5.7.
+network/qutebrowser-tox: Updated for version 2.0.1.
+network/scrcpy: Added (display and control your Android device)
+network/telegram: Updated for version 2.5.7.
+network/vivaldi: Updated for version 3.6.2165.34.
+network/wireguard-linux-compat: Updated for version 1.0.20210124.
+perl/perl-PAR: Updated for version 1.017.
+perl/perl-cairo: Updated for version 1.109.
+python/curtsies: Updated for version 0.3.5.
+python/cwcwidth: Added (Python bindings for wcwidth and wcswidth)
+python/mypy: Updated for version 0.800.
+python/mypy_extensions: Update DEP.
+python/thonny: Updated for version 3.3.3.
+python/typing-extensions: python3 build fixed.
+ruby/rubygem-asciidoctor: Updated for version 2.0.12.
+system/bleachbit: Updated for version 4.2.0.
+system/dget: Updated for version 2.20.5.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.25.
+system/fuse3: Update to version 3.10.1.
+system/kapacitor: Updated for version 1.5.8.
+system/localepurge: Updated for version 0.7.3.10.
+system/lolcat: Updated for version 1.2.
+system/nvidia-driver: Updated for version 460.39.
+system/nvidia-kernel: Updated for version 460.39.
+system/nvidia-legacy390-driver: Build fix.
+system/rhash: Updated for version 1.4.1
+system/telegraf: Updated for version 1.17.2
+system/xbattmon: Update HOMEPAGE and DOWNLOAD.
+system/zfs-on-linux: New maintainer.
++--------------------------+
+Sat Jan 23 11:19:30 UTC 2021
+academic/cadabra2: Updated for version 2.3.6.3.
+academic/rpy2: Updated for version 3.4.2.
+audio/sunvox: Updated for version 1.9.6.
+desktop/ClipboardViewer: Use archive.org homepage.
+development/Fennel: Updated for version 0.8.0.
+development/apache-log4cxx: Updated for version 0.11.0.
+development/cmake-202x: Update README.
+development/eclipse-platform: Updated for version 4.18.
+development/fossil: Updated for version 2.14.
+development/github-cli: Updated for version 1.5.0.
+development/hugo: Updated for version 0.80.0.
+development/jdk15: Updated for version 15.0.2.
+development/scala: Updated for version 2.12.13. Orphaned.
+games/Chatbot-Eliza: Fix build, make noarch.
+games/crispy-doom: Updated for version 5.10.0.
+graphics/fbpic: Fix build.
+graphics/vuescan: Updated for version 9.7.45.
+libraries/gtkglarea: Update homepage and download URLs.
+libraries/libtommath: Fix build if static libs missing.
+libraries/qwt-qt5: Updated for version 6.1.6.
+misc/par2cmdline: Updated for version 0.8.1.
+misc/rlwrap: Updated for version 0.44.
+network/bitcoin: Updated for version 0.21.0.
+network/glusterfs: Fix DOWNLOAD.
+network/isync: Updated for version 1.3.3.
+network/newsboat: Updated for version 2.22.1.
+network/prosody-mod-cloud-notify: Updated for version hg4367.
+network/protonmail-bridge: Updated for version 1.5.6.
+network/signal-desktop: Updated for version 1.39.6.
+office/MasterPDFEditor: Updated for version 5.7.00.
+office/calibre-bin: Updated for version 5.10.1.
+office/gnucash-legacy-docs: Fix REQUIRES.
+office/gnucash-legacy: Remove aqbanking support.
+office/keepassxc: Updated for version 2.6.3.
+office/onlyoffice-desktopeditors: Updated for version 6.1.0.
+office/pandoc-bin: Updated for version 2.11.3.2.
+office/xournalpp: Updated for version 1.0.20.
+python/python-branca: Updated for version 0.4.2.
+python/pyusb: Updated for version 1.1.1.
+python/terminado: Updated for version 0.9.2.
+ruby/ruby-build: Updated for version 20210119.
+ruby/rubygem-ruumba: Updated for version 0.1.17.
+system/CPU-X: Updated for version 4.1.0.
+system/kitty: Added (fast, featureful, GPU-based terminal emulator)
+system/linux-vt-setcolors: Added (change color palette in Linux tty)
+system/prometheus: Updated for version 2.24.1.
+system/pspg: Updated for version 4.0.0.
+system/wine-staging: Updated for version 6.0. rm old patch.
+system/wine: Updated for version 6.0. rm old patch.
++--------------------------+
+Sun Jan 17 01:49:55 UTC 2021
+academic/ITK: Do not use hardcoded path.
+academic/STAR: Updated for version 2.7.7a.
+academic/amd: BUILD bump for SuiteSparse 5.8.1.
+academic/arpack-ng: Updated for version 3.8.0.
+academic/bibletime: Do not use hardcoded path.
+academic/btf: BUILD bump for SuiteSparse 5.8.1.
+academic/cadabra2: Do not use hardcoded path.
+academic/camd: BUILD bump for SuiteSparse 5.8.1.
+academic/cblas: Switch homepage to https.
+academic/ccolamd: BUILD bump for SuiteSparse 5.8.1.
+academic/cholmod: Updated for version 3.0.14.
+academic/colamd: BUILD bump for SuiteSparse 5.8.1.
+academic/csparse: BUILD bump for SuiteSparse 5.8.1.
+academic/cxsparse: BUILD bump for SuiteSparse 5.8.1.
+academic/klu: BUILD bump for SuiteSparse 5.8.1.
+academic/lapacke: Switch homepage to https.
+academic/ldl: BUILD bump for SuiteSparse 5.8.1.
+academic/octave: Updated for version 6.1.0.
+academic/rbio: BUILD bump for SuiteSparse 5.8.1.
+academic/rpy2: Updated for version 3.4.1.
+academic/spqr: Updated for SuiteSparse 5.8.1.
+academic/stellarium: Updated for version 0.20.4.
+academic/suitesparse: Update README
+academic/suitesparseconfig: Updated for version 5.8.1.
+academic/sundials: Updated for version 5.6.1.
+academic/umfpack: Updated for SuiteSparse 5.8.1.
+academic/xiphos: Do not use hardcoded path.
+audio/exhale: Updated for version 1.1.1, cmake changes, gcc flags.
+business/ledger: Update Ledger to the latest 3.2.1 version
+desktop/anki: Fix DEP.
+desktop/glabels: Updated for version 3.4.1.
+desktop/gxkb: Updated for version 0.8.2.
+desktop/i3-gaps: Updated for version 4.18.3.
+development/byacc: Updated for version 20210109.
+development/dkms: Updated for version 2.8.4
+development/git-cola: Fix DEP.
+development/git-lfs: Updated for version 2.13.2.
+development/gtest: Updated for version 1.10.0.
+games/commandergenius: Do not use hardcoded path.
+games/edgar: Updated for version 1.34.
+games/fs-uae-arcade: Fix DEP.
+games/fs-uae-launcher: Fix DEP.
+games/gzdoom: Do not use hardcoded path.
+games/scummvm: Fix download link.
+games/starfighter: Updated for version 2.4.
+games/steam: Updated for version 1.0.0.68
+games/stone_soup: Updated for version 0.26.0.
+games/xmoto: Do not use hardcoded path.
+gis/SFCGAL: Do not use hardcoded path.
+gis/google-earth: Updated for version 7.3.0.3832. New maintainer.
+gis/qgis: Do not use hardcoded path.
+graphics/flameshot: Do not use hardcoded path.
+graphics/tuxpaint-stamps: Updated for version 2020.12.27.
+graphics/tuxpaint: Updated for version 0.9.25.
+graphics/vuescan: Updated MD5SUMs.
+graphics/yed: Updated for version 3.20.1.
+libraries/LucenePlusPlus: Updated for version 3.0.8.
+libraries/blas: Switch homepage to https.
+libraries/lapack: Switch homepage to https.
+libraries/libversion: Do not use hardcoded path.
+libraries/live555: Update README
+libraries/lua-readline: Updated for version 2.8.
+libraries/mujs: Updated for version 1.0.9
+libraries/nv-codec-headers: Updated for version 11.0.10.0.
+libraries/ogre: Do not use hardcoded path.
+libraries/opencv: Updated for version 4.5.1
+libraries/pymediainfo: Updated for version 5.0.3.
+libraries/qwt: Updated for version 6.1.6
+libraries/xblas: Switch homepage and download to https.
+misc/mosquitto: Updated for version 2.0.5
+multimedia/LBRY: Updated for version 0.49.3.
+multimedia/openshot: Fix DEP.
+network/Electrum: Fix DEP.
+network/brave-browser: Updated for version 1.18.78.
+network/bwm-ng: Updated for version 0.6.3.
+network/coturn: Updated for version 4.5.2.
+network/ferm: Updated for version 2.5.1.
+network/gnirehtet-bin: Added (reverse tethering for Android)
+network/lighttpd: Updated for version 1.4.58.
+network/mumble: Fix missing quote.
+network/netsniff-ng: Updated for version 0.6.8.
+network/prosody-mod-cloud-notify: Updated for version hg4332.
+network/rspamd: Do not use hardcoded path.
+network/signal-desktop: Updated for version 1.39.5.
+network/tor-browser: Updated for version 10.0.8.
+network/tor: Update README.
+network/uTox: Updated for version 0.18.0
+network/zoom-linux: Updated for version 5.4.57862.0110
+office/lyx: Updated for version 2.3.6.1.
+office/pdfstudio: Updated for version 2020.3.1.
+office/pdfstudioviewer: Updated for version 2020.3.1.
+perl/perl-Archive-Extract: New Maintainer.
+perl/perl-CPANPLUS-Dist-Build: New Maintainer.
+perl/perl-CPANPLUS: New Maintainer.
+perl/perl-DBIx-Simple: New Maintainer.
+perl/perl-Moo: Updated for version 2.004004.
+perl/perl-Role-Tiny: Updated for version 2.002003.
+python/PyGreSQL: Updated for version 5.2.2
+python/cloudscraper: Fix DEP.
+python/ptyprocess: Updated for version 0.7.0.
+python/python3-babel: Fix VERSION.
+python/python3-babel: Use versioned CLDR source file.
+python/python3-obspy: Fix DEP.
+system/Iosevka-slab: Updated for version 4.4.0.
+system/Iosevka: Updated for version 4.4.0.
+system/containerd: Updated for version 1.4.3.
+system/dfu-util: Updated for version 0.10
+system/docker-cli: Added (command line tool for Docker engine)
+system/docker-proxy: Updated for version 20201215_fa125a3.
+system/docker: Updated for version 20.10.2.
+system/firetools: Updated for version 0.9.64.
+system/intelmas: Updated for version 1.5.
+system/letsencrypt: Fix DEP.
+system/mailutils: Updated for version 3.11.1.
+system/runc: Updated for version 1.0.0_rc92.
+system/s3fs-fuse: Updated for version 1.88.
+system/tini: Updated for version 0.19.0.
+system/tmuxp: Updated for version 1.7.0.
++--------------------------+
+Sat Jan  9 07:31:38 UTC 2021
+academic/ITK: Updated for version 5.1.2.
+audio/abcde: New maintainer.
+audio/cd-discid: New maintainer.
+audio/gogglesmm: Updated for version 1.2.2.
+audio/mkcue: New maintainer.
+audio/qmmp: Updated for version 0.12.10.
+desktop/buku: Updated dependencies.
+desktop/caffeine-ng: Add dependency.
+desktop/redshift: Include patch to disable AppIndicator
+desktop/ssr: Updated for version 0.4.3.
+desktop/sun: Updated for version 1.3.1.
+development/Sphinx: Update dependencies.
+development/Sphinx: Updated for version 3.4.1.
+development/colordiff: New maintainer.
+development/d-tools: Updated for version 2.095.0
+development/dmd: Updated for version 2.095.0
+development/icon: Updated for version 9.5.20i.
+development/jupyter-nbformat: Updated for version 5.0.8.
+development/samurai: Updated for version 1.2.
+development/sbcl: Updated for version 2.1.0.
+development/universal-ctags: Updated for version 08b1c49
+games/ags: updated for version 3.5.0.28
+games/freeciv: updated for version 2.6.3
+games/hatari: Updated for version 2.3.1.
+games/stone_soup: python3-PyYAML added to REQUIRES.
+games/wesnoth: Updated for version 1.14.15
+gis/OWSLib: Updated for version 0.21.0.
+gis/SFCGAL: Updated for version 1.3.9.
+gis/gpsbabel: Updated for version 1.7.0.
+gis/osm2pgsql: Updated for version 1.4.0.
+gis/pdal: Updated for version 2.2.0.
+gis/pgrouting: Updated for version 3.1.2.
+gis/proj: Updated for version 7.2.1.
+gis/pytrainer: Updated for version 2.0.2.
+gis/qgis: Updated for version 3.16.2.
+gis/whitebox-tools: Updated for version 1.4.0.
+graphics/CairoSVG: Updated for version 2.5.0.
+graphics/exif: Updated for version 0.6.22.
+graphics/feh: Updated for version 3.6.1.
+graphics/glslang: Updated for version 11.1.0.
+graphics/pencil2d: Added (animation/drawing software)
+graphics/vuescan: Updated MD5SUMs.
+libraries/QScintilla-qt5: Updated for version 2.11.6.
+libraries/libversion: Updated for version 3.0.1.
+libraries/libxnvctrl: Updated for version 460.32.03.
+libraries/musicbrainzngs: Updated for version 0.7.1.
+libraries/oath-toolkit: Updated for version 2.6.5.
+libraries/slv2: Changed maintainer information.
+multimedia/aegisub: Update DOWNLOAD.
+multimedia/aom: Updated for version 2.0.1.
+multimedia/gpodder: Updated for version 3.10.17.
+multimedia/plexmediaserver: Updated for v 1.21.1.3876_3c3adfcb4.
+network/TeamSpeak3: Updated for version 3.5.6
+network/courier-unicode: Updated for version 2.1.2.
+network/fwknop: Change maintainer.
+network/maildrop: Updated for version 3.0.1.
+network/mumble: Restored missing REQUIRES
+network/protonmail-bridge: Updated for version 1.5.4.
+network/protonmail-import-export-app: Updated for version 1.2.3.
+network/sshuttle: updated for version 1.0.5
+network/tixati: Updated for version 2.78_1.
+network/vivaldi: Updated for version 3.5.2115.87.
+network/youtube-dl: Updated for version 2021.01.03.
+office/ProjectLibre: Updated for version 1.9.3.
+office/calibre-bin: Updated for version 5.9.0.
+office/lout: Updated for version 3.42.
+perl/perl-Archive-Extract: Orphaned.
+perl/perl-CPANPLUS-Dist-Build: Orphaned.
+perl/perl-CPANPLUS-Dist-Slackware: Change maintainer.
+perl/perl-CPANPLUS: Updated for version 0.9910 & orphaned.
+perl/perl-DBIx-Simple: Orphaned.
+perl/perl-Log-Message-Simple: Orphaned.
+perl/perl-Log-Message: Orphaned.
+perl/perl-Module-Pluggable: Orphaned.
+perl/perl-MusicBrainz-DiscID: New maintainer.
+perl/perl-Object-Accessor: Orphaned.
+perl/perl-Package-Constants: Orphaned.
+perl/perl-Term-ReadLine-Gnu: Updated for version 1.37 & orphaned.
+perl/perl-Term-UI: Orphaned.
+perl/perl-WebService-MusicBrainz: New maintainer.
+python/numexpr: Updated for version 2.7.2.
+python/parso: Updated for version 0.8.1.
+python/pySmartDL: Updated for version 1.3.4.
+python/python-urllib3: Updated for version 1.26.2.
+python/python3-babel: Updated for version 2.9.0.
+python/python3-certifi: Removed as python-certifi now supports Python 3.
+python/pyusb: Updated for version 1.1.0.
+python/scikit-learn: Updated for version 0.24.0.
+system/bat: Updated for version 0.17.1.
+system/cfpeek: Added (CLI processor for structured config files)
+system/compsize: Updated for version 1.3.
+system/dosbox-dev: updated for version 0.75_pre4405
+system/fzf: Updated for version 0.25.0.
+system/ifuse: Updated for version 1.1.4.
+system/letsencrypt: Updated for version 1.11.0.
+system/lynis: Updated for version 3.0.3.
+system/mailfromd: Updated for version 8.9.
+system/mlterm: Updated for version 3.9.1.
+system/nvidia-driver: Updated for version 460.32.03.
+system/nvidia-kernel: Updated for version 460.32.03.
+system/nvidia-legacy390-driver: Updated for version 390.141.
+system/nvidia-legacy390-kernel: Updated for version 390.141.
+system/phoronix-test-suite: Updated for version 10.2.0.
+system/prometheus: Updated for version 2.24.0.
+system/skim: Updated for version 0.9.3.
+system/slpkg: Updated for version 3.9.1.
+system/telegraf: Updated for version 1.17.0
+system/ttf-ibm-plex: Updated for version 5.1.3.
+system/xarchiver: Updated for version 0.5.4.16
++--------------------------+
+Sat Jan  2 03:49:17 UTC 2021
+academic/cadabra2: Updated for version 2.3.6.2.
+academic/gwyddion: Updated for version 2.57.
+business/stansoft: Updated for version 7.21.
+desktop/Surfn: Updated for version 20.12.7.
+desktop/buku: Updated for version 4.5.
+desktop/e16: Updated for version 1.0.22.
+development/SQLAlchemy: Updated for version 1.3.22.
+development/bpython: Updated for version 0.20.1.
+development/composer: Updated for version 2.0.8
+development/octant: Updated for version 0.16.3.
+development/pycharm: Updated for version 2020.3.1.
+development/universal-ctags: Updated for version daa6909
+development/velero: Updated for version 1.5.2.
+games/FlightGear-data: Updated for version 2020.3.5.
+games/FlightGear: Updated for version 2020.3.5.
+games/VASSAL: Updated for version 3.4.12.
+gis/geopy: Updated for version 2.1.0.
+gis/qgis: Support QCA path on current.
+graphics/SPIRV-Tools: Updated for version 2020.6.
+graphics/Vulkan-Tools: Updated for version 1.2.162.0.
+graphics/flameshot: Updated for version 0.8.5.
+graphics/renderdoc: Updated for version 1.11.
+graphics/shaderc: Updated for version 2020.4.
+graphics/vuescan: Updated MD5SUMs.
+graphics/vulkan-sdk: Updated for version 1.2.162.0.
+graphics/xdot: Updated for version 1.2.
+libraries/SPIRV-Headers: Update source.
+libraries/SimGear: Updated for version 2020.3.5.
+libraries/Vulkan-Headers: Updated for version 1.2.162.0.
+libraries/qt5-pbfimageplugin: Updated for version 2.3.
+libraries/zimg: Added (conversion, and dithering library)
+multimedia/LBRY: Updated for version 0.49.1.
+multimedia/k9copy-reloaded: Rebuilt.
+multimedia/lives: Various script fixes.
+multimedia/plexmediaserver: Updated for v 1.21.1.3830_6c22540d5.
+multimedia/vapoursynth-mvtools: Added (motion estimation plugin)
+multimedia/vapoursynth: Added (video processing framework)
+network/avahi: Add --enable-compat-libdns_sd to configure
+network/brave-browser: Updated for version 1.18.75.
+network/newsboat: Updated for version 2.22.
+network/nicotine+: Updated for version 2.2.2.
+network/openvswitch: Updated for version 2.14.0.
+network/palemoon: Updated for version 28.17.0.
+network/privoxy: Updated for version 3.0.29.
+network/purple-gowhatsapp: Fix MD5SUM.
+network/skype4pidgin: Updated for version 1.7.
+network/wakeonlan: Updated script.
+network/wp-cli: use tgz.
+network/you-get: Updated for version 0.4.1500.
+network/youtube-dl: Updated for version 2020.12.22.
+office/CherryTree: Updated download url.
+office/JabRef: Updated for version 5.2.
+office/fop-legacy: Added (print formatter).
+office/fop2.0: Removed (use fop-legacy).
+office/fop: Update script.
+office/mate-calc: use tgz.
+perl/perl-Devel-Cycle: Updated for version 1.12.
+perl/perl-PDF-Builder: Added (creation and modification of PDFs)
+perl/perl-Test-Memory-Cycle: Updated for version 1.06.
+perl/raku-Readline: Updated for version 0.1.6.
+python/click-didyoumean: use tgz.
+python/click-repo: use tgz.
+python/cssselect2: Added (straightforward implementation of CSS3)
+python/hachoir: Added (library to view and edit binary stream).
+python/pyblake2: Added (BLAKE2 hash function extension module).
+python/pynacl: Added (Python binding to libsodium).
+python/python-certifi: Updated for version 2020.12.5.
+python/python-libtmux: Updated for version 0.8.5.
+python/python3-django: Updated for version 3.1.4.
+python/python3-isort: Updated for version 5.7.0.
+python/reedsolo: use tgz.
+python/tinycss2: Added (low-level CSS parser and generator).
+python/typed_ast: Updated for version 1.4.2.
+python/xlutils: use tgz.
+ruby/ruby-build: Updated for version 20201225.
+ruby/rubygem-powerpack: Updated for version 0.1.3.
+system/Iosevka-slab: Updated for version 4.2.0.
+system/Iosevka: Updated for version 4.2.0.
+system/drbd-utils: Updated for version: 9.15.1.
+system/epson-inkjet-printer-escpr: Updated for version 1.7.8.
+system/gnu-unifont: Updated for version 13.0.05.
+system/prometheus: Added (Open-Source Monitoring & Alerting Toolkit)
+system/st: Updated for version 0.8.4.
+system/t1utils: Updated for version 1.42.
+system/tmuxp: Updated for version 1.6.3.
+system/tpm: Update script.
+system/unison: Updated for version 2.51.3.
+system/yash: Updated for version 2.51.
++--------------------------+
+Sat Dec 26 09:41:34 UTC 2020
+audio/qjackctl: Updated for version 0.9.0.
+desktop/Qogir-icon-theme: Updated for version 20201122.
+desktop/bumblebee-status: Added (status line generator).
+desktop/fvwm3: Updated for version 1.0.2.
+desktop/simplenote: Updated for version 2.1.0.
+development/FreeBASIC: Fix build.
+development/sbt: Add missing file.
+development/sbt: Updated for version 1.4.5.
+development/vscode-bin: Updated for version 1.52.1.
+games/bstone: Updated for version 1.2.9.
+games/commandergenius: Updated for version 2.7.3.
+games/hatari: Updated for version 2.3.0.
+gis/geos: Updated for version 3.9.0.
+gis/pgrouting: Updated for version 3.1.1.
+gis/postgis: Updated for version 3.1.0.
+graphics/ueberzug: Updated for version 18.1.8.
+libraries/SOPE: Updated for version 5.0.1.
+libraries/bullet: Updated for version 3.07.
+libraries/bullet: Updated for version 3.08.
+libraries/libaom: Removed. (Use aom).
+libraries/libheif: Update DEP.
+libraries/libsidplay: Added (library for playing SID music files).
+libraries/pugixml: Updated for version 1.11.4.
+libraries/tree-sitter: Added (parser generator).
+multimedia/k9copy-reloaded: Fix build on current.
+network/Electrum: Updated for version 4.0.9.
+network/ircd-hybrid: Updated for version 8.2.36.
+network/lldpd: Updated for version 1.0.7.
+network/prosody-mod-cloud-notify: Updated for version hg4295.
+network/prosody-mod-vcard-muc: Updated for version hg4300.
+network/purple-gowhatsapp: Added (libpurple/Pidgin plugin).
+network/strongswan: Updated for version 5.9.1.
+network/telegram: Updated for version 2.5.1.
+network/tor-browser: Updated for version 10.0.7.
+network/wireguard-linux-compat: Updated for version 1.0.20201221.
+network/wireshark: Updated for version 3.4.2.
+network/wsdd2: Fix ownership on init script
+network/wsdd2: Updated for version 1.8.3.2.
+network/zoom-linux: Updated for version 5.4.57450.1220
+office/SOGo: Updated for version 5.0.1.
+office/calibre-bin: Updated for version 5.8.1.
+office/msee: Added (command line tool).
+office/pdfstudio: Updated for version 2020.3.0.
+office/pdfstudioviewer: Updated for version 2020.3.0.
+office/smoffice2021: Updated for version 2021_1024.
+office/trello-cli: Added (cli tool for trello).
+perl/MoarVM: Updated for version 2020.12.
+perl/nqp: Updated for version 2020.12.
+perl/raku-Readline: Change maintainer.
+perl/rakudo: Updated for version 2020.12.
+perl/zef: Change maintainer.
+python/python-uritemplate: Added (A python library).
+python/scikit-umfpack: Added (wrapper of UMFPACK).
+ruby/ruby-build: Updated for version 20201221.
+system/fd:  Updated for version 8.2.1.
+system/lnav: Updated for version 0.9.0.
+system/lynis: Updated for version 3.0.2.
+system/netdata: Updated for version 1.28.0.
+system/nvidia-driver: Updated for version 460.27.04.
+system/nvidia-kernel: Updated for version 460.27.04.
+system/nvidia-legacy390-kernel: Added patches to build for 5.10+.
+system/osquery-bin: Updated for version 4.6.0.
++--------------------------+
+Sat Dec 19 02:41:21 UTC 2020
+academic/ViennaRNA: Update DOWNLOAD.
+development/FreeBASIC: Build from source.
+development/dart-sdk: Updated for version 2.10.4.
+development/git-lfs: Updated for version 2.13.1.
+development/github-cli: Updated for version 1.4.0
+development/hopper: Updated for version 4.7.0.
+development/hugo: Updated for version 0.79.0.
+development/kotlin: Updated for version 1.4.21.
+development/lepton-eda: Updated for version 1.9.13.
+development/mongodb-compass: Updated for version 1.24.6.
+development/uncrustify: Updated for version 0.72.0.
+development/xnedit: Updated for version 1.2.1.
+games/freeciv: updated for version 2.6.2.1
+games/frotz: Updated for version 2.52, desktop stuff.
+games/xmoto: Updated for version 0.6.1.
+gis/qmapshack: Updated for version 1.15.2.
+graphics/vuescan: Updated MD5SUMs.
+libraries/libheif: Updated for version 1.10.0.
+libraries/pugixml: Updated for version 1.11.3.
+misc/protobuf3: Updated for version 3.14.0.
+multimedia/LBRY: Updated for version 0.49.0.
+multimedia/plexmediaserver: Updated for v 1.21.1.3795_ee64ab56f.
+network/bluejeans: Updated for version 2.19.0.61.
+network/brave-browser: Updated for version 1.18.70.
+network/broadcom-sta: Orphaned.
+network/discord: Version bump to 0.0.13.
+network/murmur: Fix .info VERSION label
+network/protonvpn-cli: Updated for version 2.2.6.
+network/signal-desktop: Updated for version 1.39.4.
+network/teamviewer: Updated for version 15.13.6.
+office/calibre-bin: Updated for version 5.7.2.
+office/texmacs: Updated for version 1.99.17.
+perl/perl-Razor2-Client-Agent: Orphaned.
+system/gnu-unifont: Keep the fonts names unversioned.
+system/jdupes: updated for version 1.19.1
++--------------------------+
+Sat Dec 12 00:10:18 UTC 2020
+academic/ViennaRNA: Updated for version 2.4.17.
+academic/datamash: Added (Basic numeric, textual & statistical ops)
+academic/fet: Updated for version 5.48.1.
+academic/veusz: Updated for version 3.3.1.
+audio/alsacap: Updated for version 20200821.
+desktop/xtrlock: Updated for version 2.14.
+development/bluefish: Fix info for version 2.2.12
+development/github-cli: Updated for versoin 1.3.1
+development/netbeans: New maintainer, fix download URL.
+development/nim: Updated for version 1.4.2.
+development/obcpl: Update URLs.
+development/vscode-bin: Updated for version 1.52.0.
+games/FlightGear-data: Updated for version 2020.3.4.
+games/FlightGear: Updated for version 2020.3.4.
+games/OpenXcom: Updated for version 20201205_2034.
+games/VASSAL: Updated for version 3.4.11.
+games/vkQuake: Updated for version 1.05.1.
+graphics/img2pdf: Added (conversion of raster images to PDF)
+graphics/psftools: Updated for version 1.0.14.
+graphics/vuescan: Updated MD5SUMs.
+libraries/SimGear: Updated for version 2020.3.4.
+libraries/libbson: Updated for version 1.17.3.
+libraries/libde265: Updated for version 1.0.8.
+libraries/libewf: Updated for version 20140811.
+libraries/quazip-qt4: Renamed from quazip.
+libraries/quazip: Removed (renamed to quazip-qt4).
+libraries/raptor: Updated for version 2.0.15.
+misc/rbutil: Changed dependency name.
+multimedia/AtomicParsley: New Homepage/Download URL.
+multimedia/flashplayer-plugin: Updated for version 32.0.0.465.
+multimedia/mpv: Updated for version 0.33.0
+multimedia/pepperflash-plugin: Updated for version 32.0.0.465.
+multimedia/spotify: Fix VERSION.
+multimedia/straw-viewer: Updated for version 0.1.2.
+multimedia/tomahawk: Changed dependency name.
+network/Electrum: Updated for version 4.0.7.
+network/avahi: Disable qt5 in configure
+network/brave-browser: Fix dep.
+network/fping3: Renamed to 'fping' and updated for version 5.0.
+network/mumble: Updated for version 1.3.3
+network/murmur: Updated for version 1.3.3
+network/nicotine+: Updated for version 2.2.0.
+network/protonmail-import-export-app: Updated for version 1.2.2.
+network/sshfs-fuse: Updated for version 3.7.1.
+network/tor-browser: Updated for version 10.0.6.
+network/vivaldi: Updated for version 3.5.2115.81.
+network/zoom-linux: Updated for version 5.4.56259.1207.
+office/MasterPDFEditor: Switch to Qt5 version.
+office/calibre-bin: Updated for version 5.7.1.
+office/moneydance: Updated for version 2021.2006.
+python/click-didyoumean: Added (git-like did-you-mean feature)
+python/click-repl: Added (REPL plugin for Click)
+python/pathtools3: Added (File system general utilities).
+python/pathtools: Added (File system general utilities).
+python/reedsolo: Added (Pure-Python Reed Solomon encoder/decoder)
+python/sphinx-rtd-theme: Update name/copyright.
+python/thonny: Updated for version 3.3.1.
+python/watchdog: Updated for version 0.10.4.
+ruby/ruby-build: Updated for version 20201210.
+system/Iosevka-slab: Updated for version 4.0.2.
+system/Iosevka: Updated for version 4.0.2.
+system/btrbk: Updated for version 0.30.0.
+system/chronograf: Updated for version 1.8.9.1
+system/fzf: Updated for versio 0.24.4.
+system/lz4: Updated for version 1.9.3.
+system/oldschool-pc-fonts: Updated for version 2.2.
+system/univga-font: Add PCF and OTB support.
++--------------------------+
+Sun Dec  6 01:00:40 UTC 2020
+academic/Gridcoin-Research: Updated for version 5.2.0.0
+academic/nco: Updated for version 4.9.6.
+desktop/obmenu-generator: Updated for version 0.89.
+desktop/rofi: Updated for version 1.6.1.
+development/bluefish: Updated for version 2.2.12
+development/bvi: Update for version 1.4.1.
+development/dbeaver-ce: Updated for version 7.3.0.
+development/facile: Fix download link and homepage.
+development/ninja: Updated for version 1.10.2.
+development/postman: Updated for version 7.36.0.
+development/racer: Updated for version 2.1.41.
+development/ruff: Updated for version 1.0.4.
+development/rustup: Updated for version 1.23.1.
+development/sbcl: Updated for version 2.0.11.
+games/OpenXcom: Updated for version 20201125_1755.
+gis/qmapshack: Updated for version 1.15.1.
+graphics/fbgrab: Added (framebuffer screenshot program)
+graphics/vuescan: Updated MD5SUMs.
+graphics/xmedcon: Updated for version 0.16.3.
+ham/chirp: Updated for version 20201128.
+libraries/cfitsio: Updated for version 3.49.
+libraries/fmt: Updated for version 7.1.3.
+libraries/libinput: Updated for version 1.16.4.
+libraries/libmediainfo: Version bump to 20.09.
+libraries/pugixml: Updated for version 1.11.1.
+multimedia/flashplayer-plugin: Updated for version 32.0.0.453.
+multimedia/mediainfo: Version bump to 20.09.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.453.
+multimedia/plexmediaserver: Updated for v 1.21.0.3711_b509cc236.
+network/avahi: Updated for version 0.8.
+network/broadcom-sta: Updated for recent kernels.
+network/dropbox: Updated for version 111.4.472.
+network/gajim: Fix download link.
+network/i2pd: Updated for version 2.35.0.
+network/lighttpd: Updated for version 1.4.56.
+network/mattermost-desktop: Updated for version 4.6.1.
+network/mkvserver_mk2: Updated for version 20201203_c62abc3.
+network/opera-developer: Updated for version 74.0.3890.0.
+network/opera: Updated for version 72.0.3815.400.
+network/prosody-mod-cloud-notify: Updated for version hg4273.
+network/qutebrowser-tox: Updated for version 1.14.1.
+network/qutebrowser: Updated for version 1.14.1.
+network/rclone: Updated for version 1.53.3.
+network/signal-desktop: Updated for version 1.38.2.
+network/weboob: Removed (requested by maintainer).
+office/lyx: Updated for version 2.3.6.
+office/wps-office: Update DOWNLOAD url.
+perl/perl-Date-Manip: Updated for version 6.83.
+perl/perl-PAR-Dist: Updated for version 0.51.
+perl/perl-cairo: Updated for version 1.108.
+python/pychm: Updated for version 0.8.6.
+python/pyotp: Updated for version 2.4.1.
+system/Solaar: Add missing dependency.
+system/bonnie++: Update for version 1.04
+system/gnu-unifont: Updated for version 13.0.04, added OTB font format.
+system/intelmas: Updated for version 1.4.
+system/letsencrypt: Updated for version 1.10.1.
+system/sleuthkit: Updated for version 4.10.1.
+system/telegraf: Updated for version 1.16.3.
+system/ticpp: Added (xml parser).
+system/worker: Updated for version 4.6.1.
++--------------------------+
+Sat Nov 28 18:03:26 UTC 2020
+audio/muse: Updated for version 3.1.1.
+desktop/herbe: Added (Daemon-less notifications without D-Bus)
+development/arm-binutils: Updated for version 2.35.
+development/arm-gcc: Updated for version 10.2.0.
+development/arm-gdb: Updated for version 10.1.
+development/composer: Updated for version 2.0.7
+development/cproto: Added (generate function prototypes for C code)
+development/d-tools: Updated for version 2.094.2
+development/dbeaver-ce: Updated for version 7.2.5.
+development/dmd: Updated for version 2.094.2
+development/fossil: Updated for version 2.13.
+development/git-lfs: Updated for version 2.12.1.
+development/github-cli: Updated for version 1.3.0
+development/kotlin: Updated for version 1.4.20.
+development/nodejs: Updated for version 12.20.0.
+development/racket: Fix md5sum.
+development/rustup: Updated for version 1.23.0.
+development/universal-ctags: Updated for version e1acc8d
+games/VASSAL: Updated for version 3.4.10.
+games/VASSAL: Updated for version 3.4.9.
+gis/Fiona: Updated for version 1.8.18.
+graphics/embree: Added (ray tracing kernels)
+graphics/imv: Added (image viewer for X and/or Wayland)
+graphics/meh: Fix README.
+graphics/vuescan: Updated MD5SUMs.
+libraries/libnsgif: Added (gif image decoder library)
+libraries/pugixml: Updated for version 1.11.
+libraries/wimlib: Updated for version 1.13.3.
+misc/cp437: Added (emulate code page 437 on a UTF-8 terminal)
+multimedia/plexmediaserver: Updated for v 1.21.0.3616_d87012962.
+network/asterisk: Updated for version 16.15.0.
+network/basilisk-bin: Updated for version 2020.10.29, fix dl URL.
+network/brave-browser: Updated for version 1.17.73.
+network/ircII: Added (IRC Client, Second Edition)
+network/nordvpn: Updated for version 3.8.6.
+network/protonmail-bridge: Updated for version 1.5.2.
+network/teamviewer: Updated for version 15.12.4.
+network/xaric: Updated for version 0.13.7.
+office/MasterPDFEditor: Updated for version 5.6.80.
+office/calibre-bin: Updated for version 5.6.0.
+office/pandoc-bin: Updated for version 2.11.2.
+office/teapot: Add missing diffs.
+office/wps-office: Updated for version 11.1.0.9719.XA.
+perl/MoarVM: Updated for version 2020.11.
+perl/nqp: Updated for version 2020.11.
+perl/rakudo: Updated for version 2020.11.
+perl/zef: Updated for version 0.9.4.
+python/npm: Added (Python bindings and utils for npm.)
+python/optional-django: Added (Utils for optional django support)
+python/pyserial: Updated for version 3.5.
+python/python-webpack: Added (high-level i/face to webpack server)
+system/apg: Added (automated password generator)
+system/conspy: Added (take control of a virtual console)
+system/kfc: Added (terminal-emulator color palette setter)
+system/usermin: Updated for version 1.812.
+system/vagrant: Updated for version 2.2.14.
+system/webmin: Updated for version 1.962.
+system/xcdroast: Updated for version 1.19.
++--------------------------+
+Sat Nov 21 18:15:13 UTC 2020
+academic/IGV: Added (Integrative Genomics Viewer)
+academic/cadabra2: Updated for version 2.3.5.
+academic/gcompris-qt: Updated for version 1.0.
+audio/amSynth: Updated for version 1.12.2.
+audio/gmusicbrowser: Updated for version 1.1.16.
+desktop/autorandr: Updated for version 1.11.
+desktop/x-tile: updated for version 3.3
+development/bviplus: Added (hex editor with vi-style UI)
+development/codespell: Added (spell checker for source code)
+development/dbeaver-ce: Updated for version 7.2.4.
+development/hexe: Added (minimalist hex editor)
+development/hexer: Added (hex editor with vi-like UI)
+development/hugo: Updated for version 0.78.2.
+development/icdiff: Added (improved color diff)
+development/openjdk7: Updated for version 7u271.
+development/openjdk8: Updated for version 8u252.
+development/tiled: updated for version 1.4.3
+development/tkdiff: Updated for version 5.1.
+games/gzdoom: Add missing patch.
+games/hack-of-life: Added (networked Conway's Life variant)
+games/img2xterm: Added (display images on the terminal)
+games/sumeria: Added (hamurabi-like game)
+graphics/vuescan: Updated MD5SUMs.
+libraries/libinput: Updated for version 1.16.3.
+libraries/libseccomp: Updated for version 2.5.1.
+libraries/libtorrent-rasterbar: Updated for version 1.2.11.
+libraries/libwacom: Updated for version 1.6.
+misc/deroff: Added (remove *roff markup from text files)
+misc/txt2regex: Added (interactive regular expression trainer)
+multimedia/MediathekView: Updated for version 13.6.0.
+multimedia/plexmediaserver: Updated for v 1.20.5.3600_47c0d9038.
+network/AdGuardHome: Updated for version 0.104.3.
+network/Electrum: Updated for version 4.0.5.
+network/brave-browser: Updated for version 1.16.76.
+network/coturn: Updated for version 4.5.1.3.
+network/cyrus-imapd: Updated for version 3.2.4.
+network/dropbear: Updated for version 2020.81.
+network/dropbox: Updated for version 110.4.458.
+network/franz: Updated for version 5.6.1.
+network/icyque: Added (ICQ WIM protocol for libpurple)
+network/krb5: Updated for version 1.18.3.
+network/onedrive: Updated for version 2.4.7.
+network/opera-developer: Updated for version 74.0.3870.0.
+network/opera: Updated for version 72.0.3815.320.
+network/prosody-mod-cloud-notify: Updated for version hg4221.
+network/prosody-mod-smacks: Updated for version hg4189.
+network/pulse-sms: Updated for version 4.3.0
+network/qbittorrent-qt5: Updated for version 4.3.0.1.
+network/rclone: Updated for version 1.53.2.
+network/signal-desktop: Updated for version 1.38.1.
+network/ssh-chat: Added (IRC-like chat server using ssh as a client)
+network/strongswan: Fix the no-clobber routine.
+network/surl: Added (URL shortener)
+network/tinyirc: Added (tiny IRC client)
+network/tor-browser: Updated for version 10.0.5.
+network/xaric: Added (simple colorful IRC client)
+network/zeek: Updated for version 3.0.11.
+office/diction: Added (grammar checker)
+office/onlyoffice-desktopeditors: Updated for version 6.0.2.
+office/pandoc-bin: Updated for version 2.11.1.1.
+office/pdfstudio: Updated for version 2020.2.0.
+office/pdfstudioviewer: Updated for version 2020.2.0.
+office/teapot: Fix fltk build, README.
+office/uncsv: Added (convert to or from CSV streams)
+office/x_x: Added (view Excel or CSV files in the terminal)
+perl/perl-Moo: Updated for version 2.004003.
+perl/perl-PAR-Dist: Updated for version 0.50.
+perl/perl-Template-Toolkit: Updated for version 3.009.
+python/python-requests: Updated for version 2.25.0.
+python/thonny: Updated for version 3.3.0.
+python/typing-extensions: Updated for version 3.7.4.3.
+python/vine: Updated for version 5.0.0.
+python/watchdog: Updated for version 0.10.3.
+ruby/ruby-build: Updated for version 20201118.
+system/Sl: Added (ls with enhancements)
+system/binfmt-support: Updated for version 2.2.1.
+system/fdclone: Added (two-pane textmode file manager)
+system/hexec: Added (hook into exec calls)
+system/intel-microcode: Updated for version 20201110.
+system/lv: Add patches, BUILD=2.
+system/qemu: Updated for version 4.1.1
+system/restric: Updated for version 0.11.0
+system/usbguard: Updated for version 0.7.8.
+system/xbattmon: Updated for version 1.1.
+system/xboxdrv-linux: Source change. Rebuilt.
+system/xidel: Added (extract data from HTML/XML/JSON files or pages)
++--------------------------+
+Sat Nov 14 10:17:36 UTC 2020
+academic/cadabra2: Updated for version 2.3.3.2.
+academic/cdo: Updated for version 1.9.9.
+academic/colin: Various fixes. Rebuilt.
+audio/FAudio: Updated for version 20.11.
+audio/alsacap: Use https URLs.
+audio/connie: Use a homepage that exists.
+audio/fluidsynth: Updated for version 2.1.5.
+desktop/cwm: Use correct github URLs.
+development/Fennel: Updated for version 0.7.0.
+development/Sphinx: Updated for version 3.3.1.
+development/asl: Updated for version 142_bld178.
+development/bsdiff: Fix download URL.
+development/cmake-202x: Updated for version 3.18.4.
+development/github-cli: Updated for version 1.2.1
+development/mongodb-compass: Updated for version 1.23.0.
+development/mrustc: Updated for version 0.9.
+development/racket: Updated for version 7.9.
+development/tea: updated for version 50.1.0
+development/vscode-bin: Updated for version 1.51.1.
+development/vstudio: Update MD5SUM.
+games/FlightGear-data: Updated for version 2020.3.2.
+games/FlightGear: Updated for version 2020.3.2.
+games/SLADE: Updated for version 3.1.12a.
+games/VASSAL: Updated for version 3.4.8.
+games/ags: updated for version 3.5.0.27
+games/commandergenius: Updated for version 2.6.3.1.
+games/exult: Updated for version 1.6.
+games/golly: Updated for version 4.0.
+games/gzdoom: Updated for version 4.5.0.
+games/ncursesoflife: Added (console Conway's Game of Life)
+games/tome-sx: Version number cleanup.
+games/xcowsay: Fix download link.
+gis/cartopy: Updated md5sum.
+gis/pointcloud: Updated for version 1.2.1.
+gis/saga-gis: Updated for version 7.8.1.
+graphics/blender: Fix download for x86.
+graphics/graphite2: Updated for version 1.3.14.
+graphics/libplacebo: Updated for version 2.72.2.
+graphics/vuescan: Updated for version 9.7.37..
+libraries/OpenBLAS: Updated for version 0.3.12.
+libraries/SimGear: Updated for version 2020.3.2.
+libraries/digimend-kernel-drivers: Updated for version 10.
+libraries/fmt: Updated for version 7.1.2.
+libraries/iddawc: updated for version 0.9.7
+libraries/libcbor: updated for version 0.8.0
+libraries/libjwt: updated for version 1.12.1
+libraries/libxkbcommon: Compress man pages.
+libraries/libxml++3: Updated for version 3.2.2.
+libraries/oath-toolkit: Updated for version 2.6.4.
+libraries/rhonabwy: updated for version 0.9.13
+libraries/ulfius: updated for version 2.6.10
+libraries/zmusic: Updated for version 1.1.4.
+multimedia/lightspark: Updated for version 0.8.3.
+multimedia/straw-viewer: Updated for version 0.1.1.
+network/AdGuardHome: Updated for version 0.104.1.
+network/glewlwyd: updated for version 2.4.0
+network/mod_auth_gssapi: Updated for version 1.6.3.
+network/ncp: Added (fast file copy tool for LANs)
+network/nicotine+: Updated for version 2.1.2.
+network/protonmail-bridge: Updated for version 1.5.0.
+network/protonmail-import-export-app: Added (ProtonMail App).
+network/protonvpn-cli: Added (ProtonVPN's Linux CLI)
+network/sfeed: Updated for version 0.9.19.
+network/sic: New maintainer.
+network/tor-browser: Updated for version 10.0.4.
+network/tor: Updated for version 0.4.4.6.
+network/tribler: Orphaned.
+network/vivaldi: Updated for version 3.4.2066.106.
+network/weechat: Updated for version 3.0.
+network/wireguard-linux-compat: Updated for version 1.0.20201112.
+network/zoom-linux: Updated for version 5.4.53391.1108
+office/calibre-bin: Updated for version 5.5.0.
+office/onlyoffice-desktopeditors: Updated for version 6.0.1.
+office/xournalpp: Updated for version 1.0.19.
+python/BeautifulSoup4: Updated for version 4.9.3.
+python/josepy: Updated for version 1.5.0.
+python/pycryptodomex: Updated for version 3.9.9.
+python/python-PySnooper: Updated for version 0.4.2.
+python/python-jsonrpclib: Updated for version 0.4.2.
+python/python-toml: Updated for version 0.10.2.
+python/python3-babel: Updated for version 2.8.1.
+system/Solaar: Updated for version 1.0.4
+system/chronograf: Updated for version 1.8.8
+system/colorize: Added (colorize text on terminal)
+system/fzf: Updated for version 0.24.3.
+system/jdupes: updated for version 1.19.0
+system/kapacitor: Updated for version 1.5.7
+system/lv: Added (pager, grep, and iconv replacement)
+system/memtester: Updated for version 4.5.0_1.
+system/nvidia-driver: Fix issue with .la handling.
+system/s3fs-fuse: Added (FUSE-based file system)
+system/s6-linux-init: Updated for version 1.0.5.1.
+system/telegraf: Updated for version 1.16.2
+system/tinyvm: Updated for version 20180322.
+system/vtcol: Compile with latest rust in patches.
+system/xbattmon: Download URL changed.
++--------------------------+
+Sat Nov  7 07:03:35 UTC 2020
+academic/ViennaRNA: Updated for version 2.4.16.
+academic/cadabra2: Updated for version 2.3.2.
+academic/colin: Updated for version 1.8.2.
+accessibility/svkbd: Updated for version 0.2.1.
+accessiblity/mag: Added (screen magnifier for X).
+audio/drumkv1: Updated for version 0.9.18.
+audio/guitarix: Add note to README.
+audio/jack: Updated for version 1.9.16.
+audio/jkmeter: Updated for version 0.8.0.
+audio/mixxx: Fix build.
+audio/padthv1: Updated for version 0.9.18.
+audio/podget: Updated for version 0.8.7, various fixes.
+audio/qm-vamp-plugins: Updated for version 1.8.0.
+audio/rubberband: Updated for version 1.9.0.
+audio/samplv1: Updated for version 0.9.18.
+audio/sonic-visualiser: Updated for version 4.2.
+audio/sooperlooper: Updated for version 1.7.6.
+audio/synthv1: Updated for version 0.9.18.
+audio/zita-ajbridge: Updated for version 0.8.4.
+desktop/clipmenu: Updated for version 6.2.0.
+desktop/j4-dmenu-desktop: Updated for version 2.18.
+desktop/pinentry-dmenu: Added (pinentry program)
+desktop/wmii: Fix man page. Add DOC make option.
+desktop/xdgmenumaker: Updated for version 1.6.
+development/adms: Fix script.
+development/bmake: Updated for version 20201010.
+development/gnulib: Find/chmod speedup.
+development/hugo: Updated for version 0.78.0.
+development/inform: Updated for version 6.34_6.12.4_1.
+development/jdk15: Updated for version 15.0.1.
+development/jupyter-notebook: Updated for version 6.1.4.
+development/racer: Updated for version 2.1.40.
+development/radare2: Updated for version 4.5.1.
+development/reflex: Updated for version 2.5.4.20200715.
+development/vstudio: Updated for version 10.
+development/watchman: Nitpicks.
+development/xtruss: Updated for version 20200918.a94a153.
+games/aisleriot: Update doinst.sh.
+games/fortune-noobfarm: Added (fortunes from noobfarm.org).
+games/mininim: Minor script edit.
+games/stella: Updated for version 6.4.
+games/xcowsay: Updated for version 1.5.1.
+games/zseal: Added (FICS Timeseal client).
+gis/OTB: Updated for version 7.2.0.
+gis/geopandas: Updated for version 0.8.0.
+gis/pgsql-ogr-fdw: Updated for version 1.0.12.
+gis/proj-data: Updated for version 1.3.
+gis/proj: Updated for 7.2.0.
+gis/pyproj: Updated for version 3.0.0.
+graphics/Blender: Updated for version 2.83.8
+graphics/SPIRV-Tools: Added (API+commands to process SPIR-V modules)
+graphics/Vulkan-Tools: Added (Vulkan Utilities and Tools)
+graphics/blender: Updated for version 2.90.1
+graphics/flpsed: Fix URLs, include icons.
+graphics/glslang: Updated for version 11.0.0.
+graphics/libplacebo: Update patch.
+graphics/qrencode: Updated for version 4.1.1.
+graphics/shaderc: Update script.
+graphics/vuescan: Updated for version 9.7.36.
+graphics/vulkan-sdk: Update script.
+libraries/SPIRV-Headers: Added (SPIRV Header files)
+libraries/Vulkan-Headers: Added (Vulkan Headers and API registry)
+libraries/gdl: Fix sandbox violation on current.
+libraries/jbig2dec: Updated for version 0.19.
+libraries/libbson: Updated for version 1.17.2.
+libraries/libcdr: Fix build for current.
+libraries/libdispatch: Added (Grand Central Dispatch)
+libraries/libe-book: Fix build for current.
+libraries/libpst: Fix VERSION in info file.
+libraries/libxkbcommon: Updated for version 1.0.1.
+libraries/mbedtls: Updated for version 2.16.8.
+libraries/pytaglib: Added (Python audio tagging library).
+multimedia/LBRY: Updated for version 0.48.2.
+multimedia/plexmediaserver: Updated for v. 1.20.4.3517_ab5e1197c.
+network/bozohttpd: Updated for version 20201014.
+network/efax: Added (send/receive fax).
+network/elinks: Fix SLKCFLAGS.
+network/felinks: Updated for version 08da1d8.
+network/nss-mdns: Updated for version 0.14.1.
+network/opera-developer: Updated for version 73.0.3856.0.
+network/opera: Updated for version 72.0.3815.186.
+network/signal-desktop: Updated for version 1.37.3.
+network/sslscan: Updated for version 2.0.6.
+network/telegram: Updated for version 2.4.6.
+network/telegram: Updated for version 2.4.7.
+network/vivaldi: Updated for version 3.4.2066.94.
+network/yadifa: Updated for version 2.4.0.
+office/coolreader: Updated for version 3.2.50, keyboard shortcuts.
+perl/perl-Coro: Compress manual pages.
+python/argon2-cffi: Added (Python implementation of Argon2).
+python/bleach: Updated for version 3.2.1.
+python/esptool: Updated for version 3.0.
+python/parso: Updated for version 0.8.0.
+python/python-emoji: Updated for version 0.6.0.
+python/python-importlib_metadata: Updated for version 2.0.0.
+python/python-joblib: Updated for version 0.17.0.
+python/python-prometheus_client: Updated for version 0.8.0.
+python/python3-ipython: Updated for version 7.19.0.
+python/python3-prompt_toolkit: Updated for version 3.0.8.
+python/python3-tornado: Updated for version 6.1.0.
+python/scikit-learn: Updated for version 0.23.2.
+system/Iosevka-slab: Updated for version 3.7.1.
+system/Iosevka: Updated for version 3.7.1.
+system/alacritty: Updated for version 0.4.3.
+system/bleachbit: Update script.
+system/cpmtools: Updated for version 2.21.
+system/esekeyd: Added (multimedia keyboard daemon for Linux).
+system/fzf: Updated for version 0.24.2.
+system/info2man: Updated for version 1.1_9.
+system/kitchen-sync: Updated for version 2.10.
+system/man-pages-ja: Updated for version 20201015.
+system/man-pages-ru: Updated for version 5.03_20191017, new maint.
+system/mmv: Added (multiple mv/rename).
+system/oksh: Updated for version 6.8.1.
+system/passwordsafe: Updated for version 1.12.0.
+system/reptyr: Updated for version 0.8.0.
+system/triggerhappy: Added (a lightweight global hotkey daemon).
++--------------------------+
+Sat Oct 31 04:17:01 UTC 2020
+academic/SeqMonk: Added (A Mapped Sequence Analysis tool)
+academic/cadabra2: Updated for version 2.3.1.15.
+academic/fet: Updated for version 5.47.0.
+accessibility/wgetpaste: Update README.
+accessibility/xsel: Fix build on -current.
+audio/alsacap: Tweak script.
+audio/puddletag: Updated for version 2.0.1. New Maintainer.
+audio/sooperlooper: Updated for version 1.7.4.
+desktop/cwm: Updated for version 6.7.
+desktop/fvwm3: Rebuilt.
+desktop/wmweather+: Updated for version 2.18.
+desktop/x2x: Added (share keyboard/mouse across multiple X displays)
+development/Sphinx: Updated for version 3.2.1.
+development/composer: Updated for version 2.0.2
+development/d-tools: Updated for version 2.094.1
+development/dbeaver-ce: Updated for version 7.2.3.
+development/dmd: Updated for version 2.094.1
+development/dwarf: Removed (use libdwarf).
+development/github-cli: Updated for version 1.2.0.
+development/hhvm: Updated for version 4.56.1
+development/jupyter-nbdime: Updated for version 2.1.0.
+development/jupyter-nbformat: Updated for version 5.0.6.
+development/jupyter_client: Updated for version 6.1.6.
+development/jupyter_console: Updated for version 6.2.0.
+development/nim: Updated for version 1.4.0.
+development/psycopg2: Updated for version 2.8.6.
+development/xa: Updated for version 2.3.11.
+development/xxd-standalone: Added (hex dump utility from vim)
+games/VASSAL: Updated for version 3.4.7.
+games/alephone: Updated for version 20201026.
+games/atari++: Updated for version 1.83.
+games/colem: Updated for version 5.4.
+games/commandergenius: Updated for version 2.6.3.
+games/doomseeker: Updated for version 1.3.1.
+games/gzdoom: Updated for version 4.4.2.
+games/marathon-data: Updated for version 20200904.
+games/marathon-infinity-data: Updated for version 20200904.
+games/marathon2-data: Updated for version 20200904.
+games/odamex: Updated for version 0.8.3.
+games/open-adventure: Updated for version 1.9.
+games/puNES: Updated for version 0.106.
+games/qtads: Updated for version 3.0.0.
+games/qzdoom: Build enhancements.
+games/solarus: Add patch.
+games/stella: Updated for version 6.3.
+games/trackballs: Updated for version 1.3.1.
+games/uqm: Updated for version 0.7.0+0.8.0.
+games/uqm_3domusic: Add note to README.
+games/uqm_voice: Updated for version 0.8.0.
+games/vera: Updated for version 1.24.
+games/xroar: Updated for version 0.36.2.
+gis/osm2pgsql: Updated for version 1.3.0.
+gis/pyshp: Updated for version 2.1.2.
+gis/python-pygeos: Updated for version 0.8.
+gis/rasterio: Updated for version 1.1.8.
+gis/saga-gis: Updated for version 7.8.0.
+graphics/vuescan: Updated MD5SUMs.
+graphics/wine-nine-standalone: Updated for version 0.7.
+libraries/QR-Code-generator: Added (QR Code generator library)
+libraries/fmt: Updated for version 7.1.0.
+libraries/gumbo-parser: Added (An HTML5 parsing library in pure C99)
+libraries/libcdr: Updated for version 0.1.6.
+libraries/libetonyek: Fix build on current.
+libraries/libfreehand: Fix build on current.
+libraries/libgltf: Removed.
+libraries/libixion: Updated for version 0.16.1.
+libraries/libmwaw: Updated for version 0.3.17.
+libraries/libnbcompat: Added (a portable NetBSD compat library)
+libraries/libnumbertext: Updated for version 1.0.6.
+libraries/liborcus: Updated for version 0.16.1.
+libraries/libpst: Updated for version 0.6.74.
+libraries/libstaroffice: Updated for version 0.0.7.
+libraries/libuv: Updated for version 1.40.0.
+libraries/libwps: Updated for version 0.4.12.
+libraries/mdds: Updated for version 1.7.0.
+libraries/spdlog: Updated for version 1.8.1.
+libraries/xmlsec: Updated for version 1.2.31.
+libraries/zmusic: Added (library for music support in games)
+misc/git-store-meta: Added (metadata storing and applying for Git)
+misc/heyu: Updated for version 2.10.2.
+misc/vttest: Updated for version 2.7.20200920.
+multimedia/plexmediaserver: Updated for v 1.20.3.3483_211702a9f.
+multimedia/youtube-viewer: Orphaned.
+network/AdGuardHome: Updated for version 0.104.0.
+network/freedownloadmanager: Added (Download Accelerator)
+network/i2pd: Updated for version 2.34.0.
+network/luakit: Updated for version 2.2.1.
+network/megatools: Updated for version 1.10.3.
+network/neomutt: configure flags and README updated.
+network/nsd: Updated for version 4.3.3.
+network/sslscan: Updated for version 2.0.5.
+network/teamviewer: Updated for version 15.11.6.
+network/telegram: Updated for version 2.4.5.
+network/tnftp: Updated for version 20200705.
+network/vivaldi: Updated for version 3.4.2066.90.
+network/wire: Updated for version 3.21.2936.
+network/wireshark: Updated for version 3.4.0.
+network/zoom-linux: Updated for version 5.4.53268.1025
+office/FreeOffice: Added (free alternative to Microsoft Office)
+office/calcurse: Updated for version 4.7.0.
+office/calibre-bin: Updated for version 5.4.2.
+office/keepassxc: Updated for version 2.6.2.
+office/mupdf: Updated for version 1.18.0.
+office/zim: Updated for version 0.73.3.
+perl/MoarVM: Updated for version 2020.10.
+perl/nqp: Updated for version 2020.10.
+perl/perl-Coro: Updated for version 6.57.
+perl/perl-List-MoreUtils-XS: Updated for version 0.430.
+perl/perl-YAML-Syck: Updated for version 1.34.
+perl/perl-file-libmagic: Updated for version 1.23.
+perl/perl-file-mimeinfo: Updated for version 0.30.
+perl/rakudo: Updated for version 2020.10.
+perl/zef: Updated for version 0.9.1.
+python/Pygments: Updated for version 2.7.2.
+python/cheetah3: Updated for version 3.2.6.
+python/pandocfilters: Updated for version 1.4.3.
+python/python-PySnooper: Updated for version 0.4.1.
+python/python3-babel: Support Python 3.9.
+python/python3-ipython: Updated for version 7.18.3.
+python/python3-isort: Updated for version 5.6.4.
+python/python3-jedi: Updated for version 0.17.2.
+python/python3-jupyter-ipykernel: Updated for version 5.3.4.
+python/python3-prompt_toolkit: Updated for version 3.0.6.
+python/python3-pyrsistent: Updated for version 0.17.3.
+python/pyzmq: Updated for version 19.0.2.
+python/sphinxcontrib-websupport: Updated for version 1.2.4.
+python/terminado: Updated for version 0.9.1.
+python/traitlets: Updated for version 5.0.5.
+system/acpi_call: Allow acpi_call to be built with 5.x kernels.
+system/agedu: Updated for version 20200705.2a7d4a2.
+system/ded: Updated for version 20200428.
+system/dust: Updated for version 0.5.3.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.24.
+system/fzf: Updated for version 0.24.1.
+system/kitchen-sync: Updated for version 2.9.
+system/loksh: Updated for version 6.8.1.
+system/man-db: Updated for version 2.9.3.
+system/netdata: Updated for version 1.26.0.
+system/nmtree: Added (a port of NetBSD's mtree utility to Linux)
+system/oksh: Updated for version 6.7.1.
+system/pspg: Updated for version 3.1.5.
+system/telegraf: Updated for version 1.16.1
+system/usermin: Updated for version 1.810.
+system/webmin: Updated for version 1.960.
+system/wine-staging: Updated for version 5.20.
+system/xen: XSA 333-347 update.
++--------------------------+
+Sat Oct 24 01:15:32 UTC 2020
+academic/ngspice: Updated for version 33.
+audio/amSynth: Updated for version 1.11.0.
+desktop/dunst: Updated for version 1.5.0.
+desktop/i3: Updated for version 4.18.3.
+desktop/rofi: Updated for version 1.6.0.
+development/eclipse-cpp: Updated for version 4.15.
+development/eclipse-java: Updated for version 4.15.
+development/eclipse-platform: Added (Eclipse IDE)
+development/github-cli: Added (GitHub command line interface)
+development/global: Updated for version 6.6.5.
+development/hugo: Updated for version 0.76.5.
+development/jdk14: Fix README.
+development/mit-scheme: Updated for version 10.1.11.
+development/mongodb-compass: Updated for version 1.22.1.
+development/rustup: Fix README.
+games/QuickNES-Core: Added (fast NES libretro core)
+games/VASSAL: Updated for version 3.4.6.
+games/chocolate-doom: Updated for version 3.0.1.
+games/mame2000-libretro: Updated for version 2020.10.21_6655a51.
+games/mednafen: Updated for version 1.24.3.
+games/oolite: Updated for version 1.90.
+graphics/GraphicsMagick: Updated for version 1.3.35.
+graphics/fontforge: Add trap to exit if already installed.
+graphics/gmic: Enable build with latest opencv (4.5.0)
+graphics/graphene: Fix README.
+graphics/libplacebo: Use upstream patch.
+graphics/lilypond: Fix FontForge detection.
+graphics/vuescan: Updated MD5SUMs.
+libraries/zeromq: Updated for version 4.3.3.
+misc/g810-led: Added (LED controller for Logitech Gx10 keyboards)
+misc/moreutils: Updated for version 0.64.
+multimedia/plexmediaserver: Updated for v 1.20.3.3437_f1f08d65b.
+network/Electrum: Updated for version 4.0.4.
+network/QuiteRSS: Updated for version 0.19.4.
+network/bluejeans: Updated for version 2.17.0.11.
+network/opera-developer: Updated for version 73.0.3847.0.
+network/opera: Updated for version 72.0.3815.148.
+network/protonmail-bridge: Updated for version 1.4.4.
+network/protonmail-bridge: Updated for version 1.4.5
+network/signal-desktop: Updated for version 1.37.2.
+network/telegram: Updated for version 2.4.4.
+network/tor-browser: Updated for version 10.0.2.
+network/vivaldi: Updated for version 3.4.2066.86.
+network/yle-dl: Updated for version 20201022.
+network/zoom-linux: Fix VERSION, slack-desc.
+network/zoom-linux: Fix VERSION.
+office/coolreader: Updated for version 3.2.49.
+office/pandoc-bin: Updated for version 2.11.0.2.
+perl/perl-Glib-Object-Introspection: Updated for version 0.049.
+perl/perl-cgi-minimal: Updated for version 1.30.
+python/python3-isort: Updated for version 5.6.1.
+system/firejail: Updated for version 0.9.64.
+system/fzf: Fix info.
+system/megacli: Added (LSI hardware RAID management utility)
+system/nvme-cli: Updated for version 1.13.
+system/phoronix-test-suite: Updated for version 10.0.1.
+system/powerpanel: Updated for version 1.3.3.
+system/restic: Added (Modern backup program to backup your files)
+system/rhash: Updated for version 1.4.0.
+system/sleuthkit: Updated for version 4.10.0.
+system/system76-power: Updated for version 1.1.11
++--------------------------+
 Sat Oct 17 02:41:30 UTC 2020
 academic/CAFS_divergence: Fix README.
 academic/FreeFem: Fix README.
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index 53afd8bc54..dfc3aeaf19 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
+++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Gridcoin-Research
 
-# Copyright 2018-2019 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2018-2021 Edward W. Koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Gridcoin-Research
-VERSION=${VERSION:-5.0.2.0}
+VERSION=${VERSION:-5.3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+NUMJOBS=${NUMJOBS:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -97,7 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   $usepnp \
   --build=$ARCH-slackware-linux
 
-make
+make -j${NUMJOBS}
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.desktop b/academic/Gridcoin-Research/Gridcoin-Research.desktop
deleted file mode 100644
index 5e6896f326..0000000000
--- a/academic/Gridcoin-Research/Gridcoin-Research.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Gridcoin
-Comment=Gridcoin is an open source cryptocurrency (Ticker: GRC) which securely rewards volunteer computing performed on the BOINC platform.
-Exec=gridcoinresearch
-Icon=grc
-Categories=Education;Science;
-Terminal=false
-Hidden=false
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.info b/academic/Gridcoin-Research/Gridcoin-Research.info
index 80cccaac77..a3675fa047 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.info
+++ b/academic/Gridcoin-Research/Gridcoin-Research.info
@@ -1,8 +1,8 @@
 PRGNAM="Gridcoin-Research"
-VERSION="5.0.2.0"
+VERSION="5.3.1.0"
 HOMEPAGE="https://gridcoin.us/"
-DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/5.0.2.0/Gridcoin-Research-5.0.2.0.tar.gz"
-MD5SUM="b48e0505529e175e197bef511c425a48"
+DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/5.3.1.0/Gridcoin-Research-5.3.1.0.tar.gz"
+MD5SUM="773b104454e9c35f0594e28d88e04ed7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/Gridcoin-Research/README b/academic/Gridcoin-Research/README
index dfccd82244..bc15acbd92 100644
--- a/academic/Gridcoin-Research/README
+++ b/academic/Gridcoin-Research/README
@@ -15,3 +15,5 @@ in /etc/Gridcoin-Research/ and place it in your home directory
 ~/.GridcoinResearch/ to provide the location of your boinc data
 and any other configurations that you require. For details, see
 https://wiki.gridcoin.us/Gridcoinresearch_config_file
+
+**NOTE: Recommended Leisure update**
diff --git a/academic/Gridcoin-Research/gridcoinresearch.conf b/academic/Gridcoin-Research/gridcoinresearch.conf
index 7ab2e07a3f..1c66a0b640 100644
--- a/academic/Gridcoin-Research/gridcoinresearch.conf
+++ b/academic/Gridcoin-Research/gridcoinresearch.conf
@@ -2,44 +2,38 @@
 #################### Example gridcoinresearch.conf file #####################
 #############################################################################
 ##
-## For further details on this configuration file please see:
-## http://wiki.gridcoin.us/Gridcoinresearch_config_file
-##
 ## Default gridcoinresearch.conf location:
 ##
 ##  Win:   %AppData%\GridcoinResearch\
 ##  Linux: ~/.GridcoinResearch/
-##  MacOS: /Users/USERNAME/Library/Application/Support/GridcoinResearch/
+##  macOS: /Users/USERNAME/Library/Application/Support/GridcoinResearch/
 ##
-## Single # lines are commands, remove the # in Front of the Command to use it
+## Single # lines are commands, remove the # in Front of the command to use it
 ## Double ## lines are comments
 ##
 #############################################################################
 ####################### Required Settings (All OS's) ########################
 #############################################################################
 
-## Community provided list of addnodes available at
-## http://wiki.gridcoin.us/List_of_Addnodes
+## Community provided list of addnodes available at https://github.com/gridcoin-community/Gridcoin-Wiki/wiki/List-of-Addnodes
 #~~~~~Copy & Paste Addnodes here~~~~~
 
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-## BOINC account settings, i.e. your BOINC CPID & E-Mail
-## Use INVESTOR for Investor or Pool Mining
-PrimaryCPID=INVESTOR
-email=INVESTOR
+## BOINC account E-Mail
+## Use blank or INVESTOR for Investor or Pool Mining
+## Note the PrimaryCPID field is deprecated and ignored since the 4.0.5.0
+## release.
+email=
 
-## Port 32749/TCP required for Inbound Connections
+## Port 32749/TCP open or forwarded required for Inbound Connections
 ## (Not required but highly recommended)
-listen=1
+#listen=1
 
 ## Required for Headless set-ups
 #daemon=1
 
-## Blocks client from upgrading on its own. 
-suppressupgrade=true
-
 #############################################################################
 ############# RPC Settings for Remote Access and Headless Users #############
 ############ Warning: Set a Good Password and Secure Your System ############
@@ -50,25 +44,46 @@ suppressupgrade=true
 #rpcallowip=<IP Address of Remote System>
 #rpcport=<Port for RPC Communication>
 #rpcuser=<A Username for RPC>
-#rpcpassword=<A GOOD Password for RPC>
+#rpcpassword=<A STRONG Password for RPC>
 
 #############################################################################
 ######################## Optional BOINC settings ############################
 ########### (Required if BOINC installed to non-default location) ###########
 #############################################################################
 
+## Windows (Note the double backslashes are necessary)
+#boincdatadir=C:\\ProgramData\\BOINC\\
+
 ## Linux
-boincdatadir=$HOME/.boinc_data/
+#boincdatadir=/var/lib/boinc-client/
+
+## macOS
+#boincdatadir=/Library/Application Support/BOINC Data/
 
 #############################################################################
 ######################## Optional Network settings ##########################
 #############################################################################
 
-## Maximum number of inbound+outbound connections.Default 125
-maxconnections=125
-## Maximum number of outbound connections.Default 8
-maxoutboundconnections=8
+## Maximum number of inbound+outbound connections. Default 125
+#maxconnections=125
+## Maximum number of outbound connections. Default 8
+#maxoutboundconnections=8
 ## Manually Set-up Ports
 #upnp=false
 #externalip=<Your IP Address>
-#port=32748
\ No newline at end of file
+
+#############################################################################
+############################## Other Entries ################################
+#############################################################################
+
+## See detailed Other Entries description section below.
+
+#debug=true
+#debug=<category>
+
+#enablestakesplit=1
+#stakingefficiency=<percentage between 75 and 98, defaults to 90>
+#minstakesplitvalue=<value in GRC, minimum and defaults to 800>
+
+#enablesidestaking=1
+#sidestake=<address>,<allocation percentage>
diff --git a/academic/IGV/IGV.SlackBuild b/academic/IGV/IGV.SlackBuild
new file mode 100644
index 0000000000..746d394ea4
--- /dev/null
+++ b/academic/IGV/IGV.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for IGV
+
+# Copyright 2020 Petar Petrov slackalaxy@gmail.com
+# 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=IGV
+VERSION=${VERSION:-2.8.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+JDK=jdk-11
+
+if [ -z "$ARCH" ]; then
+  ARCH="$( uname -m )"
+fi
+
+if [ "$ARCH" != "x86_64" ]; then
+  printf "\n\n$ARCH is not supported... \n" >&2
+  exit 1
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf ${PRGNAM}_Linux_${VERSION}
+unzip $CWD/${PRGNAM}_Linux_${VERSION}_WithJava.zip
+cd ${PRGNAM}_Linux_${VERSION}
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Place it in /opt and make a symlink later
+mkdir -p $PKG/opt/$PRGNAM
+cp -a $JDK lib igv.args igv.sh igv_hidpi.sh $PKG/opt/$PRGNAM
+
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp IGV_64.png $PKG/usr/share/pixmaps/$PRGNAM.png
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a readme.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/References > $PKG/usr/doc/$PRGNAM-$VERSION/References
+
+mkdir -p $PKG/usr/bin
+cd $PKG/usr/bin
+ln -s ../../opt/$PRGNAM/igv.sh igv
+cd -
+
+mkdir -p $PKG/install
+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}
diff --git a/academic/IGV/IGV.desktop b/academic/IGV/IGV.desktop
new file mode 100644
index 0000000000..9dad30517e
--- /dev/null
+++ b/academic/IGV/IGV.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Exec=igv
+Terminal=false
+Name=IGV
+Icon=IGV
+Comment=Integrative Genomics Viewer
+Categories=Education;
diff --git a/academic/IGV/IGV.info b/academic/IGV/IGV.info
new file mode 100644
index 0000000000..f54e6a3a2d
--- /dev/null
+++ b/academic/IGV/IGV.info
@@ -0,0 +1,10 @@
+PRGNAM="IGV"
+VERSION="2.8.12"
+HOMEPAGE="http://software.broadinstitute.org/software/igv/home"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_Linux_2.8.12_WithJava.zip"
+MD5SUM_x86_64="7ee4f59615726723964bd9e023baf136"
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/IGV/README b/academic/IGV/README
new file mode 100644
index 0000000000..7c1ec02a11
--- /dev/null
+++ b/academic/IGV/README
@@ -0,0 +1,7 @@
+The Integrative Genomics Viewer (IGV) is a high-performance and easy-to-
+use, interactive tool for the visual exploration of genomic data. It
+supports flexible integration of all the common types of genomic data
+and metadata, investigator-generated or publicly available, loaded from
+local or cloud sources.
+
+Please, check the package's documentation folder for citing information.
diff --git a/academic/IGV/References b/academic/IGV/References
new file mode 100644
index 0000000000..cdbdf3e743
--- /dev/null
+++ b/academic/IGV/References
@@ -0,0 +1,17 @@
+To cite your use of IGV in your publication, please reference one or more of:
+
+James T. Robinson, Helga Thorvaldsdóttir, Wendy Winckler, Mitchell Guttman,
+Eric S. Lander, Gad Getz, Jill P. Mesirov. Integrative Genomics Viewer.
+Nature Biotechnology 29, 24–26 (2011). (Free PMC article here).
+
+Helga Thorvaldsdóttir, James T. Robinson, Jill P. Mesirov.  
+Integrative Genomics Viewer (IGV): high-performance genomics data visualization
+and exploration. Briefings in Bioinformatics 14, 178-192 (2013).
+
+James T. Robinson, Helga Thorvaldsdóttir, Aaron M. Wenger, Ahmet Zehir, Jill P.
+Mesirov. Variant Review with the Integrative Genomics Viewer (IGV). Cancer
+Research 77(21) 31-34 (2017).
+
+James T. Robinson, Helga Thorvaldsdóttir, Douglass Turner, Jill P. Mesirov.
+igv.js: an embeddable JavaScript implementation of the Integrative Genomics
+Viewer (IGV). bioRxiv 2020.05.03075499.
diff --git a/multimedia/vokoscreen/doinst.sh b/academic/IGV/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/multimedia/vokoscreen/doinst.sh
+++ b/academic/IGV/doinst.sh
diff --git a/academic/IGV/slack-desc b/academic/IGV/slack-desc
new file mode 100644
index 0000000000..c02edd24c9
--- /dev/null
+++ b/academic/IGV/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+IGV: IGV (Integrative Genomics Viewer)
+IGV:
+IGV: The Integrative Genomics Viewer (IGV) is a high-performance and easy
+IGV: to use, interactive tool for the visual exploration of genomic data.
+IGV: It supports flexible integration of all the common types of genomic
+IGV: data and metadata, investigator-generated or publicly available,
+IGV: loaded from local or cloud sources.
+IGV:
+IGV: http://software.broadinstitute.org/software/igv/home
+IGV:
+IGV:
diff --git a/academic/ITK/ITK.SlackBuild b/academic/ITK/ITK.SlackBuild
index afeb3068c8..fd9e8128f0 100644
--- a/academic/ITK/ITK.SlackBuild
+++ b/academic/ITK/ITK.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for ITK
 
-# Copyright 2018-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 
 PRGNAM=ITK
 SRCNAM=InsightToolkit
-VERSION=${VERSION:-4.13.2}
+VERSION=${VERSION:-5.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,51 +75,28 @@ find -L . \
 sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" CMakeLists.txt
 sed -i "s|/opj_config.h|& \$\{CMAKE_CURRENT_BINARY_DIR\}/openjpeg_mangle.h|" \
     Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt
-patch -p1 <<'endpatch'
-diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-index 4865361421e..220b9cd49a8 100644
---- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-@@ -97,6 +97,17 @@
- #  else
- #   define VCL_GCC_80
- #  endif
-+# elif (__GNUC__==9)
-+#  define VCL_GCC_9
-+#  if (__GNUC_MINOR__ > 2 )
-+#   define VCL_GCC_93
-+#  elif (__GNUC_MINOR__ > 1 )
-+#   define VCL_GCC_92
-+#  elif (__GNUC_MINOR__ > 0 )
-+#   define VCL_GCC_91
-+#  else
-+#   define VCL_GCC_90
-+#  endif
- # else
- #  error "Dunno about this gcc"
- # endif
-endpatch
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DITK_FORBID_DOWNLOADS:BOOL=ON \
-    -DITK_WRAP_PYTHON:BOOL=OFF \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=OFF \
-    -DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
-    -DITK_USE_SYSTEM_DCMTK:BOOL=ON \
-    -DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=ON \
-    -DITK_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DITK_USE_SYSTEM_FFTW:BOOL=ON \
-    -DITK_USE_SYSTEM_HDF5:BOOL=ON \
-    -DITK_USE_SYSTEM_JPEG:BOOL=ON \
-    -DITK_USE_SYSTEM_PNG:BOOL=ON \
-    -DITK_USE_SYSTEM_TIFF:BOOL=ON \
-    -DITK_USE_SYSTEM_ZLIB:BOOL=ON \
+    -DITK_FORBID_DOWNLOADS=ON \
+    -DITK_WRAP_PYTHON=OFF \
+    -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_EXAMPLES=OFF \
+    -DITK_USE_SYSTEM_LIBRARIES=ON \
+    -DITK_USE_SYSTEM_DCMTK=ON \
+    -DITK_USE_SYSTEM_EIGEN=OFF \
+    -DITK_USE_SYSTEM_EXPAT=ON \
+    -DITK_USE_SYSTEM_FFTW=ON \
+    -DITK_USE_SYSTEM_HDF5=ON \
+    -DITK_USE_SYSTEM_JPEG=ON \
+    -DITK_USE_SYSTEM_PNG=ON \
+    -DITK_USE_SYSTEM_TIFF=ON \
+    -DITK_USE_SYSTEM_ZLIB=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make install DESTDIR=$PKG
 cd ..
diff --git a/academic/ITK/ITK.info b/academic/ITK/ITK.info
index d72260cfa6..9479aaaac9 100644
--- a/academic/ITK/ITK.info
+++ b/academic/ITK/ITK.info
@@ -1,10 +1,10 @@
 PRGNAM="ITK"
-VERSION="4.13.2"
+VERSION="5.1.2"
 HOMEPAGE="https://itk.org"
-DOWNLOAD="https://github.com/InsightSoftwareConsortium/ITK/releases/download/v4.13.2/InsightToolkit-4.13.2.tar.xz"
-MD5SUM="d140ddabe22428e86bc5053e0d268872"
+DOWNLOAD="https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.1.2/InsightToolkit-5.1.2.tar.gz"
+MD5SUM="e939fc61e7354eba20f98fbd7b034ec2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="double-conversion gtest hdf5"
+REQUIRES="cmake-202x double-conversion gtest hdf5"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/academic/STAR/STAR.SlackBuild b/academic/STAR/STAR.SlackBuild
index 9ec244770f..d785f46923 100644
--- a/academic/STAR/STAR.SlackBuild
+++ b/academic/STAR/STAR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for STAR
 
-# Copyright 2018-2019 Rob van Nues
+# Copyright 2018-2021 Rob van Nues <sborg63@disroot.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=STAR
-VERSION=${VERSION:-2.7.6a}
+VERSION=${VERSION:-2.7.8a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/STAR/STAR.info b/academic/STAR/STAR.info
index f2575722f3..68740e69a3 100644
--- a/academic/STAR/STAR.info
+++ b/academic/STAR/STAR.info
@@ -1,10 +1,10 @@
 PRGNAM="STAR"
-VERSION="2.7.6a"
+VERSION="2.7.8a"
 HOMEPAGE="https://github.com/alexdobin/STAR"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/alexdobin/STAR/archive/2.7.6a/STAR-2.7.6a.tar.gz"
-MD5SUM_x86_64="eddf95a112395903f10b0b9fb5c0b9b6"
+DOWNLOAD_x86_64="https://github.com/alexdobin/STAR/archive/2.7.8a/STAR-2.7.8a.tar.gz"
+MD5SUM_x86_64="b6482dd380c5c07587166ee240573780"
 REQUIRES=""
 MAINTAINER="Rob van Nues"
 EMAIL="sborg63@disroot.org"
diff --git a/academic/SeqMonk/README b/academic/SeqMonk/README
new file mode 100644
index 0000000000..a5d7990f84
--- /dev/null
+++ b/academic/SeqMonk/README
@@ -0,0 +1,15 @@
+SeqMonk - A Mapped Sequence Analysis tool
+-----------------------------------------
+
+SeqMonk is a tool for viewing and analysing mapped sequence data. It
+was initially written to cope with remapping experiment data from
+next generation sequencers, but could be applied to any dataset
+consisting of a series of mapped genomic regions. The program allows
+you to visualise the positions of your mapped regions against an
+annotated genome and to quantify the data in order to make comparisons
+between data sets.
+
+If you have any comments about SeqMonk the authors would like to hear
+them. You either enter them in the bug tracking system at:
+
+https://github.com/s-andrews/seqmonk/issues/
diff --git a/academic/SeqMonk/SeqMonk.SlackBuild b/academic/SeqMonk/SeqMonk.SlackBuild
new file mode 100644
index 0000000000..e09ee60c9a
--- /dev/null
+++ b/academic/SeqMonk/SeqMonk.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for SeqMonk
+
+# Copyright 2020 Petar Petrov slackalaxy@gmail.com
+# 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=SeqMonk
+VERSION=${VERSION:-1.47.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+EXENAM=seqmonk
+TARNAM=${EXENAM}_v${VERSION}_linux64
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+if [ "$ARCH" != "x86_64" ]; then
+  printf "\n\n$ARCH is not supported... \n"
+  exit 1
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$TARNAM.tar.gz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Make sure SeqMonk finds its own java environment
+sed -i 's:java -version:$RealBin/jre/bin/java -version:' seqmonk
+
+# Change icon path and category in the desktop file
+sed -i "s:/usr/local/SeqMonk/uk/ac/bbsrc/babraham/SeqMonk/Resources/monk.svg:$EXENAM:" $EXENAM.desktop
+sed -i "s:Categories=Application:Categories=Education:" $EXENAM.desktop
+
+mkdir -p $PKG/opt/$PRGNAM
+cp -a \
+  com edu Help jre net Scripts Templates uk *.jar seqmonk seqmonk_import \
+  $PKG/opt/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  INSTALL.txt LICENSE LICENSE.txt NOTICE_FOR_COMMONS_MATH_CODE.txt README.md README.txt RELEASE_NOTES.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp -a uk/ac/babraham/SeqMonk/Resources/monk_logo.png $PKG/usr/share/pixmaps/$EXENAM.png
+cp -a $EXENAM.desktop $PKG/usr/share/applications
+
+# Leave the program in /opt and create a symlink to it
+mkdir -p $PKG/usr/bin
+cd $PKG/usr/bin
+ln -s ../../opt/$PRGNAM/$EXENAM .
+cd -
+
+mkdir -p $PKG/install
+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}
diff --git a/academic/SeqMonk/SeqMonk.info b/academic/SeqMonk/SeqMonk.info
new file mode 100644
index 0000000000..af8b37178c
--- /dev/null
+++ b/academic/SeqMonk/SeqMonk.info
@@ -0,0 +1,10 @@
+PRGNAM="SeqMonk"
+VERSION="1.47.1"
+HOMEPAGE="https://www.bioinformatics.babraham.ac.uk/projects/seqmonk/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://www.bioinformatics.babraham.ac.uk/projects/seqmonk/seqmonk_v1.47.1_linux64.tar.gz"
+MD5SUM_x86_64="e7c80b113e4c80d26e7eca468a636134"
+REQUIRES="R"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/SeqMonk/doinst.sh b/academic/SeqMonk/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/academic/SeqMonk/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/academic/SeqMonk/slack-desc b/academic/SeqMonk/slack-desc
new file mode 100644
index 0000000000..632f4c5de1
--- /dev/null
+++ b/academic/SeqMonk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+SeqMonk: SeqMonk (A Mapped Sequence Analysis tool)
+SeqMonk:
+SeqMonk: SeqMonk is a tool for viewing and analysing mapped sequence data.
+SeqMonk: It was initially written to cope with remapping experiment data
+SeqMonk: from next generation sequencers, but could be applied to any
+SeqMonk: dataset consisting of a series of mapped genomic regions. The
+SeqMonk: program allows you to visualise the positions of your mapped
+SeqMonk: regions against an annotated genome and to quantify the data in
+SeqMonk: order to make comparisons between data sets.
+SeqMonk:
+SeqMonk: https://www.bioinformatics.babraham.ac.uk/projects/seqmonk/
diff --git a/academic/ViennaRNA/ViennaRNA.SlackBuild b/academic/ViennaRNA/ViennaRNA.SlackBuild
index b8a844314e..8bc20e2a45 100644
--- a/academic/ViennaRNA/ViennaRNA.SlackBuild
+++ b/academic/ViennaRNA/ViennaRNA.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ViennaRNA
-VERSION=${VERSION:-2.4.15}
+VERSION=${VERSION:-2.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/ViennaRNA/ViennaRNA.info b/academic/ViennaRNA/ViennaRNA.info
index 567309379c..162b17f93a 100644
--- a/academic/ViennaRNA/ViennaRNA.info
+++ b/academic/ViennaRNA/ViennaRNA.info
@@ -1,10 +1,10 @@
 PRGNAM="ViennaRNA"
-VERSION="2.4.15"
+VERSION="2.4.17"
 HOMEPAGE="https://www.tbi.univie.ac.at/RNA"
-DOWNLOAD="https://github.com/ViennaRNA/ViennaRNA/releases/download/v2.4.15/ViennaRNA-2.4.15.tar.gz"
-MD5SUM="e9bc193a8ef2322fa17c947620e7b2e8"
+DOWNLOAD="https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/ViennaRNA-2.4.17.tar.gz"
+MD5SUM="16bc4e1889c301b91985a3bac1f21e30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 gri"
+REQUIRES="python3"
 MAINTAINER="Rob van Nues"
 EMAIL="sborg63@disroot.org"
diff --git a/academic/amd/amd.SlackBuild b/academic/amd/amd.SlackBuild
index 796d4d8885..57645d2d25 100644
--- a/academic/amd/amd.SlackBuild
+++ b/academic/amd/amd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for AMD
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=amd
 SRCNAM=SuiteSparse
 SUBDIR=AMD
 VERSION=${VERSION:-2.4.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/amd/amd.info b/academic/amd/amd.info
index 5a6b836b8c..da6c16b92b 100644
--- a/academic/amd/amd.info
+++ b/academic/amd/amd.info
@@ -1,8 +1,8 @@
 PRGNAM="amd"
 VERSION="2.4.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/aris/aris.SlackBuild b/academic/aris/aris.SlackBuild
index a377d31a7f..4d0f2a04f2 100644
--- a/academic/aris/aris.SlackBuild
+++ b/academic/aris/aris.SlackBuild
@@ -2,16 +2,34 @@
 
 # Slackware build script for GNU aris
 
-# Written by Juan M. Lasca <juanmlasca@gmail.com>
+# Originally written by Juan M. Lasca <juanmlasca at gmail dot com>
+# Currently maintained by Philip Lacroix <slackph at posteo dot de>
+
+# 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=aris
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,18 +40,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -46,26 +60,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -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 {} \;
-
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --htmldir=/usr/doc/$PRGNAM-$VERSION/html \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
-# this will allow aris to find its documentation
-# in a better place.
-patch -p1 < $CWD/html_doc.patch
+# Fix path for local manual
+patch src/aris.c < $CWD/help_path.diff
 
 make
 make install DESTDIR=$PKG
@@ -73,15 +81,13 @@ make install DESTDIR=$PKG
 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
 
-# "make install" won't locate the aris.info file in DESTDIR.
-# Workaround:
-mkdir -p $PKG/usr/info
+# Install documentation
+mkdir -p $PKG/usr/info $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/$PRGNAM.info $PKG/usr/info/
 gzip -9 $PKG/usr/info/$PRGNAM.info
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar doc/$PRGNAM/ $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a README AUTHORS ChangeLog NEWS THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -ar doc/$PRGNAM/ $PKG/usr/doc/$PRGNAM-$VERSION/html/
+cp -ar doc/proofs $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/aris/aris.info b/academic/aris/aris.info
index 8362eaa9bb..484ce06315 100644
--- a/academic/aris/aris.info
+++ b/academic/aris/aris.info
@@ -1,8 +1,8 @@
 PRGNAM="aris"
-VERSION="2.1.1"
-HOMEPAGE="http://www.gnu.org/software/aris/"
-DOWNLOAD="http://ftp.gnu.org/gnu/aris/aris-2.1.1.tar.bz2"
-MD5SUM="ef1b8f3be8edac44305e36493068f745"
+VERSION="2.2"
+HOMEPAGE="https://www.gnu.org/software/aris/"
+DOWNLOAD="https://ftp.gnu.org/gnu/aris/aris-2.2.tar.bz2"
+MD5SUM="523e2c40f17e6e857b533c22a26ff4e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/aris/help_path.diff b/academic/aris/help_path.diff
new file mode 100644
index 0000000000..0d2853fcbe
--- /dev/null
+++ b/academic/aris/help_path.diff
@@ -0,0 +1,11 @@
+--- a/aris.c	2021-02-10 17:51:33.532759576 +0400
++++ b/aris.c	2021-02-10 17:52:15.210759108 +0400
+@@ -845,7 +845,7 @@
+       if (the_app->working_dir)
+ 	{
+ 	  parent = g_file_get_parent (parent);
+-	  sprintf (the_app->help_file, "file://%s/doc/aris/index.html", g_file_get_path (parent));
++	  sprintf (the_app->help_file, "file:///usr/doc/aris-2.2/html/index.html", g_file_get_path (parent));
+ 	}
+ 
+       int ret;
diff --git a/academic/aris/html_doc.patch b/academic/aris/html_doc.patch
deleted file mode 100644
index 1b359b73d6..0000000000
--- a/academic/aris/html_doc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- aris-2.0/configure	2012-09-25 05:06:22.000000000 -0300
-+++ aris-2.0b/configure	2013-03-23 18:34:59.483719378 -0300
-@@ -4610,3 +4610,1 @@
--cat >>confdefs.h <<_ACEOF
--#define HELP_FILE "file://`pwd`/doc/aris/index.html"
--_ACEOF
-+echo "#define HELP_FILE \"file://"$htmldir"/index.html\"" >>confdefs.h
---- aris-2.0/src/aris.c	2012-09-25 05:06:22.000000000 -0300
-+++ aris-2.0b/src/aris.c	2013-03-23 18:45:25.290749474 -0300
-@@ -1064,0 +1065,6 @@
-+#ifdef HELP_FILE /* Which should be defined in config.h */
-+
-+      strcpy (the_app->help_file, HELP_FILE);
-+
-+#else
-+
-@@ -1076,0 +1083,2 @@
-+
-+#endif /* HELP FILE */
diff --git a/academic/aris/slack-desc b/academic/aris/slack-desc
index 218444d055..c061cf1dc4 100644
--- a/academic/aris/slack-desc
+++ b/academic/aris/slack-desc
@@ -15,5 +15,5 @@ aris: in the form of abstract sequences. It uses a predefined set of both
 aris: inference and equivalence rules, however gives the user options to use
 aris: older proofs as lemmas, including Isabelle's Isar proofs.
 aris:
-aris: Home page: http://www.gnu.org/software/aris/
+aris: Home page: https://www.gnu.org/software/aris/
 aris:
diff --git a/academic/arpack-ng/arpack-ng.SlackBuild b/academic/arpack-ng/arpack-ng.SlackBuild
index b5639de58b..a86140d997 100644
--- a/academic/arpack-ng/arpack-ng.SlackBuild
+++ b/academic/arpack-ng/arpack-ng.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for arpack-ng
 
-# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=arpack-ng
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,10 +37,10 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="CHANGES COPYING PARPACK_CHANGES README.md TODO"
+DOCS="CHANGES COPYING README.md TODO"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -81,8 +81,6 @@ patch -p1 < $CWD/patches/atlas-lib-rename.diff
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-shared \
-  --disable-static \
   --disable-dependency-tracking \
   --enable-icb \
   --build=$ARCH-slackware-linux \
diff --git a/academic/arpack-ng/arpack-ng.info b/academic/arpack-ng/arpack-ng.info
index 9af4707aa5..10dc19bd10 100644
--- a/academic/arpack-ng/arpack-ng.info
+++ b/academic/arpack-ng/arpack-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="arpack-ng"
-VERSION="3.7.0"
+VERSION="3.8.0"
 HOMEPAGE="https://github.com/opencollab/arpack-ng"
-DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.7.0/arpack-ng-3.7.0.tar.gz"
-MD5SUM="6fc6c6bf78dbd4f144595ef0675c8430"
+DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.8.0/arpack-ng-3.8.0.tar.gz"
+MD5SUM="bb4cf448f2480a0ffe5517d579f980c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack"
diff --git a/academic/bcftools/bcftools.SlackBuild b/academic/bcftools/bcftools.SlackBuild
index 7a17a33d25..9576a89c84 100644
--- a/academic/bcftools/bcftools.SlackBuild
+++ b/academic/bcftools/bcftools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for samtools
 
-# Copyright 2017-2020 Rob van Nues # All rights reserved.
+# Copyright 2017-2021 Rob van Nues # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,10 +22,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PRGNAM=bcftools		
-VERSION=${VERSION:-1.11}
+PRGNAM=bcftools
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
+TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/academic/bcftools/bcftools.info b/academic/bcftools/bcftools.info
index d181a29a4f..ad211ee207 100644
--- a/academic/bcftools/bcftools.info
+++ b/academic/bcftools/bcftools.info
@@ -1,8 +1,8 @@
 PRGNAM="bcftools"
-VERSION="1.11"
+VERSION="1.12"
 HOMEPAGE="http://www.htslib.org"
-DOWNLOAD="https://github.com/samtools/bcftools/releases/download/1.11/bcftools-1.11.tar.bz2"
-MD5SUM="58908e9280e2a3f2c309177a43dc09af"
+DOWNLOAD="https://github.com/samtools/bcftools/releases/download/1.12/bcftools-1.12.tar.bz2"
+MD5SUM="d3622cb3e52039055fd91ad65ea5131e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="htslib"
diff --git a/academic/bibletime/bibletime.SlackBuild b/academic/bibletime/bibletime.SlackBuild
index c1b839302f..807cf266c2 100644
--- a/academic/bibletime/bibletime.SlackBuild
+++ b/academic/bibletime/bibletime.SlackBuild
@@ -77,7 +77,8 @@ sed -i "/BTTests/s/^/#/" cmake/BTApplication.cmake
 
 mkdir -p build
 cd build
-  /opt/cmake-202x/bin/cmake \
+  export "PATH=/opt/cmake-202x/bin:$PATH"
+  cmake \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/academic/boinc/boinc.SlackBuild b/academic/boinc/boinc.SlackBuild
index a456b96a97..a35a0cce0f 100644
--- a/academic/boinc/boinc.SlackBuild
+++ b/academic/boinc/boinc.SlackBuild
@@ -25,10 +25,11 @@
 # TODO:  add rc.boinc.
 
 PRGNAM=boinc
-VERSION=${VERSION:-7.16.4}
+VERSION=${VERSION:-7.16.16}
 BRANCH=${BRANCH:-7.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+NUMJOBS=${NUMJOBS:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -99,7 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-x \
   --build=$ARCH-slackware-linux
 
-make
+make -j${NUMJOBS}
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/academic/boinc/boinc.info b/academic/boinc/boinc.info
index 8a3e9be145..9d7dbd0162 100644
--- a/academic/boinc/boinc.info
+++ b/academic/boinc/boinc.info
@@ -1,10 +1,10 @@
 PRGNAM="boinc"
-VERSION="7.16.4"
+VERSION="7.16.16"
 HOMEPAGE="https://boinc.berkeley.edu/"
-DOWNLOAD="https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.4/boinc-client_release-7.16-7.16.4.tar.gz"
-MD5SUM="33aa0de75425d7c0b8acca0301df18b1"
+DOWNLOAD="https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.16/boinc-client_release-7.16-7.16.16.tar.gz"
+MD5SUM="debf658ed8748c1c434c12f8a8a932a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwebp wxGTK3"
+REQUIRES="wxGTK3"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/academic/btf/btf.SlackBuild b/academic/btf/btf.SlackBuild
index 39ef98cc23..619dcb650c 100644
--- a/academic/btf/btf.SlackBuild
+++ b/academic/btf/btf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for BTF
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=btf
 SRCNAM=SuiteSparse
 SUBDIR=BTF
 VERSION=${VERSION:-1.2.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/btf/btf.info b/academic/btf/btf.info
index 0b80a8d5cc..df3056d279 100644
--- a/academic/btf/btf.info
+++ b/academic/btf/btf.info
@@ -1,8 +1,8 @@
 PRGNAM="btf"
 VERSION="1.2.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/cadabra2/cadabra2.SlackBuild b/academic/cadabra2/cadabra2.SlackBuild
index fbefa6edce..f6a618c3ff 100644
--- a/academic/cadabra2/cadabra2.SlackBuild
+++ b/academic/cadabra2/cadabra2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cadabra2
 
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cadabra2
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-2.3.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 MMA=${MMA:-OFF}
@@ -92,10 +92,13 @@ find ./ -type f -name '*.py' -exec \
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSQLITE3_INCLUDE_DIR=/usr/include \
+    -DENABLE_SYSTEM_JSONCPP=ON \
     -DENABLE_MATHEMATICA=${MMA^^} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
diff --git a/academic/cadabra2/cadabra2.info b/academic/cadabra2/cadabra2.info
index 0f59adf007..164ad63867 100644
--- a/academic/cadabra2/cadabra2.info
+++ b/academic/cadabra2/cadabra2.info
@@ -1,10 +1,10 @@
 PRGNAM="cadabra2"
-VERSION="2.3.0"
+VERSION="2.3.6.3"
 HOMEPAGE="https://cadabra.science"
-DOWNLOAD="https://downloads.sourceforge.net/slackbuildsdirectlinks/cadabra2/cadabra2-2.3.0.tar.gz"
-MD5SUM="09762b9ececc86c5f6c52a9e9ab2292b"
+DOWNLOAD="https://downloads.sourceforge.net/slackbuildsdirectlinks/cadabra2/cadabra2-2.3.6.3.tar.gz"
+MD5SUM="9e792260d2b6dea2bb7c5d8a0a627662"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-matplotlib python3-gmpy2 python3-sympy"
+REQUIRES="python3-matplotlib python3-gmpy2 python3-sympy jsoncpp cmake-202x"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/academic/camd/camd.SlackBuild b/academic/camd/camd.SlackBuild
index 15bf62a012..b7253a1aba 100644
--- a/academic/camd/camd.SlackBuild
+++ b/academic/camd/camd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CAMD
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=camd
 SRCNAM=SuiteSparse
 SUBDIR=CAMD
 VERSION=${VERSION:-2.4.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/camd/camd.info b/academic/camd/camd.info
index fc2cbaa211..a02b5c633d 100644
--- a/academic/camd/camd.info
+++ b/academic/camd/camd.info
@@ -1,8 +1,8 @@
 PRGNAM="camd"
 VERSION="2.4.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/cblas/cblas.SlackBuild b/academic/cblas/cblas.SlackBuild
index a7cadea464..3a18cc1daa 100644
--- a/academic/cblas/cblas.SlackBuild
+++ b/academic/cblas/cblas.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CBLAS
 
-# Copyright 2016-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2016-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=cblas
 SRCNAM=lapack
-VERSION=${VERSION:-3.9.0}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/cblas/cblas.info b/academic/cblas/cblas.info
index 6c54824791..7821e1a648 100644
--- a/academic/cblas/cblas.info
+++ b/academic/cblas/cblas.info
@@ -1,8 +1,8 @@
 PRGNAM="cblas"
-VERSION="3.9.0"
-HOMEPAGE="http://www.netlib.org/blas/"
-DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz"
-MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2"
+VERSION="3.9.1"
+HOMEPAGE="https://www.netlib.org/blas/"
+DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz"
+MD5SUM="47ab2d11652045145df37ddbe2a32d71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas"
diff --git a/academic/cblas/patches/cmake-piecewise.diff b/academic/cblas/patches/cmake-piecewise.diff
index b1bdfaec1e..378acc8769 100644
--- a/academic/cblas/patches/cmake-piecewise.diff
+++ b/academic/cblas/patches/cmake-piecewise.diff
@@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
  message(STATUS "CBLAS enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 -
  # Create a header file cblas.h for the routines called in my C programs
  include(FortranCInterface)
  ## Ensure that the fortran compiler and c compiler specified are compatible
-@@ -41,54 +39,8 @@
+@@ -45,54 +43,8 @@
    add_subdirectory(examples)
  endif()
  
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -# Export cblas targets from the
 -# install tree, if any.
 -set(_cblas_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT cblas-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  install(EXPORT ${CBLASLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -  # Choose one of the cblas targets to use as a guard for
@@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -# Export cblas targets from the build tree, if any.
 -set(_cblas_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake)
 -
 -  # Choose one of the cblas targets to use as a guard
 -  # for cblas-config.cmake to load targets from the build tree.
@@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -endif()
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY)
 -
 -
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY)
    install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc
    DESTINATION ${PKG_CONFIG_DIR}
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -  )
 -
--#install(EXPORT cblas-targets
--#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-#install(EXPORT ${CBLASLIB}-targets
+-#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -#  COMPONENT Development
 -#  )
 diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
@@ -76,14 +76,14 @@ deleted file mode 100644
 -
 -# Load lapack targets from the build tree, including lapacke targets.
 -if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Report cblas header search locations from build tree.
 -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report cblas libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
 deleted file mode 100644
 --- a/CBLAS/cmake/cblas-config-install.cmake.in
@@ -96,19 +96,19 @@ deleted file mode 100644
 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET cblas)
--  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-if(NOT TARGET @CBLASLIB@)
+-  include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake)
 -endif()
 -
 -# Report lapacke header search locations.
 -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 -
 -unset(_CBLAS_PREFIX)
 -unset(_CBLAS_SELF_DIR)
@@ -128,16 +128,16 @@ deleted file mode 100644
 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
 --- a/CBLAS/src/CMakeLists.txt
 +++ b/CBLAS/src/CMakeLists.txt
-@@ -120,9 +120,5 @@
-   VERSION ${LAPACK_VERSION}
-   SOVERSION ${LAPACK_MAJOR_VERSION}
-   )
--target_include_directories(cblas PUBLIC
+@@ -123,9 +123,5 @@
+ if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+   target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+ endif()
+-target_include_directories(${CBLASLIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 -  $<INSTALL_INTERFACE:include>
 -)
- target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
- lapack_install_library(cblas)
+ target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES})
+ lapack_install_library(${CBLASLIB})
 diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
 deleted file mode 100644
 --- a/CMAKE/lapack-config-build.cmake.in
@@ -146,7 +146,7 @@ deleted file mode 100644
 -# Load lapack targets from the build tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -168,7 +168,7 @@ deleted file mode 100644
 -# Load lapack targets from the install tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-  include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -184,11 +184,11 @@ deleted file mode 100644
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,11 +112,8 @@
+@@ -160,11 +160,8 @@
  
  
  # --------------------------------------------------
--set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
 -
  macro(lapack_install_library lib)
    install(TARGETS ${lib}
@@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
-@@ -155,21 +152,6 @@
+@@ -204,21 +201,6 @@
  include(CheckLAPACKCompilerFlags)
  CheckLAPACKCompilerFlags()
  
@@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Check second function
 -
 -include(CheckTimeFunction)
--set(TIME_FUNC NONE ${TIME_FUNC})
+-set(NONE ${TIME_FUNC})
 -CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  # deprecated LAPACK and LAPACKE routines
  option(BUILD_DEPRECATED "Build deprecated routines" OFF)
  message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}")
-@@ -193,8 +175,9 @@
+@@ -242,8 +224,9 @@
  endif()
  
  # --------------------------------------------------
@@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  
  # Check the usage of the user provided BLAS libraries
  if(BLAS_LIBRARIES)
-@@ -205,113 +188,108 @@
+@@ -254,113 +237,108 @@
    if(BLAS_FOUND)
      message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
    else()
@@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -  message(STATUS "Using supplied NETLIB BLAS implementation")
 -  add_subdirectory(BLAS)
 +elseif(BUILD_BLAS)
-   set(BLAS_LIBRARIES blas)
+   set(BLAS_LIBRARIES ${BLASLIB})
 -else()
 -  set(CMAKE_EXE_LINKER_FLAGS
 -    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
@@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +  find_package(LAPACK)
 +
 +elseif(BUILD_LAPACK)
-   set(LAPACK_LIBRARIES lapack)
+   set(LAPACK_LIBRARIES ${LAPACKLIB})
 +  set(LAPACK_FOUND TRUE)
 +
 +  set(NEED_BLAS TRUE)
 +
 +  # Check second function
 +  include(CheckTimeFunction)
-+  set(TIME_FUNC NONE ${TIME_FUNC})
++  set(NONE ${TIME_FUNC})
 +  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 +  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 +  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +    add_subdirectory(TESTING)
 +  endif()
 +
-+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 +    install(FILES
-+    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 +    DESTINATION ${PKG_CONFIG_DIR}
 +    COMPONENT Development
 +    )
@@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
    add_subdirectory(LAPACKE)
  endif()
  
-@@ -338,109 +316,12 @@
-   _display_cpp_implementation_msg("LAPACK")
+@@ -414,111 +392,16 @@
+   ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
  endif()
  
 -# --------------------------------------------------
@@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# --------------------------------------------------
 -
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -if(NOT LATESTLAPACK_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
 -endif()
 -
 -if(BUILD_TESTING OR LAPACKE_WITH_TMG)
--  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
 -endif()
 -
 -# Export lapack targets, not including lapacke, from the
 -# install tree, if any.
 -set(_lapack_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT lapack-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  install(EXPORT ${LAPACKLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -
@@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -
 -# Include cblas in targets exported from the build tree.
 -if(CBLAS)
--  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB})
 -endif()
 -
 -# Include lapacke in targets exported from the build tree.
 -if(LAPACKE)
--  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB})
 +# Neither user specified or optimized BLAS libraries can be used
 +if(NEED_BLAS AND NOT BLAS_FOUND)
 +  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
@@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Export lapack and lapacke targets from the build tree, if any.
 -set(_lapack_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake)
 -
 -  # Choose one of the lapack or lapacke targets to use as a guard
 -  # for lapack-config.cmake to load targets from the build tree.
@@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +if(NEED_LAPACK AND NOT LAPACK_FOUND)
 +  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
  endif()
--
+ 
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY)
 -
 -
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 -  install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 -  DESTINATION ${PKG_CONFIG_DIR}
 -  COMPONENT Development
 -  )
 -
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY)
 -
 -include(CMakePackageConfigHelpers)
 -write_basic_package_version_file(
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
 -  VERSION ${LAPACK_VERSION}
 -  COMPATIBILITY SameMajorVersion
 -  )
 -
 -install(FILES
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
--  
-\ No newline at end of file
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
 diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
 --- a/LAPACKE/CMakeLists.txt
 +++ b/LAPACKE/CMakeLists.txt
@@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
  message(STATUS "LAPACKE enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 -
  # Create a header file lapacke_mangling.h for the routines called in my C programs
  include(FortranCInterface)
@@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
    VERSION ${LAPACK_VERSION}
    SOVERSION ${LAPACK_MAJOR_VERSION}
    )
--target_include_directories(lapacke PUBLIC
+-target_include_directories(${LAPACKELIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 -  $<INSTALL_INTERFACE:include>
 -)
 -if(WIN32 AND NOT UNIX)
--  target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
+-  target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
 -  message(STATUS "Windows BUILD")
 -endif()
  
  if(LAPACKE_WITH_TMG)
-   target_link_libraries(lapacke PRIVATE tmglib)
+   target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB})
 @@ -111,22 +101,3 @@
    DESTINATION ${PKG_CONFIG_DIR}
    COMPONENT Development
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY)
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 -
--install(EXPORT lapacke-targets
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-install(EXPORT ${LAPACKELIB}-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
@@ -570,8 +571,8 @@ deleted file mode 100644
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapack targets from the build tree, including lapacke targets.
--if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-if(NOT TARGET @LAPACKELIB@)
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Hint for project building against lapack
@@ -581,7 +582,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
 deleted file mode 100644
 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in
@@ -594,12 +595,12 @@ deleted file mode 100644
 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET lapacke)
--  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-if(NOT TARGET @LAPACKELIB@)
+-  include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake)
 -endif()
 -
 -# Hint for project building against lapack
@@ -609,7 +610,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 -
 -unset(_LAPACKE_PREFIX)
 -unset(_LAPACKE_SELF_DIR)
diff --git a/academic/ccolamd/ccolamd.SlackBuild b/academic/ccolamd/ccolamd.SlackBuild
index cec5eb80f1..7a76de236b 100644
--- a/academic/ccolamd/ccolamd.SlackBuild
+++ b/academic/ccolamd/ccolamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CCOLAMD
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=ccolamd
 SRCNAM=SuiteSparse
 SUBDIR=CCOLAMD
 VERSION=${VERSION:-2.9.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/ccolamd/ccolamd.info b/academic/ccolamd/ccolamd.info
index e32e2118a3..a7d008e0e5 100644
--- a/academic/ccolamd/ccolamd.info
+++ b/academic/ccolamd/ccolamd.info
@@ -1,8 +1,8 @@
 PRGNAM="ccolamd"
 VERSION="2.9.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/cdo/cdo.SlackBuild b/academic/cdo/cdo.SlackBuild
index c9c3f9b4d7..9aef1c9fdb 100644
--- a/academic/cdo/cdo.SlackBuild
+++ b/academic/cdo/cdo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cdo
-VERSION=${VERSION:-1.9.8}
+VERSION=${VERSION:-1.9.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/cdo/cdo.info b/academic/cdo/cdo.info
index ca3df5ca07..74453e1a40 100644
--- a/academic/cdo/cdo.info
+++ b/academic/cdo/cdo.info
@@ -1,8 +1,8 @@
 PRGNAM="cdo"
-VERSION="1.9.8"
+VERSION="1.9.10"
 HOMEPAGE="https://code.mpimet.mpg.de/projects/cdo"
-DOWNLOAD="https://code.mpimet.mpg.de/attachments/download/20826/cdo-1.9.8.tar.gz"
-MD5SUM="2a8d8f521b13ff957e9682bae4d4fa9a"
+DOWNLOAD="https://code.mpimet.mpg.de/attachments/download/24638/cdo-1.9.10.tar.gz"
+MD5SUM="dc2bd3f30ae923bac367e370270051d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="proj udunits netcdf"
diff --git a/academic/cholmod/cholmod.SlackBuild b/academic/cholmod/cholmod.SlackBuild
index aae466f098..5ac8ce8cf7 100644
--- a/academic/cholmod/cholmod.SlackBuild
+++ b/academic/cholmod/cholmod.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CHOLMOD
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,9 +25,9 @@
 PRGNAM=cholmod
 SRCNAM=SuiteSparse
 SUBDIR=CHOLMOD
-VERSION=${VERSION:-3.0.13}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.14}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/cholmod/cholmod.info b/academic/cholmod/cholmod.info
index 9b41a522e8..ddaabdec00 100644
--- a/academic/cholmod/cholmod.info
+++ b/academic/cholmod/cholmod.info
@@ -1,8 +1,8 @@
 PRGNAM="cholmod"
-VERSION="3.0.13"
+VERSION="3.0.14"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack suitesparseconfig amd camd colamd ccolamd"
diff --git a/academic/cholmod/patches/autoconfiscate.diff b/academic/cholmod/patches/autoconfiscate.diff
index 6cdb2b7b6a..36736536c4 100644
--- a/academic/cholmod/patches/autoconfiscate.diff
+++ b/academic/cholmod/patches/autoconfiscate.diff
@@ -1469,7 +1469,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([CHOLMOD],[3.0.13],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[cholmod],[http://www.suitesparse.com/])
++AC_INIT([CHOLMOD],[3.0.14],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[cholmod],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Core/cholmod_common.c])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AC_CONFIG_MACRO_DIR([m4])
@@ -1690,7 +1690,7 @@ diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_blas.m4
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,241 @@
 +# ===========================================================================
 +#         https://www.gnu.org/software/autoconf-archive/ax_blas.html
 +# ===========================================================================
@@ -1729,6 +1729,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -1756,7 +1757,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 16
++#serial 17
 +
 +AU_ALIAS([ACX_BLAS], [AX_BLAS])
 +AC_DEFUN([AX_BLAS], [
@@ -1770,7 +1771,9 @@ new file mode 100644
 +case $with_blas in
 +	yes | "") ;;
 +	no) ax_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
++	-* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++		BLAS_LIBS="$with_blas"
++	;;
 +	*) BLAS_LIBS="-l$with_blas" ;;
 +esac
 +
@@ -2209,7 +2212,7 @@ diff --git a/m4/ax_lapack.m4 b/m4/ax_lapack.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_lapack.m4
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,134 @@
 +# ===========================================================================
 +#        https://www.gnu.org/software/autoconf-archive/ax_lapack.html
 +# ===========================================================================
@@ -2249,6 +2252,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -2276,7 +2280,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 9
++#serial 10
 +
 +AU_ALIAS([ACX_LAPACK], [AX_LAPACK])
 +AC_DEFUN([AX_LAPACK], [
@@ -2288,7 +2292,9 @@ new file mode 100644
 +case $with_lapack in
 +        yes | "") ;;
 +        no) ax_lapack_ok=disable ;;
-+        -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;;
++        -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++                 LAPACK_LIBS="$with_lapack"
++        ;;
 +        *) LAPACK_LIBS="-l$with_lapack" ;;
 +esac
 +
diff --git a/academic/colamd/colamd.SlackBuild b/academic/colamd/colamd.SlackBuild
index ab7e39cb5a..3d2ceacd5a 100644
--- a/academic/colamd/colamd.SlackBuild
+++ b/academic/colamd/colamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for COLAMD
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=colamd
 SRCNAM=SuiteSparse
 SUBDIR=COLAMD
 VERSION=${VERSION:-2.9.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/colamd/colamd.info b/academic/colamd/colamd.info
index f558ba3958..132c96f5d0 100644
--- a/academic/colamd/colamd.info
+++ b/academic/colamd/colamd.info
@@ -1,8 +1,8 @@
 PRGNAM="colamd"
 VERSION="2.9.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/colin/colin.SlackBuild b/academic/colin/colin.SlackBuild
index 68fa6ac0a6..487197cf4d 100644
--- a/academic/colin/colin.SlackBuild
+++ b/academic/colin/colin.SlackBuild
@@ -23,12 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=colin
-VERSION=${VERSION:-1.8.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.8.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -61,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
-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 \
@@ -75,17 +73,11 @@ qmake
 make
 
 # make install DESTDIR not implemented so go manual !
-mkdir -p $PKG/usr/share/applications/
-cp -a xdg/colin.desktop $PKG/usr/share/applications/
-mkdir -p $PKG/usr/share/colin/pixmaps/
-cp -a xdg/colin.xpm $PKG/usr/share/colin/pixmaps/
-cp -a xdg/colin.png $PKG/usr/share/colin/pixmaps/
-cp -a icons $PKG/usr/share/colin/icons
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/colin-$VERSION
-mv colin *.o $PKG/usr/lib${LIBDIRSUFFIX}/colin-$VERSION
-mkdir -p $PKG/usr/bin
-# Create a symlink in /usr/bin to the colin binary
-( cd $PKG/usr/bin ; ln -s /usr/lib${LIBDIRSUFFIX}/colin-$VERSION/colin . )
+install -Dm 0644 xdg/colin.desktop $PKG/usr/share/applications/colin.desktop
+install -Dm 0644 xdg/colin.xpm $PKG/usr/share/colin/pixmaps/colin.xpm
+install -Dm 0644 xdg/colin.png $PKG/usr/share/colin/pixmaps/colin.png
+cp -a icons $PKG/usr/share/colin/
+install -Dm 0755 colin $PKG/usr/bin/colin
 
 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
diff --git a/academic/colin/colin.info b/academic/colin/colin.info
index 714c50608e..39bcb740ad 100644
--- a/academic/colin/colin.info
+++ b/academic/colin/colin.info
@@ -1,8 +1,8 @@
 PRGNAM="colin"
-VERSION="1.8.1"
+VERSION="1.8.2"
 HOMEPAGE="https://sourceforge.net/projects/colin2"
-DOWNLOAD="https://sourceforge.net/projects/colin2/files/colin-1.8.1.tar.xz"
-MD5SUM="d17b5a4c58eda6278eb0324d1478189d"
+DOWNLOAD="https://sourceforge.net/projects/colin2/files/colin-1.8.2.tar.xz"
+MD5SUM="e7260f262dbc563b40b6de529d6aa519"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="brotli graphite2"
diff --git a/academic/convertall/convertall.SlackBuild b/academic/convertall/convertall.SlackBuild
index 796ea42d07..fdb395cf6c 100644
--- a/academic/convertall/convertall.SlackBuild
+++ b/academic/convertall/convertall.SlackBuild
@@ -2,10 +2,12 @@
 #
 # Slackware build script for convertall
 #
-# Copyright 2012 John Berger <irgunii ampersand gmail . com>, TN, USA
+# Copyright 2012-2021 John Berger <irgunii ampersand gmail . com>, TN, USA
 # I couldn't have made this script work without the help of
-# Willy Sudiarto Raharjo <willysr@slackware-id.org>, so
-# all thanks go to him.
+# Willy Sudiarto Raharjo <willysr@slackware-id.org>, so big thanks to him.
+# Also a big thank you to Kevin McCormick for helping with a python 3
+# problem I'd missed.
+#
 #
 # All rights reserved.
 #
@@ -28,13 +30,13 @@
 
 PRGNAM=convertall
 SRCNAM=ConvertAll
-VERSION=${VERSION:-0.5.2}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +47,8 @@ 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"
@@ -77,7 +79,7 @@ find -L . \
 # Change installation directory to /usr and use LIBDIRSUFFIX
 sed -i -e "s/usr\/local/usr/" -e "s/'lib'/'lib$LIBDIRSUFFIX'/" install.py
 
-python install.py -b $PKG
+python3 install.py -b $PKG
 
 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
diff --git a/academic/convertall/convertall.info b/academic/convertall/convertall.info
index 38fc747b7f..181b2b33f8 100644
--- a/academic/convertall/convertall.info
+++ b/academic/convertall/convertall.info
@@ -1,10 +1,10 @@
 PRGNAM="convertall"
-VERSION="0.5.2"
-HOMEPAGE="http://www.convertall.bellz.org/index.html"
-DOWNLOAD="http://downloads.sourceforge.net/convertall/convertall-0.5.2.tar.gz"
-MD5SUM="9378cb3ab40cf944570d53bcc5718ee8"
+VERSION="0.8.0"
+HOMEPAGE="https://www.convertall.bellz.org/index.html"
+DOWNLOAD="https://github.com/doug-101/ConvertAll/releases/download/v0.8.0/convertall-0.8.0.tar.gz"
+MD5SUM="6e2513d056bc10e2f037591bc08a8e21"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3 qt5 python3-PyQt5"
 MAINTAINER="John Berger"
 EMAIL="irgunii ampersand gmail . com"
diff --git a/academic/convertall/doinst.sh b/academic/convertall/doinst.sh
index 4f83cde390..7443749d1c 100644
--- a/academic/convertall/doinst.sh
+++ b/academic/convertall/doinst.sh
@@ -9,6 +9,6 @@ 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
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
diff --git a/academic/convertall/slack-desc b/academic/convertall/slack-desc
index 7f4ae4d1c2..59999208c7 100644
--- a/academic/convertall/slack-desc
+++ b/academic/convertall/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
 convertall: convertall (unit conversion)
@@ -14,6 +14,6 @@ convertall: decade, that's fine. Or from meter-pounds. Or from cubic
 convertall: nautical miles. The units don't have to make sense to
 convertall: anyone but you.
 convertall:
-convertall: Project website: http://www.convertall.bellz.org
+convertall: Project website: https://www.convertall.bellz.org
 convertall:
 convertall:
diff --git a/academic/csparse/csparse.SlackBuild b/academic/csparse/csparse.SlackBuild
index 3f008bbe0b..4aa1aa9612 100644
--- a/academic/csparse/csparse.SlackBuild
+++ b/academic/csparse/csparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CSparse
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=csparse
 SRCNAM=SuiteSparse
 SUBDIR=CSparse
 VERSION=${VERSION:-3.2.0}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-4}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/csparse/csparse.info b/academic/csparse/csparse.info
index 4435e41189..861a2ed4c5 100644
--- a/academic/csparse/csparse.info
+++ b/academic/csparse/csparse.info
@@ -1,8 +1,8 @@
 PRGNAM="csparse"
 VERSION="3.2.0"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/cxsparse/cxsparse.SlackBuild b/academic/cxsparse/cxsparse.SlackBuild
index 4695454e67..50237f46a6 100644
--- a/academic/cxsparse/cxsparse.SlackBuild
+++ b/academic/cxsparse/cxsparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CXSparse
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=cxsparse
 SRCNAM=SuiteSparse
 SUBDIR=CXSparse
 VERSION=${VERSION:-3.2.0}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-4}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/cxsparse/cxsparse.info b/academic/cxsparse/cxsparse.info
index eb05c702a6..06c815be7c 100644
--- a/academic/cxsparse/cxsparse.info
+++ b/academic/cxsparse/cxsparse.info
@@ -1,8 +1,8 @@
 PRGNAM="cxsparse"
 VERSION="3.2.0"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/datamash/README b/academic/datamash/README
new file mode 100644
index 0000000000..01d8fd598d
--- /dev/null
+++ b/academic/datamash/README
@@ -0,0 +1,6 @@
+GNU Datamash is a command-line program which performs basic numeric,
+textual and statistical operations on input textual data files.
+
+It is designed to be portable and reliable, and aid researchers
+to easily automate analysis pipelines, without writing code or even
+short scripts.
diff --git a/academic/datamash/datamash.SlackBuild b/academic/datamash/datamash.SlackBuild
new file mode 100644
index 0000000000..4661750499
--- /dev/null
+++ b/academic/datamash/datamash.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for datamash
+
+# Copyright 2020 Petar Petrov slackalaxy@gmail.com
+# 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=datamash
+VERSION=${VERSION:-1.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make check
+make install DESTDIR=$PKG
+
+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
+
+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
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/datamash/datamash.info b/academic/datamash/datamash.info
new file mode 100644
index 0000000000..ff23e91fa2
--- /dev/null
+++ b/academic/datamash/datamash.info
@@ -0,0 +1,10 @@
+PRGNAM="datamash"
+VERSION="1.7"
+HOMEPAGE="https://www.gnu.org/software/datamash/"
+DOWNLOAD="https://ftp.gnu.org/gnu/datamash/datamash-1.7.tar.gz"
+MD5SUM="e5474d3bfee13e7ab1c44ebaec497a0d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/network/waterfox/slack-desc b/academic/datamash/slack-desc
index bdaed00ed4..86ef966a72 100644
--- a/network/waterfox/slack-desc
+++ b/academic/datamash/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-waterfox: waterfox (Web browser)
-waterfox:
-waterfox: Waterfox was one of the first widely distributed 64-Bit browsers on
-waterfox: the Web and quickly gained a loyal following. At one time, Waterfox
-waterfox: had one thing in mind - speed. But now Waterfox also attempts to be an
-waterfox: ethical, user-oriented browser.
-waterfox:
-waterfox:
-waterfox:
-waterfox: Homepage: https://www.waterfox.net
-waterfox:
+datamash: datamash (Basic numeric, textual and statistical operations)
+datamash:
+datamash: GNU Datamash is a command-line program which performs basic
+datamash: numeric, textual and statistical operations on input textual
+datamash: data files.
+datamash:
+datamash: https://www.gnu.org/software/datamash/
+datamash:
+datamash:
+datamash:
+datamash:
diff --git a/academic/ds9/README b/academic/ds9/README
index 5bffb53e7f..bab29ee863 100644
--- a/academic/ds9/README
+++ b/academic/ds9/README
@@ -1,7 +1,10 @@
-SAOImage DS9 is an application for astronomical imaging and data
-visualization. It supports the FITS format and binary tables. As well
-as standard imaging manipulation tools, it includes many advanced
-features such as multiple frame buffers, 2D, 3D, RGB frame buffers,
-region and colormap manipulation, mosaic images and geometric markers.
-DS9 supports a variety of coordinate systems and it has a user
-configurable interface.
+SAOImageDS9 is an astronomical imaging and data visualization application. DS9
+is a stand-alone application which supports FITS images and binary tables,
+multiple frame buffers, region manipulation, and many scale algorithms and
+colormaps.  DS9 supports a consistent set of GUI and functional capabilities,
+as well as advanced features such as 2-D, 3-D and RGB frame buffers, mosaic
+images, tiling, blinking, geometric markers, colormap manipulation, scaling,
+arbitrary zoom, cropping, rotation, pan, and a variety of coordinate systems.
+The GUI for DS9 is user configurable. GUI elements such as the coordinate
+display, panner, magnifier, horizontal and vertical graphs, button bar, and
+color bar can be configured via menus or the command line.
diff --git a/academic/ds9/ds9.SlackBuild b/academic/ds9/ds9.SlackBuild
index f6767b091d..6f38b13804 100644
--- a/academic/ds9/ds9.SlackBuild
+++ b/academic/ds9/ds9.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for SAOImage DS9
+# Slackware build script for ds9 (SAOImageDS9)
 
-# Copyright 2020 Nitish Ragoomundun, Mauritius
+# Copyright 2021 Nitish Ragoomundun, Mauritius
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ds9
-VERSION=${VERSION:-8.1}
+VERSION=${VERSION:-8.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,9 +78,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-arch=${ARCH}-slackware-linux
+  --x-includes=/usr/include \
+  --x-libraries=/usr/lib$LIBDIRSUFFIX \
+  --with-x \
+  --with-arch=$ARCH-slackware-linux
 
-make -j1
+make
 
 # Install the ds9 executable
 mkdir -p $PKG/usr/{bin,doc/$PRGNAM-$VERSION}
diff --git a/academic/ds9/ds9.desktop b/academic/ds9/ds9.desktop
index 318d5d41c2..08b18e0bbd 100644
--- a/academic/ds9/ds9.desktop
+++ b/academic/ds9/ds9.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=DS9
-GenericName=SAOImage DS9
-Comment=SAOImage DS9 Astronomical Software
+Name=ds9
+GenericName=SAOImageDS9
+Comment=Astronomical Software and FITS viewing program
 Exec=ds9
 Icon=ds9-icon
 Terminal=false
diff --git a/academic/ds9/ds9.info b/academic/ds9/ds9.info
index f6d9328bcf..475fe53290 100644
--- a/academic/ds9/ds9.info
+++ b/academic/ds9/ds9.info
@@ -1,8 +1,8 @@
 PRGNAM="ds9"
-VERSION="8.1"
-HOMEPAGE="http://ds9.si.edu/site/Home.html"
-DOWNLOAD="http://ds9.si.edu/archive/source/ds9.8.1.tar.gz"
-MD5SUM="d9b3c43c9375328e4872b7eefb0f86bc"
+VERSION="8.2.1"
+HOMEPAGE="https://sites.google.com/cfa.harvard.edu/saoimageds9/home"
+DOWNLOAD="https://ds9.si.edu/archive/source/ds9.8.2.1.tar.gz"
+MD5SUM="99afcdc4a72e2ca15fda0b5f9af945af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/ds9/slack-desc b/academic/ds9/slack-desc
index b07917b061..b4bd41a641 100644
--- a/academic/ds9/slack-desc
+++ b/academic/ds9/slack-desc
@@ -15,5 +15,5 @@ ds9: multiple 2D, 3D, RGB frame buffers, colormap manipulation and mosaic
 ds9: images. DS9 also supports a variety of coordinate systems and has a
 ds9: user configurable interface.
 ds9:
-ds9: Homepage: http://ds9.si.edu/site/Home.html
+ds9: Homepage: https://sites.google.com/cfa.harvard.edu/saoimageds9/home
 ds9:
diff --git a/academic/fet/fet.SlackBuild b/academic/fet/fet.SlackBuild
index 4f478705f5..16d49c2420 100644
--- a/academic/fet/fet.SlackBuild
+++ b/academic/fet/fet.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fet
-VERSION=${VERSION:-5.44.9}
+VERSION=${VERSION:-5.49.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/fet/fet.info b/academic/fet/fet.info
index 3dc47ea93a..81c5073643 100644
--- a/academic/fet/fet.info
+++ b/academic/fet/fet.info
@@ -1,8 +1,8 @@
 PRGNAM="fet"
-VERSION="5.44.9"
+VERSION="5.49.1"
 HOMEPAGE="https://www.lalescu.ro/liviu/fet/"
-DOWNLOAD="https://www.lalescu.ro/liviu/fet/download/old/fet-5.44.9.tar.bz2"
-MD5SUM="a2228f3967e5ffab470d5a67bf977756"
+DOWNLOAD="https://www.lalescu.ro/liviu/fet/download/fet-5.49.1.tar.bz2"
+MD5SUM="063d3e4fa30c93820737fe8dbb28f55c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/academic/galculator/galculator.SlackBuild b/academic/galculator/galculator.SlackBuild
index 186bf89553..a9bc36534e 100644
--- a/academic/galculator/galculator.SlackBuild
+++ b/academic/galculator/galculator.SlackBuild
@@ -70,7 +70,7 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./autogen.sh \
   --prefix=/usr \
diff --git a/academic/gcompris-qt/gcompris-qt.SlackBuild b/academic/gcompris-qt/gcompris-qt.SlackBuild
index 0e2a9e8aae..82f9a43aac 100644
--- a/academic/gcompris-qt/gcompris-qt.SlackBuild
+++ b/academic/gcompris-qt/gcompris-qt.SlackBuild
@@ -33,7 +33,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 PRGNAM=gcompris-qt
-VERSION=${VERSION:-0.97}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/gcompris-qt/gcompris-qt.info b/academic/gcompris-qt/gcompris-qt.info
index fb4b19e9a3..91ca5b1c07 100644
--- a/academic/gcompris-qt/gcompris-qt.info
+++ b/academic/gcompris-qt/gcompris-qt.info
@@ -1,10 +1,10 @@
 PRGNAM="gcompris-qt"
-VERSION="0.97"
+VERSION="1.1"
 HOMEPAGE="http://gcompris.net/"
-DOWNLOAD="http://gcompris.net/download/qt/linux/gcompris-qt-0.97-Linux32.sh"
-MD5SUM="38c320d3cefe30eb1c77eadcc40077fa"
-DOWNLOAD_x86_64="http://gcompris.net/download/qt/linux/gcompris-qt-0.97-Linux64.sh"
-MD5SUM_x86_64="eb79d6a0172230d53856917f1c2f1c20"
+DOWNLOAD="http://gcompris.net/download/qt/linux/gcompris-qt-1.1-Linux32.sh"
+MD5SUM="381f16e7f476a479e663e55c0f386c13"
+DOWNLOAD_x86_64="http://gcompris.net/download/qt/linux/gcompris-qt-1.1-Linux64.sh"
+MD5SUM_x86_64="06e571bb48a1fb30edeb00c5e6295cd9"
 REQUIRES="krb5"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild
index c6ce401eee..0af5356e82 100644
--- a/academic/gwyddion/gwyddion.SlackBuild
+++ b/academic/gwyddion/gwyddion.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gwyddion
-VERSION=${VERSION:-2.56}
+VERSION=${VERSION:-2.58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/gwyddion/gwyddion.info b/academic/gwyddion/gwyddion.info
index 0e6c3abcdd..13e0741611 100644
--- a/academic/gwyddion/gwyddion.info
+++ b/academic/gwyddion/gwyddion.info
@@ -1,8 +1,8 @@
 PRGNAM="gwyddion"
-VERSION="2.56"
+VERSION="2.58"
 HOMEPAGE="http://gwyddion.net"
-DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.56.tar.xz"
-MD5SUM="5f9fdb773fbaf3270b472de6081dd3a8"
+DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.58.tar.xz"
+MD5SUM="a1157cd107049fdc141aec268f9b0032"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkglext"
diff --git a/academic/klu/klu.SlackBuild b/academic/klu/klu.SlackBuild
index 780ce2daf4..cff38308c6 100644
--- a/academic/klu/klu.SlackBuild
+++ b/academic/klu/klu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for KLU
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=klu
 SRCNAM=SuiteSparse
 SUBDIR=KLU
 VERSION=${VERSION:-1.3.9}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-3}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/klu/klu.info b/academic/klu/klu.info
index 3865f63f7d..2a2faab22f 100644
--- a/academic/klu/klu.info
+++ b/academic/klu/klu.info
@@ -1,8 +1,8 @@
 PRGNAM="klu"
 VERSION="1.3.9"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig amd colamd btf"
diff --git a/academic/lapacke/README b/academic/lapacke/README
index 892bc75de9..118c2449de 100644
--- a/academic/lapacke/README
+++ b/academic/lapacke/README
@@ -6,5 +6,7 @@ This package is intended for use with the Netlib reference LAPACK.
 It should also work with other LAPACK implementations that do not
 already provide a LAPACKE implementation.
 
+xblas is an optional dependency.
+
 To build a static library in addition to the shared library, pass
 STATIC=yes to the script.
diff --git a/academic/lapacke/lapacke.SlackBuild b/academic/lapacke/lapacke.SlackBuild
index e0c9fe36d0..b7bac2704f 100644
--- a/academic/lapacke/lapacke.SlackBuild
+++ b/academic/lapacke/lapacke.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LAPACKE
 
-# Copyright 2016-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2016-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=lapacke
 SRCNAM=lapack
-VERSION=${VERSION:-3.9.0}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,10 @@ chmod -R u+w,go-w,a+rX-st .
 # Allow building only the LAPACKE component.
 patch -p1 < $CWD/patches/cmake-piecewise.diff
 
+if pkg-config --exists xblas; then
+  use_xblas='-DUSE_XBLAS=ON'
+fi
+
 # Avoid adding an RPATH entry to the shared lib.  It's unnecessary (except for
 # running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX).
 mkdir -p shared
@@ -82,6 +86,7 @@ cd shared
     -DUSE_OPTIMIZED_LAPACK=ON \
     -DBUILD_LAPACKE=ON \
     -DBUILD_DEPRECATED=ON \
+    $use_xblas \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_SKIP_RPATH=YES \
     ..
@@ -104,6 +109,7 @@ if [ "${STATIC:-no}" != "no" ]; then
       -DUSE_OPTIMIZED_LAPACK=ON \
       -DBUILD_LAPACKE=ON \
       -DBUILD_DEPRECATED=ON \
+      $use_xblas \
       ..
     make
     make install/strip DESTDIR=$PKG
diff --git a/academic/lapacke/lapacke.info b/academic/lapacke/lapacke.info
index 80f3fc335b..aa77adac19 100644
--- a/academic/lapacke/lapacke.info
+++ b/academic/lapacke/lapacke.info
@@ -1,8 +1,8 @@
 PRGNAM="lapacke"
-VERSION="3.9.0"
-HOMEPAGE="http://www.netlib.org/lapack/lapacke.html"
-DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz"
-MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2"
+VERSION="3.9.1"
+HOMEPAGE="https://www.netlib.org/lapack/lapacke.html"
+DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz"
+MD5SUM="47ab2d11652045145df37ddbe2a32d71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lapack"
diff --git a/academic/lapacke/patches/cmake-piecewise.diff b/academic/lapacke/patches/cmake-piecewise.diff
index b1bdfaec1e..378acc8769 100644
--- a/academic/lapacke/patches/cmake-piecewise.diff
+++ b/academic/lapacke/patches/cmake-piecewise.diff
@@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
  message(STATUS "CBLAS enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 -
  # Create a header file cblas.h for the routines called in my C programs
  include(FortranCInterface)
  ## Ensure that the fortran compiler and c compiler specified are compatible
-@@ -41,54 +39,8 @@
+@@ -45,54 +43,8 @@
    add_subdirectory(examples)
  endif()
  
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -# Export cblas targets from the
 -# install tree, if any.
 -set(_cblas_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT cblas-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  install(EXPORT ${CBLASLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -  # Choose one of the cblas targets to use as a guard for
@@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -# Export cblas targets from the build tree, if any.
 -set(_cblas_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake)
 -
 -  # Choose one of the cblas targets to use as a guard
 -  # for cblas-config.cmake to load targets from the build tree.
@@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -endif()
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY)
 -
 -
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY)
    install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc
    DESTINATION ${PKG_CONFIG_DIR}
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -  )
 -
--#install(EXPORT cblas-targets
--#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-#install(EXPORT ${CBLASLIB}-targets
+-#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -#  COMPONENT Development
 -#  )
 diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
@@ -76,14 +76,14 @@ deleted file mode 100644
 -
 -# Load lapack targets from the build tree, including lapacke targets.
 -if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Report cblas header search locations from build tree.
 -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report cblas libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
 deleted file mode 100644
 --- a/CBLAS/cmake/cblas-config-install.cmake.in
@@ -96,19 +96,19 @@ deleted file mode 100644
 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET cblas)
--  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-if(NOT TARGET @CBLASLIB@)
+-  include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake)
 -endif()
 -
 -# Report lapacke header search locations.
 -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 -
 -unset(_CBLAS_PREFIX)
 -unset(_CBLAS_SELF_DIR)
@@ -128,16 +128,16 @@ deleted file mode 100644
 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
 --- a/CBLAS/src/CMakeLists.txt
 +++ b/CBLAS/src/CMakeLists.txt
-@@ -120,9 +120,5 @@
-   VERSION ${LAPACK_VERSION}
-   SOVERSION ${LAPACK_MAJOR_VERSION}
-   )
--target_include_directories(cblas PUBLIC
+@@ -123,9 +123,5 @@
+ if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+   target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+ endif()
+-target_include_directories(${CBLASLIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 -  $<INSTALL_INTERFACE:include>
 -)
- target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
- lapack_install_library(cblas)
+ target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES})
+ lapack_install_library(${CBLASLIB})
 diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
 deleted file mode 100644
 --- a/CMAKE/lapack-config-build.cmake.in
@@ -146,7 +146,7 @@ deleted file mode 100644
 -# Load lapack targets from the build tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -168,7 +168,7 @@ deleted file mode 100644
 -# Load lapack targets from the install tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-  include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -184,11 +184,11 @@ deleted file mode 100644
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,11 +112,8 @@
+@@ -160,11 +160,8 @@
  
  
  # --------------------------------------------------
--set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
 -
  macro(lapack_install_library lib)
    install(TARGETS ${lib}
@@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
-@@ -155,21 +152,6 @@
+@@ -204,21 +201,6 @@
  include(CheckLAPACKCompilerFlags)
  CheckLAPACKCompilerFlags()
  
@@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Check second function
 -
 -include(CheckTimeFunction)
--set(TIME_FUNC NONE ${TIME_FUNC})
+-set(NONE ${TIME_FUNC})
 -CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  # deprecated LAPACK and LAPACKE routines
  option(BUILD_DEPRECATED "Build deprecated routines" OFF)
  message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}")
-@@ -193,8 +175,9 @@
+@@ -242,8 +224,9 @@
  endif()
  
  # --------------------------------------------------
@@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  
  # Check the usage of the user provided BLAS libraries
  if(BLAS_LIBRARIES)
-@@ -205,113 +188,108 @@
+@@ -254,113 +237,108 @@
    if(BLAS_FOUND)
      message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
    else()
@@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -  message(STATUS "Using supplied NETLIB BLAS implementation")
 -  add_subdirectory(BLAS)
 +elseif(BUILD_BLAS)
-   set(BLAS_LIBRARIES blas)
+   set(BLAS_LIBRARIES ${BLASLIB})
 -else()
 -  set(CMAKE_EXE_LINKER_FLAGS
 -    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
@@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +  find_package(LAPACK)
 +
 +elseif(BUILD_LAPACK)
-   set(LAPACK_LIBRARIES lapack)
+   set(LAPACK_LIBRARIES ${LAPACKLIB})
 +  set(LAPACK_FOUND TRUE)
 +
 +  set(NEED_BLAS TRUE)
 +
 +  # Check second function
 +  include(CheckTimeFunction)
-+  set(TIME_FUNC NONE ${TIME_FUNC})
++  set(NONE ${TIME_FUNC})
 +  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 +  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 +  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +    add_subdirectory(TESTING)
 +  endif()
 +
-+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 +    install(FILES
-+    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 +    DESTINATION ${PKG_CONFIG_DIR}
 +    COMPONENT Development
 +    )
@@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
    add_subdirectory(LAPACKE)
  endif()
  
-@@ -338,109 +316,12 @@
-   _display_cpp_implementation_msg("LAPACK")
+@@ -414,111 +392,16 @@
+   ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
  endif()
  
 -# --------------------------------------------------
@@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# --------------------------------------------------
 -
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -if(NOT LATESTLAPACK_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
 -endif()
 -
 -if(BUILD_TESTING OR LAPACKE_WITH_TMG)
--  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
 -endif()
 -
 -# Export lapack targets, not including lapacke, from the
 -# install tree, if any.
 -set(_lapack_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT lapack-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  install(EXPORT ${LAPACKLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -
@@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -
 -# Include cblas in targets exported from the build tree.
 -if(CBLAS)
--  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB})
 -endif()
 -
 -# Include lapacke in targets exported from the build tree.
 -if(LAPACKE)
--  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB})
 +# Neither user specified or optimized BLAS libraries can be used
 +if(NEED_BLAS AND NOT BLAS_FOUND)
 +  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
@@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Export lapack and lapacke targets from the build tree, if any.
 -set(_lapack_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake)
 -
 -  # Choose one of the lapack or lapacke targets to use as a guard
 -  # for lapack-config.cmake to load targets from the build tree.
@@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +if(NEED_LAPACK AND NOT LAPACK_FOUND)
 +  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
  endif()
--
+ 
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY)
 -
 -
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 -  install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 -  DESTINATION ${PKG_CONFIG_DIR}
 -  COMPONENT Development
 -  )
 -
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY)
 -
 -include(CMakePackageConfigHelpers)
 -write_basic_package_version_file(
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
 -  VERSION ${LAPACK_VERSION}
 -  COMPATIBILITY SameMajorVersion
 -  )
 -
 -install(FILES
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
--  
-\ No newline at end of file
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
 diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
 --- a/LAPACKE/CMakeLists.txt
 +++ b/LAPACKE/CMakeLists.txt
@@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
  message(STATUS "LAPACKE enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 -
  # Create a header file lapacke_mangling.h for the routines called in my C programs
  include(FortranCInterface)
@@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
    VERSION ${LAPACK_VERSION}
    SOVERSION ${LAPACK_MAJOR_VERSION}
    )
--target_include_directories(lapacke PUBLIC
+-target_include_directories(${LAPACKELIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 -  $<INSTALL_INTERFACE:include>
 -)
 -if(WIN32 AND NOT UNIX)
--  target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
+-  target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
 -  message(STATUS "Windows BUILD")
 -endif()
  
  if(LAPACKE_WITH_TMG)
-   target_link_libraries(lapacke PRIVATE tmglib)
+   target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB})
 @@ -111,22 +101,3 @@
    DESTINATION ${PKG_CONFIG_DIR}
    COMPONENT Development
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY)
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 -
--install(EXPORT lapacke-targets
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-install(EXPORT ${LAPACKELIB}-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
@@ -570,8 +571,8 @@ deleted file mode 100644
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapack targets from the build tree, including lapacke targets.
--if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-if(NOT TARGET @LAPACKELIB@)
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Hint for project building against lapack
@@ -581,7 +582,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
 deleted file mode 100644
 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in
@@ -594,12 +595,12 @@ deleted file mode 100644
 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET lapacke)
--  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-if(NOT TARGET @LAPACKELIB@)
+-  include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake)
 -endif()
 -
 -# Hint for project building against lapack
@@ -609,7 +610,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 -
 -unset(_LAPACKE_PREFIX)
 -unset(_LAPACKE_SELF_DIR)
diff --git a/academic/ldl/ldl.SlackBuild b/academic/ldl/ldl.SlackBuild
index b4652d420f..c0b4d98c5e 100644
--- a/academic/ldl/ldl.SlackBuild
+++ b/academic/ldl/ldl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LDL
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=ldl
 SRCNAM=SuiteSparse
 SUBDIR=LDL
 VERSION=${VERSION:-2.2.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/ldl/ldl.info b/academic/ldl/ldl.info
index 5676d5bd4f..9274c84ac9 100644
--- a/academic/ldl/ldl.info
+++ b/academic/ldl/ldl.info
@@ -1,8 +1,8 @@
 PRGNAM="ldl"
 VERSION="2.2.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/maxima/maxima.SlackBuild b/academic/maxima/maxima.SlackBuild
index de32fcbf35..a42281aa78 100644
--- a/academic/maxima/maxima.SlackBuild
+++ b/academic/maxima/maxima.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for maxima
 
+# Copyright 2021 Judah Milgram <milgram@cgpp.com>
 # Copyright 2017 Dhaby Xiloj <slack.dhabyx@gmail.com>
 # All rights reserved.
 # Based on work of Robby and others slackers.
@@ -30,9 +31,10 @@
 # Modified by Ken Milmore 2009
 # Modified by Glenn Becker to update to version 5.28.0
 # Glenn Becker -> update to version 5.38.1
+# JM -> update version 5.39 -> 5.44
 
 PRGNAM=maxima
-VERSION=${VERSION:-5.39.0}
+VERSION=${VERSION:-5.44.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/maxima/maxima.info b/academic/maxima/maxima.info
index 676c4f7b56..8235c0ba3c 100644
--- a/academic/maxima/maxima.info
+++ b/academic/maxima/maxima.info
@@ -1,10 +1,10 @@
 PRGNAM="maxima"
-VERSION="5.39.0"
+VERSION="5.44.0"
 HOMEPAGE="http://maxima.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/maxima/files/Maxima-source/5.39.0-source/maxima-5.39.0.tar.gz"
-MD5SUM="3bccafb512ff1054be700c61601088af"
+DOWNLOAD="https://sourceforge.net/projects/maxima/files/Maxima-source/5.44.0-source/maxima-5.44.0.tar.gz"
+MD5SUM="75e040745161901968d9c99c7a258e5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="DhabyX"
-EMAIL="slack.dhabyx@gmail.com"
+MAINTAINER="Judah Milgram"
+EMAIL="milgram@cgpp.com"
diff --git a/academic/meep/README b/academic/meep/README
index 66bd1ed80d..a0623df2cc 100644
--- a/academic/meep/README
+++ b/academic/meep/README
@@ -4,9 +4,7 @@ Meep is a free and open-source software package for electromagnetics
 simulation via the finite-difference time-domain (FDTD) method spanning 
 a broad range of applications. It saves results in hdf5 format.
 
-This package requires: hdf5, libctl, lapack, mpb
-
-You probably will also want to preinstall: harminv
+You probably will also want to preinstall: harminv, openmpi
 
 You may wish to also install: h5utils
 
diff --git a/academic/meep/meep.SlackBuild b/academic/meep/meep.SlackBuild
index 2aa5dec402..114680d8ec 100644
--- a/academic/meep/meep.SlackBuild
+++ b/academic/meep/meep.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=meep
-VERSION=${VERSION:-1.14}
+VERSION=${VERSION:-1.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,14 +75,13 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # if there is no configure script, try to build one!
-if [ ! -f ./configure ] ; then 
+if [ ! -f ./configure ] ; then
   ./autogen.sh
 fi
 
-
 LOCALCONFIGS=
 XDBFILE=/etc/sbo_pkg_options.conf
-if [ -f ${XDBFILE} ] ; then 
+if [ -f ${XDBFILE} ] ; then
   LOCALCONFIGS=${LOCALCONFIGS}" "$(grep "^${PRGNAM}:" ${XDBFILE} | grep -v '^#' | awk -F: '{print$2}') 
   echo Build options selected by file: LOCALCONFIGS=${LOCALCONFIGS}
 fi
@@ -91,8 +90,7 @@ if [  -n "${SBOPTIONS_MEEP}" ] ; then
   echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
 fi
 
-  
-# check for the Atlas replacement for blas; if the libraries are found, 
+# check for the Atlas replacement for blas; if the libraries are found,
 #  add the configure option accordingly
 
 if [ -f /usr/lib/libatlas.a ] ; then
@@ -115,7 +113,6 @@ CPPFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-
 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
 
diff --git a/academic/meep/meep.info b/academic/meep/meep.info
index bf739dd8b6..8faea2fd0f 100644
--- a/academic/meep/meep.info
+++ b/academic/meep/meep.info
@@ -1,8 +1,8 @@
 PRGNAM="meep"
-VERSION="1.14"
+VERSION="1.17.1"
 HOMEPAGE="https://github.com/NanoComp/meep"
-DOWNLOAD="https://github.com/NanoComp/meep/releases/download/v1.14.0/meep-1.14.tar.gz"
-MD5SUM="46875840eb7fc7267d9defe041eeb91e"
+DOWNLOAD="https://github.com/NanoComp/meep/releases/download/v1.17.1/meep-1.17.1.tar.gz"
+MD5SUM="657ecf1fa5459c73fdddd749dd81ec04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lapack hdf5 libctl mpb"
diff --git a/academic/mpb/mpb.SlackBuild b/academic/mpb/mpb.SlackBuild
index 3f60fe2617..2191964934 100644
--- a/academic/mpb/mpb.SlackBuild
+++ b/academic/mpb/mpb.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpb
-VERSION=${VERSION:-1.10.0}
+VERSION=${VERSION:-1.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,12 +75,10 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # if there is no configure script, try to build one!
-if [ ! -f ./configure ] ; then 
+if [ ! -f ./configure ] ; then
   ./autogen.sh
 fi
 
-
-
 LOCALCONFIGS=
 XDBFILE=/etc/sbo_pkg_options.conf
 if [ -f ${XDBFILE} ] ; then
@@ -92,12 +90,11 @@ if [  -n "${SBOPTIONS_MPB}" ] ; then
   echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
 fi
 
-
-# check for the Atlas replacement for blas; if the libraries are found, 
+# check for the Atlas replacement for blas; if the libraries are found,
 #  add the configure option accordingly
 
-if [ -f /usr/lib/libatlas.a ] ; then 
-  if [ -f /usr/lib/libatlas.so ] ; then 
+if [ -f /usr/lib/libatlas.a ] ; then
+  if [ -f /usr/lib/libatlas.so ] ; then
     echo "NOTICE: libatlas was found, configure --with-blas=atlas"
     LOCALCONFIGS=${LOCALCONFIGS}" --with-blas=atlas"
   fi
@@ -123,7 +120,6 @@ CPPFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-
 CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -132,7 +128,7 @@ CPPFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $LOCALCONFIGS 
+  $LOCALCONFIGS
 
 make
 make install DESTDIR=$PKG
@@ -143,7 +139,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 install -m 0644 $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/academic/mpb/mpb.info b/academic/mpb/mpb.info
index b3575b5b0a..bd24b0e499 100644
--- a/academic/mpb/mpb.info
+++ b/academic/mpb/mpb.info
@@ -1,8 +1,8 @@
 PRGNAM="mpb"
-VERSION="1.10.0"
+VERSION="1.11.1"
 HOMEPAGE="https://github.com/NanoComp/mpb"
-DOWNLOAD="https://github.com/NanoComp/mpb/releases/download/v1.10.0/mpb-1.10.0.tar.gz"
-MD5SUM="92f91cf5e0206e2e4531b780b45469c4"
+DOWNLOAD="https://github.com/NanoComp/mpb/releases/download/v1.11.1/mpb-1.11.1.tar.gz"
+MD5SUM="99afe4e8e11427c62a896d8eadd1c205"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lapack hdf5 libctl"
diff --git a/academic/nco/nco.SlackBuild b/academic/nco/nco.SlackBuild
index 0692d9f9da..74bd346139 100644
--- a/academic/nco/nco.SlackBuild
+++ b/academic/nco/nco.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=nco
-VERSION=${VERSION:-4.9.5}
+VERSION=${VERSION:-4.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/nco/nco.info b/academic/nco/nco.info
index d069f9d338..89cf7d6c3e 100644
--- a/academic/nco/nco.info
+++ b/academic/nco/nco.info
@@ -1,8 +1,8 @@
 PRGNAM="nco"
-VERSION="4.9.5"
+VERSION="4.9.7"
 HOMEPAGE="http://nco.sf.net"
-DOWNLOAD="https://github.com/nco/nco/archive/4.9.5/nco-4.9.5.tar.gz"
-MD5SUM="28edde9bfd7451722dfe6dfdd08a2af6"
+DOWNLOAD="https://github.com/nco/nco/archive/4.9.7/nco-4.9.7.tar.gz"
+MD5SUM="1ce73d3a65bcc7c9388665e57b05188f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="netcdf udunits antlr2"
diff --git a/academic/ngspice/ngspice.SlackBuild b/academic/ngspice/ngspice.SlackBuild
index f31d76c61b..964f6d0aaf 100644
--- a/academic/ngspice/ngspice.SlackBuild
+++ b/academic/ngspice/ngspice.SlackBuild
@@ -7,8 +7,8 @@
 # Set initial variables:
 
 PRGNAM=ngspice
-VERSION=${VERSION:-33}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-34}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -93,6 +93,8 @@ CFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
+# This has installed the configure output file as  /usr/include/config.h.
+
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -112,12 +114,18 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/$PRGNAM-$VERSION-manual.pdf \
   > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-$VERSION-manual.pdf
 
+# The shared library enabled by "--with-ngshared"
 install -Dm755 ./release/src/.libs/libngspice.so.0.0.0 \
   "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so.0.0.0"
 
 ln -s "libngspice.so.0.0.0" "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so.0"
 ln -s "libngspice.so.0.0.0" "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so"
 
+# The include file needed to use the shared library enabled by "--with-ngshared"
+install -Dm644 ./src/include/ngspice/sharedspice.h  $PKG/usr/include/ngspice/sharedspice.h
+# Move the configure output file.
+mv $PKG/usr/include/config.h $PKG/usr/include/ngspice/
+
 install -Dm644 $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/share/applications
diff --git a/academic/ngspice/ngspice.info b/academic/ngspice/ngspice.info
index 11dc9c8aa0..23f93fdba1 100644
--- a/academic/ngspice/ngspice.info
+++ b/academic/ngspice/ngspice.info
@@ -1,10 +1,10 @@
 PRGNAM="ngspice"
-VERSION="33"
+VERSION="34"
 HOMEPAGE="http://ngspice.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/ngspice/files/ng-spice-rework/33/ngspice-33.tar.gz \
-          https://sourceforge.net/projects/ngspice/files/ng-spice-rework/33/ngspice-33-manual.pdf"
-MD5SUM="c4cf9ce3b1a5da870d192f0418f7b507 \
-        435e7c73324cea31189a285aaa42d572"
+DOWNLOAD="https://sourceforge.net/projects/ngspice/files/ng-spice-rework/34/ngspice-34.tar.gz \
+          https://sourceforge.net/projects/ngspice/files/ng-spice-rework/34/ngspice-34-manual.pdf"
+MD5SUM="e88377ff1e5a466dcd240fa235de7551 \
+        ea1bfad9fccd20d58007898bc5f5a15d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openmpi"
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index fb2d909a46..11493d831c 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for octave
 
-# Copyright 2012-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=octave
-VERSION=${VERSION:-5.2.0}
+VERSION=${VERSION:-6.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index a4ea3e666a..d8b41a92ad 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,8 +1,8 @@
 PRGNAM="octave"
-VERSION="5.2.0"
+VERSION="6.2.0"
 HOMEPAGE="https://www.gnu.org/software/octave/"
-DOWNLOAD="https://ftp.gnu.org/gnu/octave/octave-5.2.0.tar.lz"
-MD5SUM="3c621e85026d4a807f5639901a41ae71"
+DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-6.2.0.tar.lz"
+MD5SUM="5de14d8561af9799e2ecf6bedfbdb346"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% lapack"
diff --git a/academic/pari/pari.SlackBuild b/academic/pari/pari.SlackBuild
index 09d2450383..536e7dd0d4 100644
--- a/academic/pari/pari.SlackBuild
+++ b/academic/pari/pari.SlackBuild
@@ -31,7 +31,7 @@
 # Joachim Kruth -> update to version 2.11.2
 
 PRGNAM=pari
-VERSION=${VERSION:-2.11.2}
+VERSION=${VERSION:-2.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -94,8 +94,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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/man/man1
+mv $PKG/usr/man/*gz $PKG/usr/man/man1
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING CHANGES* INSTALL* NEW README* \
+cp -a AUTHORS COPYING CHANGES* NEW README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/pari/pari.info b/academic/pari/pari.info
index 4dab289fe4..1da54f9b76 100644
--- a/academic/pari/pari.info
+++ b/academic/pari/pari.info
@@ -1,8 +1,8 @@
 PRGNAM="pari"
-VERSION="2.11.2"
+VERSION="2.13.1"
 HOMEPAGE="https://pari.math.u-bordeaux.fr/"
-DOWNLOAD="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.11.2.tar.gz"
-MD5SUM="6afe748a472c33ae8787a5034d7742a9"
+DOWNLOAD="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.1.tar.gz"
+MD5SUM="826064cf75af268be8a482ade6e27501"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/pyCRAC/MANIFEST_slack.txt b/academic/pyCRAC/MANIFEST_slack.txt
deleted file mode 100644
index 95a4931773..0000000000
--- a/academic/pyCRAC/MANIFEST_slack.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-setup.py
-MANIFEST.txt
-LICENCE.txt
-README.txt
-pyCRAC/tests/test.novo
-pyCRAC/tests/test.sh
-pyCRAC/tests/test_coordinates.txt
-pyCRAC/tests/test.gtf
-pyCRAC/tests/test_f.fastq
-pyCRAC/tests/test_f.fastq.gz
-pyCRAC/tests/test_f_dm.fastq
-pyCRAC/tests/test_r.fastq
-pyCRAC/tests/test_r.fastq.gz
-pyCRAC/tests/test_r_dm.fastq
-pyCRAC/tests/indexes.txt
-pyCRAC/tests/barcodes.txt
-pyCRAC/tests/genes.lis
-pyCRAC/Classes/NGSFormatWriters.py
-pyCRAC/Classes/NGSFormatReaders.py
-pyCRAC/Classes/PairedReads.py
-pyCRAC/Classes/Pileups.py
-pyCRAC/Classes/Aligner.py
-pyCRAC/Classes/Motifs.py
-pyCRAC/Classes/Barcodes.py
-pyCRAC/Classes/Coverage.py
-pyCRAC/Classes/Exceptions.py
-pyCRAC/Classes/FDR.py
-pyCRAC/Classes/Clustering
-pyCRAC/db/Saccharomyces_cerevisiae.EF2.59.1.0_chr_lengths.txt
-pyCRAC/db/Saccharomyces_cerevisiae.EF2.59.1.0.fa
-pyCRAC/db/Saccharomyces_cerevisiae.EF2.59.1.0.fa.tab
-pyCRAC/db/Saccharomyces_cerevisiae.EF2.59.1.3.gtf
-pyCRAC/kinetic_crac_pipeline/CRAC_pipeline_PE.py
-pyCRAC/kinetic_crac_pipeline/CRAC_pipeline_PeakFinder.py
-pyCRAC/kinetic_crac_pipeline/CRAC_pipeline_SE.py
-pyCRAC/kinetic_crac_pipeline/TrimNucs.py
-pyCRAC/scripts/pybed2GTF.py
-pyCRAC/scripts/pyGTF2bed.py
-pyCRaC/scripts/pyGTF2bedGraph.py
-pyCRAC/scripts/pyGTF2sgr.py
-pyCRAC/scripts/pyNormalizeIntervalLengths.py
-pyCRAC/scripts/pyFastqDuplicateRemover.py
-pyCRAC/scripts/pyFastqJoiner.py
-pyCRAC/scripts/pyFastqSplitter.py
-pyCRAC/scripts/pyGetGeneNamesFromGTF.py
-pyCRAC/scripts/pySelectMotifsFromGTF.py
-pyCRAC/scripts/pyGetGTFSources.py
-pyCRAC/scripts/pyFilterGTF.py
-pyCRAC/scripts/pyFasta2tab.py
-pyCRAC/scripts/pyAlignment2Tab.py
-pyCRAC/scripts/pyExtractLinesFromGTF.py
-pyCRAC/scripts/pyCheckGTFfile.py
-pyCRAC/scripts/pyCalculateChromosomeLengths.py
-pyCRAC/pyClusterReads.py
-pyCRAC/pyCalculateFDRs.py
-pyCRAC/pyCalculateMutationFrequencies.py
-pyCRAC/pyBinCollector.py
-pyCRAC/pyMotif.py
-pyCRAC/pyPileup.py
-pyCRAC/pyReadAligner.py
-pyCRAC/pyReadCounters.py
-pyCRAC/pyBarcodeFilter.py
-pyCRAC/Parsers/Blast.py
-pyCRAC/Parsers/GTF2.py
-pyCRAC/Parsers/Novoalign.py
-pyCRAC/Parsers/ParseAlignments.py
-pyCRAC/Parsers/SAM.py
-pyCRAC/Parsers/fasta2dict.py
-pyCRAC/Parsers/tab2dict.py
diff --git a/academic/pyCRAC/README b/academic/pyCRAC/README
index 1583f3e62c..9eb56fc043 100644
--- a/academic/pyCRAC/README
+++ b/academic/pyCRAC/README
@@ -8,8 +8,6 @@ and reports sense and anti-sense hits.
 Included is the pipeline used for the analysis of a group of CRAC data
 sets.
 
-An R-function used for kinetic CRAC analysis can be found in
-/usr/share/pyCRAC-$VERSION/kinetic_crac_pipeline
 
 References
 
@@ -26,10 +24,9 @@ Granneman S.
 
 If you want to run the test suite after installation, see README.tests.
 
+
 Note on the Crac pipelines:
 
-The CRAC_pipeline_PE.py and CRAC_pipeline_SE.py scripts now ONLY work
-with pyCRAC version 1.3.3 and Flexbar version 3.4.0 and later(!)
 Use the -h flag to get a detailed help menu.
 
 The CRAC_pipeline_PE.py script needs to be run from the folder that
@@ -44,4 +41,3 @@ The file containing the adapter sequences should be in the fasta format.
 The chromosome_lengths file should contain two tab-separated columns in
 which the first column has the chromosome name and the second the
 chromosome length.
-
diff --git a/academic/pyCRAC/README.tests b/academic/pyCRAC/README.tests
index ee98d3fdaa..e1b634e6a3 100644
--- a/academic/pyCRAC/README.tests
+++ b/academic/pyCRAC/README.tests
@@ -1,7 +1,7 @@
 To test the pyCRAC scripts after installing the package on Slackware:
 
   cp -R /usr/share/pyCRAC-$VERSION <path-to-your-work-directory>/
-  cd <path-to-your-work-directory>/pyCRAC/tests
+  cd <path-to-your-work-directory>/pyCRAC-$VERSION/tests
   sh test.sh
 
 If all tests complete without an error, the package is working.
diff --git a/academic/pyCRAC/pyCRAC.SlackBuild b/academic/pyCRAC/pyCRAC.SlackBuild
index f94cec426b..6482133f42 100644
--- a/academic/pyCRAC/pyCRAC.SlackBuild
+++ b/academic/pyCRAC/pyCRAC.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyCRAC
 
-# Copyright 2017 Rob van Nues
+# Copyright 2017-2021 Rob van Nues
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyCRAC
-VERSION=${VERSION:-1.4.6}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,9 +36,9 @@ PYTHON2=false
 PYTHON3=true
 
 
-PIPENAM=kinetic_crac_pipeline
-PIPEVER=${PIPEVER:-ffe91cc6bf7a}
-PIPETAG=sgrann
+PIPENAM=crac_pipelines
+PIPEVER=master
+#PIPETAG=sgrann
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -73,20 +73,21 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-rm -rf $PIPETAG-$PIPENAM-$PIPEVER
+#rm -rf $PIPETAG-$PIPENAM-$PIPEVER
+rm -rf $PIPENAM-$PIPEVER
 
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 mkdir $PRGNAM/$PIPENAM
 
-if [[ -f $CWD/$PIPETAG-$PIPENAM-$PIPEVER.tar.gz ]]; then
- tar xvf $CWD/$PIPETAG-$PIPENAM-$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
-elif [[ -f $CWD/$PIPEVER.tar.gz ]]; then
- tar xvf $CWD/$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
+if [[ -f $CWD/$PIPENAM-$PIPEVER.tar.gz ]]; then
+ tar xvf $CWD/$PIPENAM-$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
+else
+ echo "$PIPENAM-$PIPEVER.tar.gz not found"
 fi
 
 #replace setup.py; test.sh
-rm setup.py
+mv setup.py setup.py.ORIG
 cp $CWD/setup_slack.py setup.py
 rm tests/test.sh
 cp $CWD/test_slack.sh tests/test.sh
@@ -108,14 +109,12 @@ fi
 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
 
-# The pipeline-R script
-mkdir -p $PKG/usr/share/$PRGNAM-$VERSION/$PIPENAM
-cp $PRGNAM/$PIPENAM/gaussianProcessAnalysis.R $PKG/usr/share/$PRGNAM-$VERSION/$PIPENAM
-
 # the manual etc.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   README.md \
+  setup.py.ORIG \
+  The_pyCRAC_Manual.pdf \
   $CWD/README.tests $CWD/setup_slack.py \
   $CWD/README \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/pyCRAC/pyCRAC.info b/academic/pyCRAC/pyCRAC.info
index 8048dd69ec..0b293a216a 100644
--- a/academic/pyCRAC/pyCRAC.info
+++ b/academic/pyCRAC/pyCRAC.info
@@ -1,10 +1,10 @@
 PRGNAM="pyCRAC"
-VERSION="1.4.6"
+VERSION="1.5.0"
 HOMEPAGE="http://sandergranneman.bio.ed.ac.uk/pycrac-software"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyCRAC/pyCRAC-1.4.6.tar.gz \
-  https://bitbucket.org/sgrann/kinetic_crac_pipeline/get/ffe91cc6bf7a.tar.gz"
-MD5SUM="ddbfbd08a5d8a178082056ef3efc99a8 \
-  8c19a15c439941cc5ae17e083f52143a"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyCRAC/pyCRAC-1.5.0.tar.gz \
+  https://git.ecdf.ed.ac.uk/sgrannem/crac_pipelines/-/archive/master/crac_pipelines-master.tar.gz"
+MD5SUM="73bfb92e8ae0f30fd73f21a77d265288 \
+  119c67d318a03ed29471e4caeb2690a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 flexbar novocraft numpy3 pysam scipy3 pandas ruffus"
diff --git a/academic/pyCRAC/setup_slack.py b/academic/pyCRAC/setup_slack.py
index 421d43bebe..f76cd3868d 100644
--- a/academic/pyCRAC/setup_slack.py
+++ b/academic/pyCRAC/setup_slack.py
@@ -1,9 +1,9 @@
 #!/usr/bin/python
 
 __author__      = "Sander Granneman"
-__copyright__   = "Copyright 2019"
-__version__     = "1.4.6"
-__credits__     = ["Sander Granneman","Hywell Dunn Davies"]
+__copyright__   = "Copyright 2020"
+__version__     = "1.5.0"
+__credits__     = ["Sander Granneman","Grzegorz Kudla","Hywell Dunn Davies"]
 __maintainer__  = ["Sander Granneman","Rob van Nues via SlackBuilds.org"]
 __email__       = ["sgrannem@staffmail.ed.ac.uk", "sborg63@disroot.org"]
 __status__      = "Production"
@@ -55,9 +55,8 @@ setup(name='pyCRAC',
 					'pyCRAC/scripts/pyGTF2bedGraph.py',
 					'pyCRAC/scripts/pyFilterGTF.py',
 					'pyCRAC/scripts/pyNormalizeIntervalLengths.py',
-					'pyCRAC/kinetic_crac_pipeline/CRAC_pipeline_PE.py',
-					'pyCRAC/kinetic_crac_pipeline/CRAC_pipeline_PeakFinder.py',
-					'pyCRAC/kinetic_crac_pipeline/CRAC_pipeline_SE.py',
+					'pyCRAC/crac_pipelines/CRAC_pipeline_PE.py',
+					'pyCRAC/crac_pipelines/CRAC_pipeline_SE.py',
 				],
 	classifiers=[   'Development Status :: 5 - Production/Stable',
 					'Environment :: Console',
@@ -92,6 +91,3 @@ setup(name='pyCRAC',
 					'tests/genes.list'])
 				]
 			  )
-
-
-
diff --git a/academic/rbio/rbio.SlackBuild b/academic/rbio/rbio.SlackBuild
index 54bfe33088..e83a5cbc38 100644
--- a/academic/rbio/rbio.SlackBuild
+++ b/academic/rbio/rbio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for RBio
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=rbio
 SRCNAM=SuiteSparse
 SUBDIR=RBio
 VERSION=${VERSION:-2.2.6}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-6}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/rbio/rbio.info b/academic/rbio/rbio.info
index a2a2652e08..0e914776cd 100644
--- a/academic/rbio/rbio.info
+++ b/academic/rbio/rbio.info
@@ -1,8 +1,8 @@
 PRGNAM="rbio"
 VERSION="2.2.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/rpy2/rpy2.SlackBuild b/academic/rpy2/rpy2.SlackBuild
index 93275f4a82..b31616bdbe 100644
--- a/academic/rpy2/rpy2.SlackBuild
+++ b/academic/rpy2/rpy2.SlackBuild
@@ -2,7 +2,7 @@
 #
 # SlackBuild for rpy2
 #
-# Copyright 2020 Rob van Nues (sborg63@disroot.org)
+# Copyright 2020-2021 Rob van Nues (sborg63@disroot.org)
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rpy2
-VERSION=${VERSION:-3.3.6}
+VERSION=${VERSION:-3.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/rpy2/rpy2.info b/academic/rpy2/rpy2.info
index 63973a6f60..4671f1a69b 100644
--- a/academic/rpy2/rpy2.info
+++ b/academic/rpy2/rpy2.info
@@ -1,8 +1,8 @@
 PRGNAM="rpy2"
-VERSION="3.3.6"
+VERSION="3.4.3"
 HOMEPAGE="https://rpy2.github.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/r/rpy2/rpy2-3.3.6.tar.gz"
-MD5SUM="fd789967d3e46744cb1b2c4e55f47839"
+DOWNLOAD="https://pypi.python.org/packages/source/r/rpy2/rpy2-3.4.3.tar.gz"
+MD5SUM="bf3572caed450c5f88c5295f3eda6137"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="R cffi Jinja2 python3-pytest tzlocal"
diff --git a/academic/samtools/samtools.SlackBuild b/academic/samtools/samtools.SlackBuild
index da9e176475..2a3a784382 100644
--- a/academic/samtools/samtools.SlackBuild
+++ b/academic/samtools/samtools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for samtools
 
 # Copyright 2013-2016 Petar Petrov slackalaxy@gmail.com
-# Copyright 2017-2020 Rob van Nues # All rights reserved.
+# Copyright 2017-2021 Rob van Nues # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=samtools
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/samtools/samtools.info b/academic/samtools/samtools.info
index 2d42d9d715..91b54352ff 100644
--- a/academic/samtools/samtools.info
+++ b/academic/samtools/samtools.info
@@ -1,8 +1,8 @@
 PRGNAM="samtools"
-VERSION="1.11"
+VERSION="1.12"
 HOMEPAGE="http://www.htslib.org"
-DOWNLOAD="https://github.com/samtools/samtools/releases/download/1.11/samtools-1.11.tar.bz2"
-MD5SUM="9fd052652a9ceb56fc1098e63f596330"
+DOWNLOAD="https://github.com/samtools/samtools/releases/download/1.12/samtools-1.12.tar.bz2"
+MD5SUM="14540f346cc2f438cea21b2fa7e40fb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="htslib"
diff --git a/academic/spqr/patches/autoconfiscate.diff b/academic/spqr/patches/autoconfiscate.diff
index ffd9eb9657..8fff318251 100644
--- a/academic/spqr/patches/autoconfiscate.diff
+++ b/academic/spqr/patches/autoconfiscate.diff
@@ -463,7 +463,7 @@ diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_blas.m4
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,241 @@
 +# ===========================================================================
 +#         https://www.gnu.org/software/autoconf-archive/ax_blas.html
 +# ===========================================================================
@@ -502,6 +502,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -529,7 +530,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 16
++#serial 17
 +
 +AU_ALIAS([ACX_BLAS], [AX_BLAS])
 +AC_DEFUN([AX_BLAS], [
@@ -543,7 +544,9 @@ new file mode 100644
 +case $with_blas in
 +	yes | "") ;;
 +	no) ax_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
++	-* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++		BLAS_LIBS="$with_blas"
++	;;
 +	*) BLAS_LIBS="-l$with_blas" ;;
 +esac
 +
@@ -982,7 +985,7 @@ diff --git a/m4/ax_lapack.m4 b/m4/ax_lapack.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_lapack.m4
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,134 @@
 +# ===========================================================================
 +#        https://www.gnu.org/software/autoconf-archive/ax_lapack.html
 +# ===========================================================================
@@ -1022,6 +1025,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -1049,7 +1053,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 9
++#serial 10
 +
 +AU_ALIAS([ACX_LAPACK], [AX_LAPACK])
 +AC_DEFUN([AX_LAPACK], [
@@ -1061,7 +1065,9 @@ new file mode 100644
 +case $with_lapack in
 +        yes | "") ;;
 +        no) ax_lapack_ok=disable ;;
-+        -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;;
++        -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++                 LAPACK_LIBS="$with_lapack"
++        ;;
 +        *) LAPACK_LIBS="-l$with_lapack" ;;
 +esac
 +
diff --git a/academic/spqr/spqr.SlackBuild b/academic/spqr/spqr.SlackBuild
index 576fb608ee..0ce28905bc 100644
--- a/academic/spqr/spqr.SlackBuild
+++ b/academic/spqr/spqr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SPQR
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=spqr
 SRCNAM=SuiteSparse
 SUBDIR=SPQR
 VERSION=${VERSION:-2.0.9}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-2}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/spqr/spqr.info b/academic/spqr/spqr.info
index 2bab1e6903..daa36cb95e 100644
--- a/academic/spqr/spqr.info
+++ b/academic/spqr/spqr.info
@@ -1,8 +1,8 @@
 PRGNAM="spqr"
 VERSION="2.0.9"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack suitesparseconfig cholmod tbb"
diff --git a/academic/stellarium/stellarium.SlackBuild b/academic/stellarium/stellarium.SlackBuild
index 4c7e1ff99e..99d4bb2406 100644
--- a/academic/stellarium/stellarium.SlackBuild
+++ b/academic/stellarium/stellarium.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=stellarium
-VERSION=${VERSION:-0.18.1}
+VERSION=${VERSION:-0.20.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/stellarium/stellarium.info b/academic/stellarium/stellarium.info
index 35dd774260..ba33b79199 100644
--- a/academic/stellarium/stellarium.info
+++ b/academic/stellarium/stellarium.info
@@ -1,8 +1,8 @@
 PRGNAM="stellarium"
-VERSION="0.18.1"
+VERSION="0.20.4"
 HOMEPAGE="http://www.stellarium.org"
-DOWNLOAD="https://github.com/Stellarium/stellarium/releases/download/v0.18.1/stellarium-0.18.1.tar.gz"
-MD5SUM="1eb0098db83f0543b44877a8e72acbb6"
+DOWNLOAD="https://github.com/Stellarium/stellarium/releases/download/v0.20.4/stellarium-0.20.4.tar.gz"
+MD5SUM="d02659c2e01582a4608a97b4aa0baf61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/academic/suitesparse/README b/academic/suitesparse/README
index 7eb56aa16e..a0a5eb5679 100644
--- a/academic/suitesparse/README
+++ b/academic/suitesparse/README
@@ -26,3 +26,7 @@ by default.
 SlackBuilds.org also has all the parts of this suite as individual
 builds - DO NOT try and install the individual parts and the suite;
 pick one or the other.
+
+For Slackware 14.2, suitesparse's version is being held at 5.7.2.
+Later versions (5.8.n) are not compatible with 14.2 supplied version
+of mpfr (3.1.4).
diff --git a/academic/suitesparse/suitesparse.SlackBuild b/academic/suitesparse/suitesparse.SlackBuild
index 9ccd701152..ea5d9248da 100644
--- a/academic/suitesparse/suitesparse.SlackBuild
+++ b/academic/suitesparse/suitesparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for suitesparse
 
-# Copyright 2017-2020 Christoph Willing,  Brisbane Australia
+# Copyright 2017-2021 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 # Thanks to Pablo Santamaria for previous versions
 #
diff --git a/academic/suitesparseconfig/patches/autoconfiscate.diff b/academic/suitesparseconfig/patches/autoconfiscate.diff
index a6a40926ee..80b550a08a 100644
--- a/academic/suitesparseconfig/patches/autoconfiscate.diff
+++ b/academic/suitesparseconfig/patches/autoconfiscate.diff
@@ -34,7 +34,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([SuiteSparse_config],[5.6.0],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[suitesparseconfig],[http://www.suitesparse.com/])
++AC_INIT([SuiteSparse_config],[5.8.1],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[suitesparseconfig],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([SuiteSparse_config.c])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AC_CONFIG_MACRO_DIR([m4])
diff --git a/academic/suitesparseconfig/suitesparseconfig.SlackBuild b/academic/suitesparseconfig/suitesparseconfig.SlackBuild
index f228f534cc..1845c790c9 100644
--- a/academic/suitesparseconfig/suitesparseconfig.SlackBuild
+++ b/academic/suitesparseconfig/suitesparseconfig.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SuiteSparse_config
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 PRGNAM=suitesparseconfig
 SRCNAM=SuiteSparse
 SUBDIR=SuiteSparse_config
-VERSION=${VERSION:-5.6.0}
-SRCVER=${SRCVER:-5.6.0}
+VERSION=${VERSION:-5.8.1}
+SRCVER=${SRCVER:-5.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/suitesparseconfig/suitesparseconfig.info b/academic/suitesparseconfig/suitesparseconfig.info
index 34bb7ee90f..17cea1c0bf 100644
--- a/academic/suitesparseconfig/suitesparseconfig.info
+++ b/academic/suitesparseconfig/suitesparseconfig.info
@@ -1,8 +1,8 @@
 PRGNAM="suitesparseconfig"
-VERSION="5.6.0"
+VERSION="5.8.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/sundials/sundials.SlackBuild b/academic/sundials/sundials.SlackBuild
index 7e546408c4..149f9bd771 100644
--- a/academic/sundials/sundials.SlackBuild
+++ b/academic/sundials/sundials.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sundials
-VERSION=${VERSION:-5.3.0}
+VERSION=${VERSION:-5.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,6 +82,8 @@ sed -i \
   src/*/CMakeLists.txt \
   src/*/*/CMakeLists.txt
 
+export PATH=/opt/cmake-202x/bin:$PATH
+
 mkdir -p build
 cd build
   cmake \
diff --git a/academic/sundials/sundials.info b/academic/sundials/sundials.info
index 3e7d0a028c..561c6831af 100644
--- a/academic/sundials/sundials.info
+++ b/academic/sundials/sundials.info
@@ -1,10 +1,10 @@
 PRGNAM="sundials"
-VERSION="5.3.0"
+VERSION="5.6.1"
 HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-DOWNLOAD="https://computing.llnl.gov/projects/sundials/download/sundials-5.3.0.tar.gz"
-MD5SUM="4546d887f63e8a5f7b3ba7933d877c83"
+DOWNLOAD="https://github.com/LLNL/sundials/releases/download/v5.6.1/sundials-5.6.1.tar.gz"
+MD5SUM="a945bf3fa606fb6676ec025723688f15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="cmake-202x"
 MAINTAINER="R. S. Ananda Murthy"
 EMAIL="rsamurti@gmail.com"
diff --git a/academic/sword-data-kjv/sword-data-kjv.SlackBuild b/academic/sword-data-kjv/sword-data-kjv.SlackBuild
index 4b41aacc36..add1aa9c09 100644
--- a/academic/sword-data-kjv/sword-data-kjv.SlackBuild
+++ b/academic/sword-data-kjv/sword-data-kjv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sword-data-kjv
 
-# Copyright 2015/6/8 Tim Dickson, email: tim at googlemail.com
+# Copyright 2015-2021 Tim Dickson, email: tim at googlemail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sword-data-kjv
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.1_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/sword-data-kjv/sword-data-kjv.info b/academic/sword-data-kjv/sword-data-kjv.info
index d58f037e03..0bbedb43ef 100644
--- a/academic/sword-data-kjv/sword-data-kjv.info
+++ b/academic/sword-data-kjv/sword-data-kjv.info
@@ -1,10 +1,10 @@
 PRGNAM="sword-data-kjv"
-VERSION="1.8.1"
+VERSION="1.8.1_1"
 HOMEPAGE="http://www.crosswire.org/sword/modules/"
 DOWNLOAD="http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip \
           http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsGreek.zip \
           http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsHebrew.zip"
-MD5SUM="43b84512562a6b2406b34abf46fca4fa \
+MD5SUM="7488aadfd5b72c96b4601a0135c5786a \
         2acde501e6a33e84feeeaa62f8e53d89 \
         3cbbc69d7410efc9d1d7f6f6b30e3415"
 DOWNLOAD_x86_64=""
diff --git a/academic/umfpack/patches/autoconfiscate.diff b/academic/umfpack/patches/autoconfiscate.diff
index b902c15281..de66ade417 100644
--- a/academic/umfpack/patches/autoconfiscate.diff
+++ b/academic/umfpack/patches/autoconfiscate.diff
@@ -866,7 +866,7 @@ diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_blas.m4
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,241 @@
 +# ===========================================================================
 +#         https://www.gnu.org/software/autoconf-archive/ax_blas.html
 +# ===========================================================================
@@ -905,6 +905,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -932,7 +933,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 16
++#serial 17
 +
 +AU_ALIAS([ACX_BLAS], [AX_BLAS])
 +AC_DEFUN([AX_BLAS], [
@@ -946,7 +947,9 @@ new file mode 100644
 +case $with_blas in
 +	yes | "") ;;
 +	no) ax_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
++	-* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++		BLAS_LIBS="$with_blas"
++	;;
 +	*) BLAS_LIBS="-l$with_blas" ;;
 +esac
 +
diff --git a/academic/umfpack/umfpack.SlackBuild b/academic/umfpack/umfpack.SlackBuild
index c87f06711a..046a2501b6 100644
--- a/academic/umfpack/umfpack.SlackBuild
+++ b/academic/umfpack/umfpack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for UMFPACK
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=umfpack
 SRCNAM=SuiteSparse
 SUBDIR=UMFPACK
 VERSION=${VERSION:-5.7.9}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/umfpack/umfpack.info b/academic/umfpack/umfpack.info
index 283dfdc4cb..9b8e8496a8 100644
--- a/academic/umfpack/umfpack.info
+++ b/academic/umfpack/umfpack.info
@@ -1,8 +1,8 @@
 PRGNAM="umfpack"
 VERSION="5.7.9"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas suitesparseconfig amd cholmod"
diff --git a/academic/veusz/README b/academic/veusz/README
index f09808ca55..f8e783a6ac 100644
--- a/academic/veusz/README
+++ b/academic/veusz/README
@@ -10,13 +10,13 @@ SAMP interfaces to its plotting facilities. It also allows for
 manipulation and editing of datasets. Data can be captured from
 external sources such as Internet sockets or other programs.
 
-See the complete release notes for Veusz 3.2.1 at
-https://veusz.github.io/releasenotes/3.2.1.txt
+See the complete release notes for Veusz 3.3.1 at
+https://veusz.github.io/releasenotes/3.3.1.txt
 
 Sphinx is an optional dependency (used to rebuild the manual).
 
 ****
 Note:
 The veusz.SlackBuild script moved from Python2 to Python3 in version
-3.2.1. Please, check the dependencies.
+3.3.1. Please, check the dependencies.
 ****
diff --git a/academic/veusz/veusz.SlackBuild b/academic/veusz/veusz.SlackBuild
index d4f6b1b28b..b11846a622 100644
--- a/academic/veusz/veusz.SlackBuild
+++ b/academic/veusz/veusz.SlackBuild
@@ -2,7 +2,7 @@
 # Slackware build script for veusz
 # Based on Slackware 14.2 SlackBuild and Andrea Sciucca's SlackBuild for veusz
 #
-# Copyright 2016-2020, Fellype do Nascimento, Campinas - Brazil
+# Copyright 2016-2020, Fellype do Nascimento, Guaratingueta - Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=veusz
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,7 +78,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a  AUTHORS ChangeLog COPYING INSTALL README VERSION  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a  AUTHORS ChangeLog COPYING INSTALL README.md VERSION  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cp Documents/manual/pdf/veusz.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 
@@ -93,8 +93,11 @@ done
 install -m 644 -p -D veusz.svg $PKG/usr/share/icons/hicolor/scalable/apps/veusz.svg
 cd -
 
-# Installing desktop menu file
+# Install support files
 install -m 644 -p -D support/veusz.desktop $PKG/usr/share/applications/veusz.desktop
+install -m 644 -p -D support/veusz.appdata.xml $PKG/usr/share/appdata/veusz.appdata.xml
+install -m 644 -p -D support/veusz.xml $PKG/usr/share/mime/packages/veusz.xml
+
 
 mkdir -p $PKG/usr/man/man1
 gzip Documents/man-page/veusz.1 > $PKG/usr/man/man1/veusz.1.gz
diff --git a/academic/veusz/veusz.info b/academic/veusz/veusz.info
index bef4efb40d..eac4b5be7a 100644
--- a/academic/veusz/veusz.info
+++ b/academic/veusz/veusz.info
@@ -1,10 +1,10 @@
 PRGNAM="veusz"
-VERSION="3.2.1"
+VERSION="3.3.1"
 HOMEPAGE="https://veusz.github.io/"
-DOWNLOAD="https://github.com/veusz/veusz/releases/download/veusz-3.2.1/veusz-3.2.1.tar.gz"
-MD5SUM="f341ea793208818088926612bde53d09"
+DOWNLOAD="https://github.com/veusz/veusz/releases/download/veusz-3.3.1/veusz-3.3.1.tar.gz"
+MD5SUM="1c7d42d6f87ea3b98fafc8dc52dbbc58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numpy3 python3-PyQt5"
 MAINTAINER="Fellype do Nascimento"
-EMAIL="fellype(at)gmail(dot)com"
+EMAIL="fellype (at) gmail (dot) com"
diff --git a/academic/wxMaxima/slack-desc b/academic/wxMaxima/slack-desc
index 9ae6f3b3ff..5fe290b31d 100644
--- a/academic/wxMaxima/slack-desc
+++ b/academic/wxMaxima/slack-desc
@@ -11,7 +11,7 @@ wxMaxima:
 wxMaxima: wxMaxima is a cross platform GUI for the computer algebra system
 wxMaxima: Maxima based on wxWidgets.
 wxMaxima:
-wxMaxima: Homepage: https://andrejv.github.io/wxmaxima/
+wxMaxima: Homepage: https://wxmaxima-developers.github.io/wxmaxima/
 wxMaxima:
 wxMaxima:
 wxMaxima:
diff --git a/academic/wxMaxima/wxMaxima.SlackBuild b/academic/wxMaxima/wxMaxima.SlackBuild
index fb42b15df6..80b7aa18e0 100644
--- a/academic/wxMaxima/wxMaxima.SlackBuild
+++ b/academic/wxMaxima/wxMaxima.SlackBuild
@@ -22,15 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Mar 2021 -  updated for v. 21.01, Judah Milgram, milgram at cgpp com
+
 PRGNAM=wxMaxima
 SRCNAM=wxmaxima
-VERSION=${VERSION:-16.04.2}
+VERSION=${VERSION:-21.01.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +43,8 @@ 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"
@@ -60,9 +62,9 @@ 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 $SRCNAM-Version-$VERSION
+tar xvf $CWD/Version-$VERSION.tar.gz
+cd $SRCNAM-Version-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,44 +72,33 @@ 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 {} \;
 
-# Fix man directory.
-sed -i '/^mandatadir/s|=.*|= \$(mandir)|' data/Makefile*
-#Fix end-of-line encoding.
-for i in art/*.txt; do
-  sed -e 's/\r//' $i > ${i}.new
-  touch -r $i ${i}.new
-  mv ${i}.new $i
-done
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-dependency-tracking \
-  --disable-silent-rules \
-  --enable-printing \
-  --build=$ARCH-slackware-linux
-
-make
-make allmo
-make install DESTDIR=$PKG
+BUILDDIR=build
+mkdir -p $BUILDDIR
+
+export PATH="/opt/cmake-202x/bin:$PATH"
+cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=$PKG/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -G Ninja -S . -B $BUILDDIR
+cmake --build $BUILDDIR
+cmake --install $BUILDDIR
 
 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
 
+mv $PKG/usr/share/man $PKG/usr
 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
 
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING README.md art/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f $PKG/usr/share/$PRGNAM/{COPYING,README}
+mkdir $PKG/usr/doc
+mv $PKG/usr/share/doc/$SRCNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp -a examples/*.wxm $PKG/usr/doc/$PRGNAM-$VERSION/examples
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/academic/wxMaxima/wxMaxima.info b/academic/wxMaxima/wxMaxima.info
index 2c1f2c97d3..a67cce8f49 100644
--- a/academic/wxMaxima/wxMaxima.info
+++ b/academic/wxMaxima/wxMaxima.info
@@ -1,10 +1,10 @@
 PRGNAM="wxMaxima"
-VERSION="16.04.2"
-HOMEPAGE="https://andrejv.github.io/wxmaxima/"
-DOWNLOAD="http://downloads.sourceforge.net/wxmaxima/wxmaxima-16.04.2.tar.gz"
-MD5SUM="6d98324d70115615e7b4f7413b594dd5"
+VERSION="21.01.0"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+DOWNLOAD="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-21.01.0.tar.gz"
+MD5SUM="2c9b97c786806172aa6ed000784e995e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="maxima wxGTK3"
+REQUIRES="maxima wxGTK3 cmake-202x ninja"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index 859e77f6bc..f1f484b971 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -83,6 +83,7 @@ sed -i "s/3.20/3.14/g" ui/navbar_versekey.gtkbuilder
 
 mkdir -p build
 cd build
+export "PATH=/opt/cmake-202x/bin:$PATH"
 cmake -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/accessibility/mag/README b/accessibility/mag/README
new file mode 100644
index 0000000000..bc58413145
--- /dev/null
+++ b/accessibility/mag/README
@@ -0,0 +1,4 @@
+mag (screen magnifier for X)
+
+mag is similar to xmag, but has the ability to move itself out of the
+way when not in use.
diff --git a/accessibility/mag/mag.1 b/accessibility/mag/mag.1
new file mode 100644
index 0000000000..230168b011
--- /dev/null
+++ b/accessibility/mag/mag.1
@@ -0,0 +1,85 @@
+.\" Man page generated from reStructuredText.
+.
+.TH MAG 1 "2020-11-01" "20100913" "SlackBuilds.org"
+.SH NAME
+mag \- dynamic X11 screen magnifier
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for mag(1) man page. Convert with:
+.
+.\" rst2man.py mag.rst > mag.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+mag [\fI\-d\fP] [\fI\-s | \-m | \-l\fP]  [\fI\-z factor\fP] [\fI\-x Xcoord\fP] [\fI\-y Ycoord\fP]
+.SH DESCRIPTION
+.sp
+\fBmag\fP is a screen magnifier similar to xmag(1), but it has the
+ability to move itself out of the way when not in use.
+.sp
+With dynamic placement ([\fI\-d\fP] option), the magnifier will flee to the
+furthest corner away from the mouse. Without, you can grab it and move it as you like.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-s
+small window.
+.TP
+.B \-m
+medium window.
+.TP
+.B \-l
+large window.
+.TP
+.B \-d
+Dynamic placement.
+.TP
+.BI \-z \ n
+Zoom factor.
+.TP
+.BI \-x \ Xcoord
+Original X placement.
+.TP
+.BI \-y \ Ycoord
+Original Y placement.
+.UNINDENT
+.SH AUTHORS
+.sp
+mag was written by Danny Chouinard.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The mag homepage:
+.sp
+\fI\%https://sites.google.com/site/dannychouinard/Home/unix\-linux\-trinkets/little\-utilities/mag\-dynamic\-x11\-screen\-magnifier\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/accessibility/mag/mag.SlackBuild b/accessibility/mag/mag.SlackBuild
new file mode 100644
index 0000000000..76fd2d911a
--- /dev/null
+++ b/accessibility/mag/mag.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for mag
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# VERSION comes from the last modified date on the homepage.
+
+PRGNAM=mag
+VERSION=${VERSION:-20100913}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+# Since it's just a single C source file, we don't have a
+# $TMP/$PRGNAM-$VERSION and don't need find/chown/chmod stuff.
+# In case you're wondering, -Wl,-s builds a stripped binary.
+rm -rf $PKG
+mkdir -p $PKG/usr/bin $OUTPUT
+gcc $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$PRGNAM $PRGNAM.c -lX11
+
+# Man page written by SlackBuild author. Please don't include mag.rst
+# in the package, it's the source for the man page only.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# Include our own README.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/accessibility/mag/mag.info b/accessibility/mag/mag.info
new file mode 100644
index 0000000000..41ccad278d
--- /dev/null
+++ b/accessibility/mag/mag.info
@@ -0,0 +1,10 @@
+PRGNAM="mag"
+VERSION="20100913"
+HOMEPAGE="https://sites.google.com/site/dannychouinard/Home/unix-linux-trinkets/little-utilities/mag-dynamic-x11-screen-magnifier"
+DOWNLOAD="https://sites.google.com/site/dannychouinard/Home/unix-linux-trinkets/little-utilities/mag-dynamic-x11-screen-magnifier/mag.c"
+MD5SUM="9a659263b85a280f047c272820d2aa91"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/accessibility/mag/mag.rst b/accessibility/mag/mag.rst
new file mode 100644
index 0000000000..1a8381b551
--- /dev/null
+++ b/accessibility/mag/mag.rst
@@ -0,0 +1,59 @@
+.. RST source for mag(1) man page. Convert with:
+..   rst2man.py mag.rst > mag.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20100913
+.. |date| date::
+
+===
+mag
+===
+
+----------------------------
+dynamic X11 screen magnifier
+----------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+mag [*-d*] [*-s | -m | -l*]  [*-z factor*] [*-x Xcoord*] [*-y Ycoord*]
+
+DESCRIPTION
+===========
+
+**mag** is a screen magnifier similar to xmag(1), but it has the
+ability to move itself out of the way when not in use.
+
+With dynamic placement ([*-d*] option), the magnifier will flee to the
+furthest corner away from the mouse. Without, you can grab it and move it as you like.
+
+OPTIONS
+=======
+
+-s                 small window.                                     
+-m                 medium window.                                    
+-l                 large window.                                     
+-d                 Dynamic placement.                                
+-z n               Zoom factor.                                      
+-x Xcoord          Original X placement.                             
+-y Ycoord          Original Y placement.
+
+AUTHORS
+=======
+
+mag was written by Danny Chouinard.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The mag homepage:
+
+https://sites.google.com/site/dannychouinard/Home/unix-linux-trinkets/little-utilities/mag-dynamic-x11-screen-magnifier
diff --git a/accessibility/mag/slack-desc b/accessibility/mag/slack-desc
new file mode 100644
index 0000000000..f937d8cb9c
--- /dev/null
+++ b/accessibility/mag/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+mag: mag (screen magnifier for X)
+mag:
+mag: mag is similar to xmag, but has the ability to move itself out of
+mag: the way when not in use.
+mag:
+mag:
+mag:
+mag:
+mag:
+mag:
+mag:
diff --git a/accessibility/svkbd/README b/accessibility/svkbd/README
index 0f63196b8b..42c6b6af55 100644
--- a/accessibility/svkbd/README
+++ b/accessibility/svkbd/README
@@ -3,19 +3,23 @@ svkbd (simple virtual keyboard)
 This is a simple virtual keyboard, intended to be used in environments
 where no keyboard is available.
 
-Configuration is done at build time. The font and colors can be set in
-config.h (in the same directory as the SlackBuild). The key layouts
-are set with the environment variable LAYOUTS, which can be set to
-a space-separated list of one or more of:
+The default font and other options can be set in config.h (in the same
+directory as the SlackBuild). To do this, extract config.def.h from
+the source, copy it to config.h, and edit.
 
-en - English (QWERTY, the default)
+The key layouts are set with the environment variable LAYOUTS, which
+can be set to a space-separated list of one or more of:
+
+mobile-intl - Multilayer international (QWERTY)
+mobule-plain - Non-layered international (QWERTY)
 arrows - Arrow keys only
+en - English (QWERTY)
 de - German (QWERTZ)
 ru - Russian (Cyrillic)
 sh - Slavic (QWERTZ)
-all -  All of the above
+all - All of the above
 
-Default value for LAYOUTS is "en".
+Default value for LAYOUTS is "en mobile-intl".
 
 The package will contain binaries for each layout (e.g. svkbd-en,
 svkbd-ru) in /usr/bin. The first layout listed in LAYOUTS (or svkbd-en
diff --git a/accessibility/svkbd/old_fontconfig.diff b/accessibility/svkbd/old_fontconfig.diff
new file mode 100644
index 0000000000..a076227512
--- /dev/null
+++ b/accessibility/svkbd/old_fontconfig.diff
@@ -0,0 +1,29 @@
+diff -Naur svkbd-0.2.1/drw.c svkbd-0.2.1.patched/drw.c
+--- svkbd-0.2.1/drw.c	2020-09-18 07:02:35.000000000 -0400
++++ svkbd-0.2.1.patched/drw.c	2020-11-02 12:45:36.377138299 -0500
+@@ -133,6 +133,7 @@
+ 		die("no font specified.");
+ 	}
+ 
++#ifdef FC_COLOR
+ 	/* Do not allow using color fonts. This is a workaround for a BadLength
+ 	 * error from Xft with color glyphs. Modelled on the Xterm workaround. See
+ 	 * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
+@@ -145,6 +146,7 @@
+ 		XftFontClose(drw->dpy, xfont);
+ 		return NULL;
+ 	}
++#endif
+ 
+ 	font = ecalloc(1, sizeof(Fnt));
+ 	font->xfont = xfont;
+@@ -351,7 +353,9 @@
+ 			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
+ 			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
+ 			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
++#ifdef FC_COLOR
+ 			FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
++#endif
+ 
+ 			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
+ 			FcDefaultSubstitute(fcpattern);
diff --git a/accessibility/svkbd/slack-desc b/accessibility/svkbd/slack-desc
index b193e1625f..455bebd9bf 100644
--- a/accessibility/svkbd/slack-desc
+++ b/accessibility/svkbd/slack-desc
@@ -11,9 +11,9 @@ svkbd:
 svkbd: This is a simple virtual keyboard, intended to be used in environments
 svkbd: where no keyboard is available.
 svkbd:
-svkbd: This package built with layouts: @LAYOUTS@
-svkbd: Default layout: @FIRST@
-svkbd:
+svkbd: This package built with layouts:
+svkbd:    @LAYOUTS@
 svkbd:
+svkbd: Default layout: @FIRST@
 svkbd:
 svkbd:
diff --git a/accessibility/svkbd/svkbd.1 b/accessibility/svkbd/svkbd.1
deleted file mode 100644
index 1d52ab0855..0000000000
--- a/accessibility/svkbd/svkbd.1
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-.    ds C`
-.    ds C'
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
-..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
-..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
-.\}
-.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "SVKBD 1"
-.TH SVKBD 1 "2014-03-18" "20140130" "Suckless.org Tools"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-svkbd \- simple virtual keyboard
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fBsvkbd\fR\-\fIlayout\fR [\-d] [\-g geometry]
-.PP
-\&\fBsvkbd\fR\-\fIlayout\fR [\-v|\-h]
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-\&\fBsvkbd\fR is a simple mouse-operated virtual keyboard, intended to be
-used in environments where no keyboard is available.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\fB\-d\fR" 4
-.IX Item "-d"
-This tells \fBsvkbd\fR to announce itself being a dock window, which then
-is managed differently between different window managers. If using dwm
-and the dock patch, then this will make svkbd being managed by dwm and
-some space of the screen being reserved for it.
-.IP "\fB\-g geometry\fR" 4
-.IX Item "-g geometry"
-Sets starting size and position. Standard X11 geometry specification,
-WxH[+\-]X[+\-Y], such as used by \fIxterm\fR\|(1).
-.IP "\fB\-v\fR" 4
-.IX Item "-v"
-Prints the version number and exits.
-.IP "\fB\-h\fR" 4
-.IX Item "-h"
-Prints usage message and exits.
-.SH "ENVIRONMENT"
-.IX Header "ENVIRONMENT"
-\&\fB\s-1DISPLAY\s0\fR \- used in the usual way.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-\&\fBsvkbd\fR was written by Christoph Lohmann (20h@r\-36.net)
-and Enno Boland (g # s01 ' de)
-.PP
-This man page written by B. Watson for the SlackBuilds.org project. It
-may be used by anyone.
diff --git a/accessibility/svkbd/svkbd.SlackBuild b/accessibility/svkbd/svkbd.SlackBuild
index 3e751ad190..7f55f9d498 100644
--- a/accessibility/svkbd/svkbd.SlackBuild
+++ b/accessibility/svkbd/svkbd.SlackBuild
@@ -6,10 +6,16 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# VERSION is the date of the last git commit.
+# 20210219 bkw: updated for v0.2.2.
+# 20201102 bkw:
+# - updated for v0.2.1.
+# - add mobile-intl to default LAYOUTS
+# - get rid of my man page, upstream now ships one
+# - compile fix: old_fontconfig.diff
+# - actually support custom config.h in SlackBuild dir
 
 PRGNAM=svkbd
-VERSION=${VERSION:-20140130}
+VERSION=${VERSION:-0.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,35 +55,53 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-sed -i -e "s,\<lib\>,lib$LIBDIRSUFFIX," -e "s,-Os,$SLKCFLAGS," config.mk
+# 20201102 bkw: newer fontconfigs support color fonts, but there is a
+# bug that causes security issues when they're used. svkbd contains
+# code to disable color fonts... which we don't need (and can't use)
+# because our fontconfig in 14.2 is too old to support color anyway.
+patch -p1 < $CWD/old_fontconfig.diff
 
-LAYOUTS="${LAYOUTS:-en}"
+[ -e $CWD/config.h ] && cat $CWD/config.h > config.def.h
+
+LAYOUTS="${LAYOUTS:-en mobile-intl}"
 if [ "$LAYOUTS" = "all" ]; then
   LAYOUTS="$( ls layout.*.h|cut -d. -f2 | xargs echo )"
-  FIRST="en"
+  FIRST=en
 else
   FIRST="$( echo $LAYOUTS | cut -d' ' -f1)"
 fi
 
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-
 for i in ${LAYOUTS}; do
   if [ -e layout.$i.h ]; then
-     make install LAYOUT="$i" PREFIX=/usr DESTDIR=$PKG
-     ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-$i.1.gz
+     make clean
+     make install \
+       CFLAGS="$SLKCFLAGS" \
+       CPPFLAGS="$SLKCFLAGS" \
+       LAYOUT="$i" \
+       PREFIX=/usr \
+       MANPREFIX=/usr/man \
+       X11LIB=/usr/lib$LIBDIRSUFFIX \
+       DESTDIR=$PKG
   else
-    echo "No such layout '$i', read the README."
+    echo "*** $0: No such layout '$i', read the README." 1>&2
     exit 1
   fi
 done
 
+# 20201102 bkw: bit of paranoia here.
+if [ "$(/bin/ls $PKG/usr/bin | wc -l)" == 0 ]; then
+  echo "*** $0: no valid layouts! LAYOUTS is \"$LAYOUTS\"" 1>&2
+  exit 1
+fi
+
+gzip $PKG/usr/man/man1/$PRGNAM.1
+for i in ${LAYOUTS}; do
+  ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-$i.1.gz
+done
+
 strip $PKG/usr/bin/*
 ln -s $PRGNAM-$FIRST $PKG/usr/bin/$PRGNAM
 
diff --git a/accessibility/svkbd/svkbd.info b/accessibility/svkbd/svkbd.info
index d8f5d4ccc2..5b4dca1751 100644
--- a/accessibility/svkbd/svkbd.info
+++ b/accessibility/svkbd/svkbd.info
@@ -1,8 +1,8 @@
 PRGNAM="svkbd"
-VERSION="20140130"
+VERSION="0.2.2"
 HOMEPAGE="https://tools.suckless.org/x/svkbd"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/svkbd-20140130.tar.gz"
-MD5SUM="d1279213dbdac77dbb7b386c138d6e61"
+DOWNLOAD="https://dl.suckless.org/tools/svkbd-0.2.2.tar.gz"
+MD5SUM="a9f7f9cade4a4882cb816c42d9144632"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/accessibility/svkbd/svkbd.pod b/accessibility/svkbd/svkbd.pod
deleted file mode 100644
index dedcb9155d..0000000000
--- a/accessibility/svkbd/svkbd.pod
+++ /dev/null
@@ -1,58 +0,0 @@
-# POD source for svkbd man page. Convert with:
-# pod2man --stderr -s1 -c"Suckless.org Tools" -r20140130 svkbd.pod > svkbd.1
-
-=pod
-
-=head1 NAME
-
-B<svkbd> - simple virtual keyboard
-
-=head1 SYNOPSIS
-
-B<svkbd>-I<layout> [-d] [-g geometry]
-
-B<svkbd>-I<layout> [-v|-h]
-
-=head1 DESCRIPTION
-
-B<svkbd> is a simple mouse-operated virtual keyboard, intended to be
-used in environments where no keyboard is available.
-
-=head1 OPTIONS
-
-=over
-
-=item B<-d>
-
-This tells B<svkbd> to announce itself being a dock window, which then
-is managed differently between different window managers. If using dwm
-and the dock patch, then this will make svkbd being managed by dwm and
-some space of the screen being reserved for it.
-
-=item B<-g geometry>
-
-Sets starting size and position. Standard X11 geometry specification,
-WxH[+-]X[+-Y], such as used by xterm(1).
-
-=item B<-v>
-
-Prints the version number and exits.
-
-=item B<-h>
-
-Prints usage message and exits.
-
-=back
-
-=head1 ENVIRONMENT
-
-B<DISPLAY> - used in the usual way.
-
-=head1 AUTHORS
-
-B<svkbd> was written by Christoph Lohmann (20h@r-36.net)
-and Enno Boland (g # s01 ' de)
-
-This man page written by B. Watson for the SlackBuilds.org project. It
-may be used by anyone.
-=cut
diff --git a/accessibility/wgetpaste/README b/accessibility/wgetpaste/README
index 9fdbf4ad6c..748b245ebb 100644
--- a/accessibility/wgetpaste/README
+++ b/accessibility/wgetpaste/README
@@ -4,5 +4,10 @@ See /etc/wgetpaste.conf.sample for config options.
 
 If you want to use the -x, -X, -C options to wgetpaste, install xclip.
 
-Please note: the "ca" and "bpaste" services are currently broken. The
-default "dpaste" service works as of 20150125.
+Notes:
+
+- The "codepad" and "gists" services are currently broken. The
+  "dpaste" (default) and "bpaste" services work as of 20201024.
+
+- There is a new release of wgetpaste (2.30), but *all* the services
+  are broken in 2.30, so it's useless to upgrade.
diff --git a/accessibility/wgetpaste/wgetpaste.SlackBuild b/accessibility/wgetpaste/wgetpaste.SlackBuild
index 997373bba6..2ae4b9c2bd 100644
--- a/accessibility/wgetpaste/wgetpaste.SlackBuild
+++ b/accessibility/wgetpaste/wgetpaste.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw: Attempted update for v2.30, but it appears to be
+# broken. The default dpaste service works fine in 2.29 and not
+# at all in 2.30. Only reason I'm "updating" the build is to add
+# comments here and in the README.
+
 # 20191130 bkw: update for v2.29. Currently only dpaste works.
 
 # 20140818 bkw:
@@ -55,11 +60,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Un-gentoo-ize the help and error messages, use wgetpaste_info for the
 # -i and -I options.
diff --git a/accessibility/xsel/xsel.SlackBuild b/accessibility/xsel/xsel.SlackBuild
index 67a373675a..583fc8ea29 100644
--- a/accessibility/xsel/xsel.SlackBuild
+++ b/accessibility/xsel/xsel.SlackBuild
@@ -48,11 +48,13 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20201027 bkw: fixes build on -current. I *despise* people who leave
+# -Werror in released code: it means they don't care if it works on
+# anyone else's compiler but the specific version they use. Grr.
+sed -i 's,-Werror,,g' configure
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/audio/FAudio/0001-cmake.patch b/audio/FAudio/0001-cmake.patch
new file mode 100644
index 0000000000..37d5e01276
--- /dev/null
+++ b/audio/FAudio/0001-cmake.patch
@@ -0,0 +1,45 @@
+From 931b198dae23863dd2e5c205bd819991a7259d85 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 11 Nov 2020 10:05:41 -0800
+Subject: [PATCH] cmake: Fix compatiblity with older cmake versions.
+
+IMPORTED_TARGET was only introduced in cmake 3.6 and FAudio
+does not build with GStremer versions older than 1.9.2.
+
+Fixes https://github.com/FNA-XNA/FAudio/issues/226
+
+v2: Use _LDFLAGS to ensure linking against the correct gstreamer.
+---
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb57a672..58da7f18 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,9 +142,9 @@ if(GSTREAMER)
+ 
+ 	# Find GStreamer
+ 	find_package(PkgConfig)
+-	pkg_check_modules(GST REQUIRED IMPORTED_TARGET gstreamer-1.0)
+-	pkg_check_modules(GSTAUDIO REQUIRED IMPORTED_TARGET gstreamer-audio-1.0)
+-	pkg_check_modules(GSTAPP REQUIRED IMPORTED_TARGET gstreamer-app-1.0)
++	pkg_check_modules(GST REQUIRED gstreamer-1.0>=1.9.2)
++	pkg_check_modules(GSTAUDIO REQUIRED gstreamer-audio-1.0>=1.9.2)
++	pkg_check_modules(GSTAPP REQUIRED gstreamer-app-1.0>=1.9.2)
+ 
+ 	# Include/Link GStreamer...
+ 	target_include_directories(FAudio PRIVATE
+@@ -153,9 +153,9 @@ if(GSTREAMER)
+ 		${GSTAPP_INCLUDE_DIRS}
+ 	)
+ 	target_link_libraries(FAudio PRIVATE
+-            PkgConfig::GST
+-            PkgConfig::GSTAUDIO
+-            PkgConfig::GSTAPP
++            ${GST_LDFLAGS}
++            ${GSTAUDIO_LDFLAGS}
++            ${GSTAPP_LDFLAGS}
+         )
+ endif(GSTREAMER)
+ 
diff --git a/audio/FAudio/FAudio.SlackBuild b/audio/FAudio/FAudio.SlackBuild
index a16edef591..bdd24fd25f 100644
--- a/audio/FAudio/FAudio.SlackBuild
+++ b/audio/FAudio/FAudio.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=FAudio
-VERSION=${VERSION:-20.01}
+VERSION=${VERSION:-20.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,16 +69,29 @@ 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 {} \;
 
-[ "${FFMPEG:=OFF}" != OFF ] && FFMPEG=ON
+# gstreamer and gst-plugins-base are too old in Slackware 14.2.
+if pkg-config --atleast-version 1.9.2 gstreamer-1.0 &&
+    pkg-config --atleast-version 1.9.2 gstreamer-audio-1.0 &&
+    pkg-config --atleast-version 1.9.2 gstreamer-app-1.0; then
+  GST=ON
+else
+  GST=OFF
+fi
+
+# cmake: Fix compatiblity with older cmake versions.
+# https://github.com/FNA-XNA/FAudio/commit/6a1b6b5d7bc237635d8cbc143b42418c16651a35
+# https://github.com/FNA-XNA/FAudio/pull/227
+# https://github.com/FNA-XNA/FAudio/issues/226
+patch -p1 < $CWD/0001-cmake.patch
 
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DFFMPEG=$FFMPEG \
+    -DGSTREAMER=$GST \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -89,7 +102,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
-[ "$FFMPEG" != ON ] || cp -a README.ffmpeg $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/FAudio/FAudio.info b/audio/FAudio/FAudio.info
index 68b03ddb46..edc0f0e9b1 100644
--- a/audio/FAudio/FAudio.info
+++ b/audio/FAudio/FAudio.info
@@ -1,8 +1,8 @@
 PRGNAM="FAudio"
-VERSION="20.01"
+VERSION="20.11"
 HOMEPAGE="https://fna-xna.github.io/"
-DOWNLOAD="https://github.com/FNA-XNA/FAudio/archive/20.01/FAudio-20.01.tar.gz"
-MD5SUM="f687b27a6052301af205963d87d4855b"
+DOWNLOAD="https://github.com/FNA-XNA/FAudio/archive/20.11/FAudio-20.11.tar.gz"
+MD5SUM="412d42ddf06b26fbabf7fd78af549f6f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
diff --git a/audio/FAudio/README b/audio/FAudio/README
index 2d971dd890..d208b174bb 100644
--- a/audio/FAudio/README
+++ b/audio/FAudio/README
@@ -1,9 +1,3 @@
 This is FAudio, an XAudio reimplementation that focuses solely on
-developing fully accurate DirectX Audio runtime libraries for the FNA
-project, including XAudio2, X3DAudio, XAPO, and XACT3.
-
-ffmpeg is an optional dependency for decoding xWMA resources.
-
-To enable ffmpeg support use:
-
-  FFMPEG=yes ./FAudio.SlackBuild
+developing fully accurate DirectX Audio runtime libraries for the
+FNA project, including XAudio2, X3DAudio, XAPO, and XACT3.
diff --git a/audio/abcde/README b/audio/abcde/README
index dd63e4fe81..214a1f4256 100644
--- a/audio/abcde/README
+++ b/audio/abcde/README
@@ -30,5 +30,5 @@ or more of these dependencies:
 * mkcue           for generating cue sheets for one-album files
 * vorbisgain      for adjusting the volume of Ogg Vorbis files
 
-Set CDDBMETHOD to "cddb" if you would like to retrieve music metadata and
-album art from freedb instead of MusicBrainz.
+Set CDDBMETHOD to "cddb" if you would like to retrieve music metadata
+and album art from freedb instead of MusicBrainz.
diff --git a/audio/abcde/abcde.info b/audio/abcde/abcde.info
index 917134dab7..ede0bdc0f3 100644
--- a/audio/abcde/abcde.info
+++ b/audio/abcde/abcde.info
@@ -6,5 +6,5 @@ MD5SUM="24a6e89f0e04acb6111e6be913643b12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cd-discid perl-MusicBrainz-DiscID perl-WebService-MusicBrainz"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Didier Spaier"
+EMAIL="didier at slint dot fr"
diff --git a/audio/alsacap/alsacap.SlackBuild b/audio/alsacap/alsacap.SlackBuild
index 70fd25dc9e..d1fcc38c91 100644
--- a/audio/alsacap/alsacap.SlackBuild
+++ b/audio/alsacap/alsacap.SlackBuild
@@ -13,8 +13,12 @@
 # 20140824 bkw: OK, it changed. I haven't got a copy of the old tarball
 # and web.archive.org doesn't seem to either. No idea what changed, sorry.
 
+# 20201207 bkw: actual new release! No functional changes, just fixes for
+# compiler warnings in alsacap.c. VERSION now 20200821 (modification time
+# of alsacap.c).
+
 PRGNAM=alsacap
-VERSION=${VERSION:-20140824}
+VERSION=${VERSION:-20200821}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,11 +58,8 @@ rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM.tgz
 cd $PRGNAM
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 sed -i "s,gcc,gcc $SLKCFLAGS," Makefile
 make
diff --git a/audio/alsacap/alsacap.info b/audio/alsacap/alsacap.info
index 1a800e4029..2a1b2b1f68 100644
--- a/audio/alsacap/alsacap.info
+++ b/audio/alsacap/alsacap.info
@@ -1,8 +1,8 @@
 PRGNAM="alsacap"
-VERSION="20140824"
-HOMEPAGE="http://www.volkerschatz.com/noise/alsa.html"
-DOWNLOAD="http://www.volkerschatz.com/noise/alsacap.tgz"
-MD5SUM="19642bdffd4666caa53344271aa585e9"
+VERSION="20200821"
+HOMEPAGE="https://www.volkerschatz.com/noise/alsa.html"
+DOWNLOAD="https://www.volkerschatz.com/noise/alsacap.tgz"
+MD5SUM="7cfdec57e70a885d2a56e1364dfc80ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/amSynth/amSynth.SlackBuild b/audio/amSynth/amSynth.SlackBuild
index 316985c46c..2f6a11ff70 100644
--- a/audio/amSynth/amSynth.SlackBuild
+++ b/audio/amSynth/amSynth.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=amSynth
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-1.12.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/amSynth/amSynth.info b/audio/amSynth/amSynth.info
index 40cf9e41e3..32345a6094 100644
--- a/audio/amSynth/amSynth.info
+++ b/audio/amSynth/amSynth.info
@@ -1,8 +1,8 @@
 PRGNAM="amSynth"
-VERSION="1.11.0"
+VERSION="1.12.2"
 HOMEPAGE="https://amsynth.github.io/"
-DOWNLOAD="https://github.com/amsynth/amsynth/releases/download/release-1.11.0/amsynth-1.11.0.tar.gz"
-MD5SUM="862877313e5b2384a06fd0dedb1cf1f2"
+DOWNLOAD="https://github.com/amsynth/amsynth/releases/download/release-1.12.2/amsynth-1.12.2.tar.gz"
+MD5SUM="b9cc26787e7c08b85814f0bc402225ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/apulse/README b/audio/apulse/README
index c072bfde14..516ac721e5 100644
--- a/audio/apulse/README
+++ b/audio/apulse/README
@@ -1,17 +1,45 @@
-PulseAudio emulation for ALSA.
-
-The program provides an alternative partial implementation of the
-PulseAudio API. It consists of a loader script and a number of
-shared libraries with the same names as from original PulseAudio,
-so applications could dynamically load them and think they are
-talking to PulseAudio. Internally, no separate sound mixing daemon is
-used. Instead, apulse relies on ALSA's dmix, dsnoop, and plug plugins
-to handle multiple sound sources and capture streams running at the
-same time. dmix plugin muxes multiple playback streams; dsnoop plugin
-allow multiple applications to capture from a single microphone;
-and plug plugin transparently converts audio between various sample
-formats, sample rates and channel numbers.  For more than a decade now,
-ALSA comes with these plugins enabled and configured by default. Cmake
-is required to build it.
-
-Note: It's recommended to uninstall PulseAudio before install apulse.
+apulse (PulseAudio emulation for ALSA)
+
+Any app that requires pulseaudio can be run as such:
+
+    $ apulse <program> [parameters]
+
+PulseAudio is not required.
+
+This script supports 3 build types, controlled by the SYSTEM
+environment variable:
+
+- SYSTEM=no is the default and recommended setting. Libraries will be
+  installed in a private directory, and headers will not be
+  installed. This allows apulse to coexist safely with Slackware's
+  pulseaudio package. apulse will only be used via the wrapper script,
+  as in the example above.
+
+- SYSTEM=yes installs the apulse libraries to /usr/lib(64). This would
+  conflict with Slackware's pulseaudio package, so only use this
+  option on a system where pulseaudio is not installed. The wrapper
+  script won't be required; all applications that use PulseAudio
+  will use apulse instead (although compatibility isn't 100% perfect,
+  so some apps may fail to run, or fail to make sound). This option
+  allows running software that's been built to use PulseAudio, but
+  doesn't allow compiling software to use PulseAudio.
+
+- SYSTEM=devel is like SYSTEM=yes, plus it installs pulseaudio headers
+  and pkg-config support files. This option allows you to (possibly)
+  compile software that uses PulseAudio, using apulse instead. Like
+  SYSTEM=yes, this option conflicts with Slackware's pulseaudio
+  package. You probably don't want SYSTEM=devel; it's pretty
+  niche-market. If you want to compile PulseAudio apps, you should
+  really be using actual PulseAudio.
+
+*DON'T* use SYSTEM=yes or SYSTEM=devel if you have pulseaudio
+installed! You'll make a mess. If you ignore this advice, you can
+probably clean up the mess by removing both apulse and pulseaudio,
+then reinstalling pulseaudio. Or not, YMMV.
+
+Note for multilib users: The SlackBuild now detects a multilib machine
+and will build 32-bit libraries. Do NOT set ARCH to i586 or i686 in
+the environment (leave it unset, or set it to "x86_64"), and do NOT
+use 32dev.sh or linux32. If you don't want to build 32-bit libraries:
+
+    # COMPAT32=no sh apulse.SlackBuild
diff --git a/audio/apulse/apulse.SlackBuild b/audio/apulse/apulse.SlackBuild
index 5694cca7b0..df8421d879 100644
--- a/audio/apulse/apulse.SlackBuild
+++ b/audio/apulse/apulse.SlackBuild
@@ -1,34 +1,42 @@
 #!/bin/sh
 
 # Slackware build script for apulse
-# Copyright 2019 Capi X. <capi_x@haibane.org>
-# 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.
-
-# 20191029 cpx:
-# - Initial version
+
+# Originally written by: Ryan P.C. McQuen | Everett, WA | <email removed>
+# Heavily modified and now maintained by B. Watson <yalhcru@gmail.com>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210301 bkw:
+# - Take over maintenance.
+# - Replace Capi X's version (submitted in 2019) with Ryan's (removed
+#   in 2016), since it supports multilib and by default doesn't stomp
+#   on the system pulseaudio libs. Add the ability to install the
+#   headers and .pc files, like Capi's build did, but disable it by
+#   default (SYSTEM variable).
+# - Relicense as WTFPL, with permission from original author (Ryan).
+# - i486 => i586.
+# - Rewrite README to document the new stuffs.
+# - Simplify the script a bit.
+# - Actually use SLKCFLAGS.
+# - Upstream ships a man page now, install it to /usr/man.
 
 PRGNAM=apulse
-VERSION=${VERSION:-0.1.12}
+VERSION=${VERSION:-0.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SYSTEM=${SYSTEM:-no}
+[ "$SYSTEM" = "devel" ] && HEADERS=yes
+case "$SYSTEM" in
+  yes|devel) AP_SUBDIR=${AP_SUBDIR:-/}      
+             COEXIST="CONFLICTS" ;;
+  no)        AP_SUBDIR=${AP_SUBDIR:-/apulse}
+             COEXIST="can safely coexist" ;;
+  *) echo "*** Invalid SYSTEM setting '$SYSTEM', use one of: no yes devel" 1>&2
+     exit 1 ;;
+esac
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -51,6 +59,8 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  # automatically detect multilib, can override with COMPAT32=no
+  [ -e /lib/libc.so.6 ] && COMPAT32="${COMPAT32:-yes}"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -58,44 +68,65 @@ fi
 
 set -e
 
+buildit() {
+  rm -rf build
+  mkdir -p build
+  cd build
+    cmake \
+      -DAPULSEPATH=/usr/lib$2${AP_SUBDIR} \
+      -DAPULSE_SEARCH_PATHS=/usr/lib${AP_SUBDIR}:/usr/lib${LIBDIRSUFFIX}${AP_SUBDIR} \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS $1 -DNDEBUG" \
+      -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS $1 -DNDEBUG" \
+      ..
+    make VERBOSE=1
+    make install/strip DESTDIR=$PKG
+  cd -
+}
+
+install_pc() {
+  mkdir -p $PKG/usr/lib$1/pkgconfig
+  for i in $CWD/pc/*.pc; do
+    sed "s,@64@,$1,g" $i > $PKG/usr/lib$1/pkgconfig/$( basename $i )
+  done
+}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-mkdir -p build
-cd build
-cmake ..
-make
+# hardcoded, can't override on cmake command line.
+sed -i 's,share/man/,man/,' CMakeLists.txt
 
-mkdir -p $PKG/usr/include
-cp -fra  ../3rdparty/pulseaudio-headers/pulse $PKG/usr/include
+# for compat32, we assume x86_64 CPUs handle i686 instructions. also,
+# unlike normal 32-bit packages, this one gets -fPIC (which won't hurt).
+[ "$COMPAT32" = "yes" ] && buildit "-m32 -march=i686 -mtune=i686" ""
 
-mkdir -p $PKG/usr/bin
-install  -m755 apulse $PKG/usr/bin
+# either way, build the normal libraries with normal cflags.
+buildit "" "$LIBDIRSUFFIX"
 
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
-cp -a    libpulse*so* $PKG/usr/lib$LIBDIRSUFFIX
+gzip -9 $PKG/usr/man/*/*
 
-mkdir -p $PKG/usr/share/pkgconfig
-install  -m644 $CWD/libpulse$LIBDIRSUFFIX.pc $PKG/usr/share/pkgconfig/libpulse.pc
+if [ "$HEADERS" = "yes" ]; then
+  mkdir -p $PKG/usr/include
+  cp -a 3rdparty/pulseaudio-headers/pulse $PKG/usr/include
+  install_pc "$LIBDIRSUFFIX"
+  [ "$COMPAT32" = "yes" ] && install_pc ""
+fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a LICENSE.MIT README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@COEXIST@,$COEXIST," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/apulse/apulse.info b/audio/apulse/apulse.info
index f785ec63f3..03868d7e81 100644
--- a/audio/apulse/apulse.info
+++ b/audio/apulse/apulse.info
@@ -1,10 +1,10 @@
 PRGNAM="apulse"
-VERSION="0.1.12"
+VERSION="0.1.13"
 HOMEPAGE="https://github.com/i-rinat/apulse"
-DOWNLOAD="https://github.com/i-rinat/apulse/archive/v0.1.12/apulse-0.1.12.tar.gz"
-MD5SUM="9745e6ee3391f44a30c6a7642de19186"
+DOWNLOAD="https://github.com/i-rinat/apulse/archive/v0.1.13/apulse-0.1.13.tar.gz"
+MD5SUM="90a9608a1b30f221925fb363dc2580a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Capi X."
-EMAIL="capi_x@haibane.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/audio/apulse/libpulse.pc b/audio/apulse/libpulse.pc
deleted file mode 100644
index 4a25c323aa..0000000000
--- a/audio/apulse/libpulse.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: libpulse
-Description: libpulse compiling helper for apulse users
-Version: 0.1.12
-Cflags: -I${includedir}
diff --git a/audio/apulse/libpulse64.pc b/audio/apulse/libpulse64.pc
deleted file mode 100644
index 8021c4fa6e..0000000000
--- a/audio/apulse/libpulse64.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib64
-includedir=${prefix}/include
-
-Name: libpulse
-Description: libpulse compiling helper for apulse users
-Version: 0.1.12
-Cflags: -I${includedir}
diff --git a/audio/apulse/pc/libpulse-mainloop-glib.pc b/audio/apulse/pc/libpulse-mainloop-glib.pc
new file mode 100644
index 0000000000..3b7eaa219c
--- /dev/null
+++ b/audio/apulse/pc/libpulse-mainloop-glib.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib@64@
+includedir=${prefix}/include
+
+Name: libpulse-mainloop-glib
+Description: PulseAudio GLib 2.0 Main Loop Wrapper [apulse]
+Version: 0.1.13
+Libs: -L${libdir} -lpulse-mainloop-glib 
+Cflags: -I${includedir}
+Requires: libpulse glib-2.0
diff --git a/audio/apulse/pc/libpulse-simple.pc b/audio/apulse/pc/libpulse-simple.pc
new file mode 100644
index 0000000000..f951da9150
--- /dev/null
+++ b/audio/apulse/pc/libpulse-simple.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib@64@
+includedir=${prefix}/include
+
+Name: libpulse-simple
+Description: PulseAudio Simplified Synchronous Client Interface [apulse]
+Version: 0.1.13
+Libs: -L${libdir} -lpulse-simple 
+Cflags: -I${includedir}
+Requires: libpulse
diff --git a/audio/apulse/pc/libpulse.pc b/audio/apulse/pc/libpulse.pc
new file mode 100644
index 0000000000..f1a89f0c41
--- /dev/null
+++ b/audio/apulse/pc/libpulse.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib@64@
+includedir=${prefix}/include
+
+Name: libpulse
+Description: PulseAudio Client Interface [apulse]
+Version: 0.1.13
+Libs: -L${libdir} -lpulse 
+Cflags: -I${includedir}
diff --git a/audio/apulse/slack-desc b/audio/apulse/slack-desc
index 4f80739bb2..d131fc8eb3 100644
--- a/audio/apulse/slack-desc
+++ b/audio/apulse/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 apulse: apulse (PulseAudio emulation for ALSA)
 apulse:
-apulse: The program provides an alternative partial implementation of the
-apulse: PulseAudio API. It consists of a loader script and a number of shared
-apulse: libraries with the same names as from original PulseAudio, so
-apulse: applications could dynamically load them and think they are talking
-apulse: to PulseAudio. Internally, no separate sound mixing daemon is used.
+apulse: Run any program that requires pulseaudio simply by preceding it
+apulse: with 'apulse'.
 apulse:
+apulse: $ apulse <program> [parameters]
 apulse:
+apulse: This package @COEXIST@ with Slackware's pulseaudio package.
 apulse:
+apulse: Homepage: https://github.com/i-rinat/apulse
 apulse:
diff --git a/audio/ardour/README b/audio/ardour/README
index ab2819d848..4d95504b53 100644
--- a/audio/ardour/README
+++ b/audio/ardour/README
@@ -2,4 +2,4 @@ Ardour is an application to fit the needs of musicians under Linux.
 It is designed to be a fully functional professional audio application,
 that uses the professional sound server jack for sound i/o.
 
-cppunit, lua and suil are optional dependencies.
+soundtouch, libwebsockets, cppunit and lua are optional dependencies.
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index 645681d7e7..177a2ab9f9 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ardour
-VERSION=${VERSION:-6.3}
+VERSION=${VERSION:-6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,7 +77,7 @@ find -L . \
 patch -p1 < $CWD/vendor_qm-dsp.patch
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
+CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \
 ./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index 78c9f731fc..ceff37bec5 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -1,8 +1,8 @@
 PRGNAM="ardour"
-VERSION="6.3"
+VERSION="6.6"
 HOMEPAGE="http://ardour.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-6.3.tar.xz"
-MD5SUM="f1bca078c08034045e5e46201031e215"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-6.6.tar.xz"
+MD5SUM="1564041434adfc08b0a30ff0ecafc8de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband suil cwiid lilv"
diff --git a/audio/cd-discid/cd-discid.info b/audio/cd-discid/cd-discid.info
index 7743579fe9..5fe796ad5b 100644
--- a/audio/cd-discid/cd-discid.info
+++ b/audio/cd-discid/cd-discid.info
@@ -6,5 +6,5 @@ MD5SUM="85027b71d08fbbfb11ac2f0db6e8cea7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Didier Spaier"
+EMAIL="didier at slint dot fr"
diff --git a/audio/cmus/cmus.SlackBuild b/audio/cmus/cmus.SlackBuild
index 8b1aed1e5a..0fd7dae525 100644
--- a/audio/cmus/cmus.SlackBuild
+++ b/audio/cmus/cmus.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for cmus
 
 # Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# Copyright 2013-2018, Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2021, Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cmus
-VERSION=${VERSION:-2.8.0}
+VERSION=${VERSION:-2.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,6 @@ 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 {} \;
 
-patch -p1 < $CWD/cmus_2.8.0...1ed60b5.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/audio/cmus/cmus.info b/audio/cmus/cmus.info
index 82f60fc6ad..6f0a1a907d 100644
--- a/audio/cmus/cmus.info
+++ b/audio/cmus/cmus.info
@@ -1,10 +1,8 @@
 PRGNAM="cmus"
-VERSION="2.8.0"
+VERSION="2.9.1"
 HOMEPAGE="https://cmus.github.io"
-DOWNLOAD="https://github.com/cmus/cmus/archive/v2.8.0/cmus-2.8.0.tar.gz \
-          http://ponce.cc/slackware/sources/repo/cmus_2.8.0...1ed60b5.patch"
-MD5SUM="3451aa83637d4145932a695cdb4c96ca \
-        f66f7fe040c91ad85c9a7ff58bf96d11"
+DOWNLOAD="https://github.com/cmus/cmus/archive/v2.9.1/cmus-2.9.1.tar.gz"
+MD5SUM="914ea4f79827174f825e9e7ce3880c44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/connie/connie.SlackBuild b/audio/connie/connie.SlackBuild
index af92a2e804..26a35b8806 100644
--- a/audio/connie/connie.SlackBuild
+++ b/audio/connie/connie.SlackBuild
@@ -44,11 +44,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # SSE isn't autodetected
 SSE=${SSE:-yes}
diff --git a/audio/connie/connie.info b/audio/connie/connie.info
index 9117f8e2e3..e84a5479f5 100644
--- a/audio/connie/connie.info
+++ b/audio/connie/connie.info
@@ -1,6 +1,6 @@
 PRGNAM="connie"
 VERSION="0.4.3rc9"
-HOMEPAGE="https://bitbucket.org/horo/connie/wiki/Home"
+HOMEPAGE="https://linuxmusicians.com/viewtopic.php?t=1381"
 DOWNLOAD="https://slackware.uk/~urchlay/src/connie-0.4.3rc9.tar.gz"
 MD5SUM="955d88ca394cc073c3deb6d16d128674"
 DOWNLOAD_x86_64=""
diff --git a/audio/drumkv1/drumkv1.SlackBuild b/audio/drumkv1/drumkv1.SlackBuild
index 1b9febbfe3..e42e448d68 100644
--- a/audio/drumkv1/drumkv1.SlackBuild
+++ b/audio/drumkv1/drumkv1.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201106 bkw: update for 0.9.18
 # 20200114 bkw: update for 0.9.12
 # 20191210 bkw: update for 0.9.11, document optional liblo dep, have slack-desc
 #               tell user whether or not optional deps are included.
@@ -19,7 +20,7 @@
 # 20170614 bkw: update for 0.8.2, drop qt5 dep, build with qt4
 
 PRGNAM=drumkv1
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.9.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +63,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+export PATH=/usr/lib$LIBDIRSUFFIX/qt5/bin:$PATH
+
 LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,8 +86,8 @@ make install DESTDIR=$PKG
   mv $PKG/usr/share/metainfo $PKG/usr/share/appdata
 
 # See comments in synthv1.SlackBuild to understand this.
-mkdir -p $PKG/usr/man/fr/man1 $PKG/usr/man/fr.UTF-8/man1
-mv $PKG/usr/man/man1/$PRGNAM.fr.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/man/fr.UTF-8/man1
+mv $PKG/usr/man/fr/man1/$PRGNAM.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
 zcat $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz | \
   iconv -f UTF-8 -t ISO-8859-1 | \
   gzip -9c \
diff --git a/audio/drumkv1/drumkv1.info b/audio/drumkv1/drumkv1.info
index e1869fb3eb..7c787bab14 100644
--- a/audio/drumkv1/drumkv1.info
+++ b/audio/drumkv1/drumkv1.info
@@ -1,8 +1,8 @@
 PRGNAM="drumkv1"
-VERSION="0.9.12"
+VERSION="0.9.18"
 HOMEPAGE="https://drumkv1.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/drumkv1/drumkv1/0.9.12/drumkv1-0.9.12.tar.gz"
-MD5SUM="331d534d6ef488b5399f2ad055dbc713"
+DOWNLOAD="https://downloads.sourceforge.net/project/drumkv1/drumkv1/0.9.18/drumkv1-0.9.18.tar.gz"
+MD5SUM="c09af8aee0ae2be7ecb5d6d2533bb2af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack qt5"
diff --git a/audio/drumstick/README b/audio/drumstick/README
new file mode 100644
index 0000000000..27bda2f50f
--- /dev/null
+++ b/audio/drumstick/README
@@ -0,0 +1,11 @@
+Drumstick is a set C++ MIDI libraries using Qt5 objects, idioms and
+style.  It contains a C++ wrapper around the ALSA library sequencer
+interface; ALSA sequencer provides software support for MIDI technology
+on Linux.
+
+A complementary library provides classes for SMF (Standard MIDI files:
+.MID/.KAR), and Cakewalk (.WRK) file formats processing. A multiplatform
+realtime MIDI I/O library and GUI Widgets are also provided.
+
+You also get in GUI: midi file player, drumgrid, virtual piano
+And in CLI: metronome, dump{mid,ove,smf,wrk}, playsmf.
diff --git a/network/weboob/doinst.sh b/audio/drumstick/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/weboob/doinst.sh
+++ b/audio/drumstick/doinst.sh
diff --git a/audio/drumstick/drumstick.SlackBuild b/audio/drumstick/drumstick.SlackBuild
new file mode 100644
index 0000000000..c8a0f565f1
--- /dev/null
+++ b/audio/drumstick/drumstick.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for <drumstick>
+#
+# Copyright Michales (clavisound) Michaloudes korgie@gmail.com <2019>
+# 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=drumstick
+VERSION=${VERSION:-1.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}	
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -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
+
+mv $PKG/usr/share/man $PKG/usr
+
+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
+cd $TMP/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog README TODO NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/audio/drumstick/drumstick.info b/audio/drumstick/drumstick.info
new file mode 100644
index 0000000000..40dcc5a145
--- /dev/null
+++ b/audio/drumstick/drumstick.info
@@ -0,0 +1,10 @@
+PRGNAM="drumstick"
+VERSION="1.1.3"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+DOWNLOAD="https://sourceforge.net/projects/drumstick/files/1.1.3/drumstick-1.1.3.tar.bz2"
+MD5SUM="80de9f184341c41f459fef8862d4d560"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Michales Michaloudes"
+EMAIL="korgie@gmail.com"
diff --git a/audio/drumstick/slack-desc b/audio/drumstick/slack-desc
new file mode 100644
index 0000000000..4ac4044820
--- /dev/null
+++ b/audio/drumstick/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+drumstick: drumstick (C++ MIDI libraries using Qt5 objects)
+drumstick:
+drumstick: It contains a C++ wrapper around the ALSA library sequencer
+drumstick: interface; ALSA sequencer provides software support for MIDI
+drumstick: technology on Linux. A complementary library provides classes for
+drumstick: SMF (Standard MIDI files: .MID/.KAR), and Cakewalk (.WRK) file
+drumstick: formats processing. A multiplatform realtime MIDI I/O library and
+drumstick: GUI Widgets are also provided.
+drumstick:
+drumstick:
+drumstick:
diff --git a/audio/exhale/exhale.SlackBuild b/audio/exhale/exhale.SlackBuild
index 7b69e069b8..fa74a977bf 100644
--- a/audio/exhale/exhale.SlackBuild
+++ b/audio/exhale/exhale.SlackBuild
@@ -2,7 +2,7 @@
 # ----------------------------------------------------------------------
 # Slackware build script for exhale
 #
-# Copyright (c) 2020 Andrew Strong, Blue Mountains, Australia.
+# Copyright (c) 2020 - 2021 Andrew Strong, Blue Mountains, Australia.
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -24,7 +24,7 @@
 # ----------------------------------------------------------------------
 
 PRGNAM=exhale
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,26 +41,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# SLKCFLAGS and LIBDIRSUFFIX are not used but remain in place for possible
-# future use as exhale's installation routine matures. 'BUILD32=1' will
-# build a 32bit exhale while 'BUILD32=0' will build a 64bit exhale:
+# The compiler flag '-std=c++11' is required for a succesful compile
+# under Slackware 14.2 and gcc 5.3.0. This flag is not required for
+# versions of Slackware > 14.2.
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
   LIBDIRSUFFIX=""
-  BUILDTARGET="BUILD32=1"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
   LIBDIRSUFFIX=""
-  BUILDTARGET="BUILD32=1"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -std=c++11"
   LIBDIRSUFFIX="64"
-  BUILDTARGET="BUILD32=0"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -std=c++11"
   LIBDIRSUFFIX=""
-  BUILDTARGET="BUILD32=0"
 fi
 
 set -e 
@@ -79,12 +75,17 @@ 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 {} \;
 
-# I will switch to the newer cmake build system and also install the newer
-# shared library when support for exhale is added to FFmpeg and / or any
-# other major Linux application. But for the moment:
-
-make $BUILDTARGET release
-install -D -s -m 0755 bin/exhale $PKG/usr/bin/exhale
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md include/{License.htm,Release.htm,styles.css} $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/exhale/exhale.info b/audio/exhale/exhale.info
index 139267bd84..1c4fee3cc5 100644
--- a/audio/exhale/exhale.info
+++ b/audio/exhale/exhale.info
@@ -1,8 +1,8 @@
 PRGNAM="exhale"
-VERSION="1.0.7"
+VERSION="1.1.1"
 HOMEPAGE="https://gitlab.com/ecodis/exhale"
-DOWNLOAD="https://gitlab.com/ecodis/exhale/-/archive/v1.0.7/exhale-v1.0.7.tar.gz"
-MD5SUM="92b9e2a8401f1b5c9cb0bac994a9167d"
+DOWNLOAD="https://gitlab.com/ecodis/exhale/-/archive/v1.1.1/exhale-v1.1.1.tar.gz"
+MD5SUM="432130dfbcd6b219268b235973dcca83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/fluidsynth/README b/audio/fluidsynth/README
index 763cff5472..a5daa0a947 100644
--- a/audio/fluidsynth/README
+++ b/audio/fluidsynth/README
@@ -5,15 +5,17 @@ FluidSynth is a software real-time synthesizer based on the Soundfont
 MIDI input device. It is the software analogue of a MIDI synthesizer.
 FluidSynth can also play MIDI files using a Soundfont.
 
-Optional dependencies: ladspa_sdk, lash, portaudio, jack, SDL2. These
-are autodetected at build time, but can be disabled via the environment.
+Optional dependencies: ladspa_sdk, lash, portaudio, jack, SDL2,
+libinstpatch. These are autodetected at build time, but can be
+disabled via the environment.
 
 Build options (environment variables):
 
-JACK=yes|no      - support JACK audio output, if present. Default: yes.
-LADSPA=yes|no    - support LADSPA plugins, if present. Default: yes.
-LASH=yes|no      - support LASH session management, if present. Default: yes.
-OSS=yes|no       - support old-style OSS audio output. Default: no.
-PORTAUDIO=yes|no - support PortAudio audio output, if present. Default: yes.
-PULSE=yes|no     - support PulseAudio audio output. Default: yes.
-SDL2=yes|no      - support SDL2 audio output, if present. Default: yes.
+IPATCH=yes|no    - libinstpatch (DLS and GIG soundfonts). Default: yes.
+JACK=yes|no      - JACK audio output, if present. Default: yes.
+LADSPA=yes|no    - LADSPA plugins, if present. Default: yes.
+LASH=yes|no      - LASH session management, if present. Default: yes.
+OSS=yes|no       - old-style OSS audio output. Default: no.
+PORTAUDIO=yes|no - PortAudio audio output, if present. Default: yes.
+PULSE=yes|no     - PulseAudio audio output. Default: yes.
+SDL2=yes|no      - SDL2 audio output, if present. Default: yes.
diff --git a/audio/fluidsynth/fluidsynth.SlackBuild b/audio/fluidsynth/fluidsynth.SlackBuild
index 0a761f2ca3..3fcb1f23ed 100644
--- a/audio/fluidsynth/fluidsynth.SlackBuild
+++ b/audio/fluidsynth/fluidsynth.SlackBuild
@@ -23,10 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201109 bkw: update for v2.1.5, add IPATCH
 # 20200404 bkw: take over maintenance, update for v2.1.1
 
 PRGNAM=fluidsynth
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,6 +87,7 @@ cd build
     -Denable-jack="${JACK:-yes}" \
     -Denable-sdl2="${SDL2:-yes}" \
     -Denable-portaudio="${PORTAUDIO:-yes}" \
+    -Denable-libinstpatch="${IPATCH:-yes}" \
     -Denable-systemd=no \
     ..
 
diff --git a/audio/fluidsynth/fluidsynth.info b/audio/fluidsynth/fluidsynth.info
index 1dcf2e78a2..eb6ca5c794 100644
--- a/audio/fluidsynth/fluidsynth.info
+++ b/audio/fluidsynth/fluidsynth.info
@@ -1,8 +1,8 @@
 PRGNAM="fluidsynth"
-VERSION="2.1.1"
+VERSION="2.1.5"
 HOMEPAGE="http://www.fluidsynth.org/"
-DOWNLOAD="https://github.com/FluidSynth/fluidsynth/archive/v2.1.1/fluidsynth-2.1.1.tar.gz"
-MD5SUM="165902909092c818a24517de6a4f2f83"
+DOWNLOAD="https://github.com/FluidSynth/fluidsynth/archive/v2.1.5/fluidsynth-2.1.5.tar.gz"
+MD5SUM="45b63c843a93bd689917fadc4af65c58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/gmusicbrowser/gmusicbrowser.SlackBuild b/audio/gmusicbrowser/gmusicbrowser.SlackBuild
index 71aae8b934..9c6bd41828 100644
--- a/audio/gmusicbrowser/gmusicbrowser.SlackBuild
+++ b/audio/gmusicbrowser/gmusicbrowser.SlackBuild
@@ -4,7 +4,7 @@
 #
 # (C) 2007 Michael Wagner <lapinours@web.de>
 # (C) 2014, 2015-2017  chinarulezzz <s.alex08@mail.ru>
-# Copyright 2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gmusicbrowser
-VERSION=${VERSION:-1.1.15}
+VERSION=${VERSION:-1.1.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/shimmer-layouts
-patch -p1 < $CWD/superfluous-my
 
 make DESTDIR=$PKG install
 
diff --git a/audio/gmusicbrowser/gmusicbrowser.info b/audio/gmusicbrowser/gmusicbrowser.info
index b5a2d370ce..d8bea5ee25 100644
--- a/audio/gmusicbrowser/gmusicbrowser.info
+++ b/audio/gmusicbrowser/gmusicbrowser.info
@@ -1,8 +1,8 @@
 PRGNAM="gmusicbrowser"
-VERSION="1.1.15"
+VERSION="1.1.16"
 HOMEPAGE="http://gmusicbrowser.org"
-DOWNLOAD="http://gmusicbrowser.org/download/gmusicbrowser-1.1.15.tar.gz"
-MD5SUM="4a16dcbe369d4b3cb78fb1a6967a60b3"
+DOWNLOAD="http://gmusicbrowser.org/download/gmusicbrowser-1.1.16.tar.gz"
+MD5SUM="a3c5dd46f93599b89b8273f8af013209"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-gtk2 perl-net-dbus Markdown"
diff --git a/audio/gmusicbrowser/superfluous-my b/audio/gmusicbrowser/superfluous-my
deleted file mode 100644
index 4b8e2de04e..0000000000
--- a/audio/gmusicbrowser/superfluous-my
+++ /dev/null
@@ -1,36 +0,0 @@
-From 853840eb9dad0b59ad2dac5d303f5929b2f09f21 Mon Sep 17 00:00:00 2001
-From: Octavio Ruiz <tacvbo@tacvbo.net>
-Date: Mon, 30 May 2016 19:18:44 +0200
-Subject: [PATCH] remove 2 superfluous "my", fix error with perl 5.24
-
----
- gmusicbrowser.pl      | 2 +-
- gmusicbrowser_list.pm | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
-index bbf16d7..18fab6a 100755
---- a/gmusicbrowser.pl
-+++ b/gmusicbrowser.pl
-@@ -9020,7 +9020,7 @@ sub Set
- 
- 	($cmd,my $pattern)= split /:/,$cmd,2;
- 	$pattern='' unless defined $pattern;
--	my ($basecmd,my $prop)= Songs::filter_properties($field,"$cmd:$pattern");
-+	my ($basecmd, $prop)= Songs::filter_properties($field,"$cmd:$pattern");
- 	if (!$prop)
- 	{	$cmd=  Songs::Field_property($field,'default_filter');
- 		($basecmd,$prop)= Songs::filter_properties($field,$cmd);
-diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
-index 76d2f86..26d21ae 100644
---- a/gmusicbrowser_list.pm
-+++ b/gmusicbrowser_list.pm
-@@ -8052,7 +8052,7 @@ sub Make
- 			unless ($notnow)
- 			{	#warn "$key ---found in ($code,@deps)\n";
- 				if (ref $code)
--				{	my ($func,my @keys)=@$code; #warn " -> ($func, @keys)\n";
-+				{	my ($func, @keys)=@$code; #warn " -> ($func, @keys)\n";
- 					my $out=join ',',map "'$_'", @keys;
- 					my $in= join ',',map "'$_'", @deps; $in=~s#\?##g;
- 					$out= @keys>1 ? "\@var{$out}" : "\$var{$out}";
diff --git a/audio/gogglesmm/gogglesmm.SlackBuild b/audio/gogglesmm/gogglesmm.SlackBuild
index f82da2285d..b97b2828d8 100644
--- a/audio/gogglesmm/gogglesmm.SlackBuild
+++ b/audio/gogglesmm/gogglesmm.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gogglesmm
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/gogglesmm/gogglesmm.info b/audio/gogglesmm/gogglesmm.info
index 8c4ea0aea0..a68fd7fe24 100644
--- a/audio/gogglesmm/gogglesmm.info
+++ b/audio/gogglesmm/gogglesmm.info
@@ -1,8 +1,8 @@
 PRGNAM="gogglesmm"
-VERSION="1.2.1"
+VERSION="1.2.2"
 HOMEPAGE="https://gogglesmm.github.io/"
-DOWNLOAD="https://github.com/gogglesmm/gogglesmm/archive/1.2.1/gogglesmm-1.2.1.tar.gz"
-MD5SUM="84d09b6672a91d3f027215d06c46885b"
+DOWNLOAD="https://github.com/gogglesmm/gogglesmm/archive/1.2.2/gogglesmm-1.2.2.tar.gz"
+MD5SUM="1eea0ce7f661206bcb55b012366a66d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/guitarix/README b/audio/guitarix/README
index 59d5c19003..803394b6bc 100644
--- a/audio/guitarix/README
+++ b/audio/guitarix/README
@@ -1,3 +1,5 @@
+guitarix (virtual guitar amplifier for jack)
+
 guitarix offers the range of sounds you would expect from a
 full-featured universal guitar-amp. You can get crisp clean-sounds,
 nice overdrive, fat distortion and a diversity of crazy sounds never
@@ -12,6 +14,10 @@ meterbridge is an optional runtime dependency.
 Starting with version 0.35.4, guitarix's 'Online presets' feature no
 longer requires webkitgtk. See README.online for more information.
 
+Note: This is the last version of guitarix that will compile on
+Slackware 14.2, due to 0.40 and up requiring gtk+3 >= 3.20 (we only
+have 3.18). Sorry, folks.
+
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
 may be considered a security/stability risk. Please read
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild
index b9ea8aafe3..67b35efb81 100644
--- a/audio/guitarix/guitarix.SlackBuild
+++ b/audio/guitarix/guitarix.SlackBuild
@@ -9,7 +9,8 @@
 # Note to self: git URL for guitarix is:
 # git://git.code.sf.net/p/guitarix/git/
 
-# 20200307 bkw: Updated for 3.39.1.
+# 20201105 bkw: Add no-upgrade note to README.
+# 20200307 bkw: Updated for 3.39.0.
 # 20191211 bkw: Updated for 0.38.1.
 # 20180828 bkw: Updated for 0.37.3.
 
diff --git a/audio/jack/jack.SlackBuild b/audio/jack/jack.SlackBuild
index 46b6a6fc58..30426e4c8e 100644
--- a/audio/jack/jack.SlackBuild
+++ b/audio/jack/jack.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for "jack2".
+# Slackware build script for jack (formerly jack2).
 
 # Copyright 2014 Yanes Checcacci Balod <email removed>, Brazil
 # Copyright 2014-2015 Marcel Saegebarth <email removed>
@@ -24,6 +24,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210304 bkw: update for v1.9.17.
+# 20201104 bkw: update for v1.9.16.
 # 20200118 bkw: renamed from 'jack2' to 'jack'. If you want to see
 #               the old log: "git log -- audio/jack2"
 # 20200112 bkw: get rid of --profile (thanks, dive!), BUILD=2.
@@ -35,7 +37,7 @@
 # - i486 => i586.
 
 PRGNAM=jack
-VERSION=${VERSION:-1.9.14}
+VERSION=${VERSION:-1.9.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,8 +87,17 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 # will already include it (it does, in 1.x). So make 2 act like 1:
 sed -i '/^Libs:/s,$, -lpthread,' jack.pc.in
 
+# 20201104 bkw: TODO: support --readline. Only used by jack-transport.
+# Trouble is, wscript checks only whether it can link with -lreadline.
+# Which it can't, because that also requires -ltermcap. But I don't
+# see a way to have it check multiple libs at once. I know one way to
+# force it (LDFLAGS=-ltermcap in the env), but then we end up linking
+# everything with it, which we do not want! Did I ever mention how
+# much I hate waf?
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-Wl,-s" \
 ./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -99,11 +110,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./waf build
 ./waf install --destdir=$PKG
 
-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
-
-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
+gzip $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/audio/jack/jack.info b/audio/jack/jack.info
index 70c6fc03f1..97693910a2 100644
--- a/audio/jack/jack.info
+++ b/audio/jack/jack.info
@@ -1,8 +1,8 @@
 PRGNAM="jack"
-VERSION="1.9.14"
+VERSION="1.9.17"
 HOMEPAGE="http://jackaudio.org/"
-DOWNLOAD="https://github.com/jackaudio/jack2/archive/v1.9.14/jack2-1.9.14.tar.gz"
-MD5SUM="b63b5cf65fc43ccf9585d274fe91069f"
+DOWNLOAD="https://github.com/jackaudio/jack2/archive/v1.9.17/jack2-1.9.17.tar.gz"
+MD5SUM="81b4beb271602ad20521c30640835a89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/audio/jkmeter/jkmeter.SlackBuild b/audio/jkmeter/jkmeter.SlackBuild
index 22196d945f..a671dc7a22 100644
--- a/audio/jkmeter/jkmeter.SlackBuild
+++ b/audio/jkmeter/jkmeter.SlackBuild
@@ -6,8 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201104 bkw: updated for 0.8.0.
+
 PRGNAM=jkmeter
-VERSION=${VERSION:-0.6.5}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/jkmeter/jkmeter.info b/audio/jkmeter/jkmeter.info
index 253f5ca211..549880cdca 100644
--- a/audio/jkmeter/jkmeter.info
+++ b/audio/jkmeter/jkmeter.info
@@ -1,8 +1,8 @@
 PRGNAM="jkmeter"
-VERSION="0.6.5"
+VERSION="0.8.0"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/jkmeter-0.6.5.tar.bz2"
-MD5SUM="24ef3f54227ead9408248340c543a470"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/jkmeter-0.8.0.tar.bz2"
+MD5SUM="e5e94c5c39c14acea9154a6780222ae7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack clxclient"
diff --git a/audio/mda-lv2/mda-lv2.SlackBuild b/audio/mda-lv2/mda-lv2.SlackBuild
index 8b31d4345d..ecc403d725 100644
--- a/audio/mda-lv2/mda-lv2.SlackBuild
+++ b/audio/mda-lv2/mda-lv2.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=mda-lv2
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,7 +59,7 @@ ln -s /usr/include/lv2.h lv2includes/lv2/core
 
 SLKCFLAGS="$SLKCFLAGS -I$(pwd)/lv2includes"
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./waf configure build install  \
   --prefix=/usr \
   --lv2dir=/usr/lib$LIBDIRSUFFIX/lv2 \
diff --git a/audio/mda-lv2/mda-lv2.info b/audio/mda-lv2/mda-lv2.info
index 4e8ede3493..e316be7505 100644
--- a/audio/mda-lv2/mda-lv2.info
+++ b/audio/mda-lv2/mda-lv2.info
@@ -1,8 +1,8 @@
 PRGNAM="mda-lv2"
-VERSION="1.2.4"
+VERSION="1.2.6"
 HOMEPAGE="http://drobilla.net/software/mda-lv2/"
-DOWNLOAD="http://download.drobilla.net/mda-lv2-1.2.4.tar.bz2"
-MD5SUM="57feb6b58b195f87f8b3e436f3b56076"
+DOWNLOAD="http://download.drobilla.net/mda-lv2-1.2.6.tar.bz2"
+MD5SUM="78712e8e1d2019c8bda6e164d1cd9115"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lv2"
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index d29e4a1da6..18a05fe4a1 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -68,14 +68,19 @@ cd $PRGNAM-release-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Fix library installation path
 sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1
 sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1
 
+# 20201104 bkw: Install udev rules to $PKG/etc, not the real /etc!
+# The dir has to already exist, too.
+sed -i "s,/etc/udev,$PKG&," src/SConscript
+mkdir -p $PKG/etc/udev/rules.d
+
 export SCONSFLAGS="-j $(nproc)"
 CFLAGS="$SLKCFLAGS" \
 QTDIR=/usr/lib$LIBDIRSUFFIX/qt5 \
diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info
index 4d9d06a3df..3f45810e8b 100644
--- a/audio/mixxx/mixxx.info
+++ b/audio/mixxx/mixxx.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/release-2.2.4/mixxx-release-2
 MD5SUM="25bbebca0187254db4d1c53dc0bdd77d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="chromaprint faad2 libmodplug libmp4v2 libshout lilv opencore-amr opusfile portaudio portmidi protobuf qt5 rubberband speex vamp-plugin-sdk"
+REQUIRES="chromaprint faad2 libmodplug libmp4v2 libshout lilv opencore-amr opusfile portaudio portmidi protobuf3 qt5 rubberband speex vamp-plugin-sdk"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/audio/mkcue/mkcue.info b/audio/mkcue/mkcue.info
index baeb1f5cda..f9705f1859 100644
--- a/audio/mkcue/mkcue.info
+++ b/audio/mkcue/mkcue.info
@@ -6,5 +6,5 @@ MD5SUM="de082e40baf042e23246d54d28cbcdcc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Didier Spaier"
+EMAIL="didier at slint dot fr"
diff --git a/audio/muse/muse.SlackBuild b/audio/muse/muse.SlackBuild
index 76f3dedc57..2c5465ff53 100644
--- a/audio/muse/muse.SlackBuild
+++ b/audio/muse/muse.SlackBuild
@@ -10,7 +10,7 @@
 # - add realtime capability support
 
 PRGNAM=muse
-VERSION=${VERSION:-3.1}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/qt512.patch
+# Change the INSTALL_NAME or every path in the package is versioned
+sed -e "s/muse-3.1/muse/" -i CMakeLists.txt
 
 mkdir -p build
 cd build
@@ -79,7 +80,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
-mv $PKG/usr/share/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/muse/muse.info b/audio/muse/muse.info
index b66465f167..f408519119 100644
--- a/audio/muse/muse.info
+++ b/audio/muse/muse.info
@@ -1,8 +1,8 @@
 PRGNAM="muse"
-VERSION="3.1"
+VERSION="3.1.1"
 HOMEPAGE="http://muse-sequencer.org/"
-DOWNLOAD="https://sourceforge.net/projects/lmuse/files/muse-3.1/muse-3.1.tar.gz"
-MD5SUM="45557bf2f0932daedd057678b3faf913"
+DOWNLOAD="https://downloads.sourceforge.net/lmuse/muse-3.1.1.tar.gz"
+MD5SUM="ac9da5c16b670fd6a3139e86845a3d4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack ladspa_sdk liblo qt5"
diff --git a/audio/muse/qt512.patch b/audio/muse/qt512.patch
deleted file mode 100644
index 4c5e1c2278..0000000000
--- a/audio/muse/qt512.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur muse-3.0.2/muse/mplugins/mitplugin.cpp muse-3.0.2.patched/muse/mplugins/mitplugin.cpp
---- muse-3.0.2/muse/mplugins/mitplugin.cpp	2017-12-04 22:01:18.000000000 +0100
-+++ muse-3.0.2.patched/muse/mplugins/mitplugin.cpp	2020-02-26 23:27:20.013277911 +0100
-@@ -21,6 +21,7 @@
- //
- //=========================================================
- 
-+#include <QtWidgets>
- #include "mitplugin.h"
- #include "app.h"
- #include "event.h"
-diff -Naur muse-3.0.2/muse/widgets/genset.cpp muse-3.0.2.patched/muse/widgets/genset.cpp
---- muse-3.0.2/muse/widgets/genset.cpp	2018-01-22 17:43:28.000000000 +0100
-+++ muse-3.0.2.patched/muse/widgets/genset.cpp	2020-02-26 21:47:19.446707723 +0100
-@@ -24,6 +24,7 @@
- 
- #include <stdio.h>
- 
-+#include <QButtonGroup>
- #include <QFileDialog>
- #include <QFileInfo>
- #include <QRect>
diff --git a/audio/nas/README b/audio/nas/README
index 4bf7d8cbf0..8fe2275e3d 100644
--- a/audio/nas/README
+++ b/audio/nas/README
@@ -2,7 +2,7 @@ The Network Audio System is a network transparent, client/server
 audio transport system. It can be described as the audio equivalent
 of an X server.
 
-Note that some applications will likely need recompiling for nas 
+Note that some applications will likely need recompiling for nas
 support - mplayer for one.
 
 See the /etc/nas/nasd.conf.eg for an example config.
diff --git a/audio/nas/nas.SlackBuild b/audio/nas/nas.SlackBuild
index 1c99a3f482..f4f0e1ef4a 100644
--- a/audio/nas/nas.SlackBuild
+++ b/audio/nas/nas.SlackBuild
@@ -82,7 +82,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 cd ..
 
-make CFLAGS="$SLKCFLAGS" World
+# Multiple jobs fails
+make -j1 World
 make install.man install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/audio/ncmpcpp/ncmpcpp.SlackBuild b/audio/ncmpcpp/ncmpcpp.SlackBuild
index 3bb21baf73..f3663f68eb 100644
--- a/audio/ncmpcpp/ncmpcpp.SlackBuild
+++ b/audio/ncmpcpp/ncmpcpp.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for ncmpcpp
 
 # Copyright 2006  Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2015-2017  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2015-2017  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/audio/ncmpcpp/ncmpcpp.info b/audio/ncmpcpp/ncmpcpp.info
index 4fe60f6bb2..cb47162253 100644
--- a/audio/ncmpcpp/ncmpcpp.info
+++ b/audio/ncmpcpp/ncmpcpp.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmpdclient"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/audio/padthv1/padthv1.SlackBuild b/audio/padthv1/padthv1.SlackBuild
index eaac278734..662a0f28b5 100644
--- a/audio/padthv1/padthv1.SlackBuild
+++ b/audio/padthv1/padthv1.SlackBuild
@@ -6,10 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201106 bkw: update for 0.9.18
 # 20200114 bkw: update for 0.9.12
 
 PRGNAM=padthv1
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.9.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,6 +53,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+export PATH=/usr/lib$LIBDIRSUFFIX/qt5/bin:$PATH
+
 LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -72,8 +75,8 @@ make install DESTDIR=$PKG
 [ -d $PKG/usr/share/metainfo ] && \
   mv $PKG/usr/share/metainfo $PKG/usr/share/appdata
 
-mkdir -p $PKG/usr/man/fr/man1 $PKG/usr/man/fr.UTF-8/man1
-mv $PKG/usr/man/man1/$PRGNAM.fr.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/man/fr.UTF-8/man1
+mv $PKG/usr/man/fr/man1/$PRGNAM.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
 zcat $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz | \
   iconv -f UTF-8 -t ISO-8859-1 | \
   gzip -9c \
diff --git a/audio/padthv1/padthv1.info b/audio/padthv1/padthv1.info
index 78f137f6a3..fe12c891e9 100644
--- a/audio/padthv1/padthv1.info
+++ b/audio/padthv1/padthv1.info
@@ -1,8 +1,8 @@
 PRGNAM="padthv1"
-VERSION="0.9.12"
+VERSION="0.9.18"
 HOMEPAGE="https://padthv1.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/padthv1/padthv1/0.9.12/padthv1-0.9.12.tar.gz"
-MD5SUM="9b13bf5b9663014bc8f78295d40afb48"
+DOWNLOAD="https://downloads.sourceforge.net/project/padthv1/padthv1/0.9.18/padthv1-0.9.18.tar.gz"
+MD5SUM="da9b6352e37f23b1fa906a4c6c315934"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack qt5"
diff --git a/audio/podget/README b/audio/podget/README
index a97ac2dfd7..223d03e9c1 100644
--- a/audio/podget/README
+++ b/audio/podget/README
@@ -1,10 +1,16 @@
+podget (simple podcast aggregator)
+
 Podget is a simple podcast aggregator optimized for running as
-a scheduled background job (i.e. cron). It features support for
-downloading podcasts from RSS & XML feeds, for sorting the files into
-folders & categories, for importing URLs from iTunes PCAST files & OPML
-lists automatic M3U & ASX playlist creation, and automatic cleanup of
-old files.  It also features automatic UTF-16 conversion for podcasts
-hosted on MS Windows servers.
+a scheduled background job (i.e. cron). It features support for:
+
+- Downloading podcasts from RSS and ATOM XML feeds.
+- Sorting the files into folders and categories.
+- Importing URLs from iTunes PCAST files and OPML lists.
+- Automatic M3U & ASX playlist creation.
+- Cleanup of old files.
+- Automatic UTF-16 conversion for feeds hosted on MS Windows servers.
 
 Run podget once to install the configuration files to $HOME/.podget,
 and then customize them there.
+
+See /usr/doc/podget-*/scripts for additional helper scripts.
diff --git a/audio/podget/podget.SlackBuild b/audio/podget/podget.SlackBuild
index 2e8feac7f0..9a5ea443ed 100644
--- a/audio/podget/podget.SlackBuild
+++ b/audio/podget/podget.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for podget
 
-# Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright (c) 2008-2010, Antonio Hernández Blas <email removed>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -21,11 +21,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210223 bkw: update for v0.8.8
+# 20201103 bkw:
+# - update for v0.8.7
+# - fix CRLF removal
+# - redo README and slack-desc
 # 20200619 bkw: BUILD=2, apparently nobody (including me) ever noticed
 # that v0.8.6 didn't actually work on Slackware 14.2.
-
 # 20191130 bkw: update for v0.8.6
-
 # 20170712 bkw:
 # - Take over as maintainer
 # - Update for v0.8.5
@@ -33,8 +36,8 @@
 # - Minor cleanups
 
 PRGNAM=podget
-VERSION=${VERSION:-0.8.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -57,29 +60,35 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # 20170712 bkw: get rid of DOS/Win line endings.
+# 20201103 bkw: turns out there's an embedded \r in podget that's
+# supposed to be there, so the regex becomes \r$ instead of \r.
 find . -type f | \
   xargs file | \
   grep 'ASCII.*LF' | \
   cut -d: -f1 | \
-  xargs sed -i 's,\r,,' \
+  xargs sed -i 's,\r$,,' \
 || true
 
-make -j1 prefix=/usr DESTDIR=$PKG install
-
 # 20200619 bkw: 14.2's creaky old bash 4.3 doesn't support
 # inherit_errexit, which is a feature of bash 4.4 and up. The sed
 # command below allows the script to run without it, which will change
 # some of the error handling a bit, but won't actually break anything
 # when there *aren't* errors. Previous versions of podget got along just
 # fine without inherit_errexit...
-sed -i '/shopt.*-s.*inherit_errexit *$/s,$, &>/dev/null || true,' \
-       $PKG/usr/bin/$PRGNAM
+# 20201103 bkw: upstream added checking code, this had to change some.
+sed -i '/shopt *inherit_errexit/,/shopt *-s *inherit_errexit/s,^,## ,' \
+       $PRGNAM
+
+# 20201103 bkw: change hardcoded paths
+sed -i \
+  -e "s,share/man,man,g" \
+  -e "s,share/doc/$PRGNAM,doc/$PRGNAM-$VERSION," \
+  Makefile
 
-mv $PKG/usr/share/man $PKG/usr/man
-rm -rf $PKG/usr/share
+make -j1 prefix=/usr DESTDIR=$PKG install
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts
-cp -a COPYING Changelog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cp -r SCRIPTS/* $PKG/usr/doc/$PRGNAM-$VERSION/scripts
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/podget/podget.info b/audio/podget/podget.info
index 2365d047ff..21a2119f0d 100644
--- a/audio/podget/podget.info
+++ b/audio/podget/podget.info
@@ -1,8 +1,8 @@
 PRGNAM="podget"
-VERSION="0.8.6"
+VERSION="0.8.8"
 HOMEPAGE="http://podget.sourceforge.net/index.php"
-DOWNLOAD="http://downloads.sourceforge.net/podget/podget-0.8.6.tar.gz"
-MD5SUM="233d642f7fa3e0127ada4742166af159"
+DOWNLOAD="http://downloads.sourceforge.net/podget/podget-0.8.8.tar.gz"
+MD5SUM="d16fb8d111d60420cd435e5f5d289304"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/podget/slack-desc b/audio/podget/slack-desc
index 16ee735995..cae6760e6f 100644
--- a/audio/podget/slack-desc
+++ b/audio/podget/slack-desc
@@ -9,11 +9,11 @@
 podget: podget (simple podcast aggregator)
 podget:
 podget: Podget is a simple podcast aggregator optimized for running as a
-podget: scheduled background job (i.e. cron). It features support for
-podget: downloading podcasts from RSS & XML feeds, for sorting the files into
-podget: folders & categories, for importing URLs from iTunes PCAST files &
-podget: OPML lists, M3U & ASX playlist creation, and cleanup of old files.
-podget:
+podget: scheduled background job (i.e. cron). It features support for:
+podget: - Downloading podcasts from RSS and ATOM XML feeds.
+podget: - Sorting the files into folders and categories.
+podget: - Importing URLs from iTunes PCAST files and OPML lists.
+podget: - Automatic M3U & ASX playlist creation.
+podget: - Cleanup of old files.
+podget: - Automatic UTF-16 conversion for feeds hosted on MS Windows servers.
 podget: See /usr/doc/podget-*/scripts for additional helper scripts.
-podget:
-podget: Homepage: http://podget.sourceforge.net/index.php
diff --git a/audio/puddletag/README b/audio/puddletag/README
index a31e6f366e..179a81b39c 100644
--- a/audio/puddletag/README
+++ b/audio/puddletag/README
@@ -1,7 +1,11 @@
-Puddletag is a audio tag editor for GNU/Linux similar to the
-Windows program Mp3tag. Unlike most taggers for GNU/Linux, it uses a
-spreadsheet- like layout so that all the tags you want to edit by hand
+Puddletag is a audio tag editor for GNU/Linux similar to the Windows
+program Mp3tag. Unlike most taggers for GNU/Linux, it uses a
+spreadsheet-like layout so that all the tags you want to edit by hand
 are visible and easily editable.
 
-Optional / Recommended packages are: gst0-ffmpeg, gst0-plugins-bad,
+Optional, but recommended packages are: gst0-ffmpeg, gst0-plugins-bad,
 gst0-plugins-ugly, gst0-python, quodlibet, and chromaprint.
+
+NOTE: configobj and mutagen need to be built with python3 support. They
+will automatically provide python3 modules if the SlackBuild is ran
+with python3 installed.
diff --git a/audio/puddletag/puddletag.SlackBuild b/audio/puddletag/puddletag.SlackBuild
index f8559269a4..2788ed0f41 100644
--- a/audio/puddletag/puddletag.SlackBuild
+++ b/audio/puddletag/puddletag.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2012-2014 Bill Kirkpatrick, Cedar Lane, TX USA <bkirkp@gmail.com>
 # Copyright 2016-2017 Philip van der Hoeven, Almere, The Netherlands
+# Copyright 2020      Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=puddletag
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-2.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +71,8 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+cd source
+python3 setup.py install --root=$PKG
 
 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
@@ -81,7 +83,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 HACKING PKG-INFO README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE MANIFEST NEWS ../README.md THANKS TODO changelog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/puddletag/puddletag.info b/audio/puddletag/puddletag.info
index aa0e781061..07bffa989a 100644
--- a/audio/puddletag/puddletag.info
+++ b/audio/puddletag/puddletag.info
@@ -1,10 +1,10 @@
 PRGNAM="puddletag"
-VERSION="1.2.0"
+VERSION="2.0.1"
 HOMEPAGE="http://docs.puddletag.net"
-DOWNLOAD="https://github.com/keithgg/puddletag/releases/download/v1.2.0/puddletag-1.2.0.tar.gz"
-MD5SUM="9be5c5fd6d1b1c4807069bd654614064"
+DOWNLOAD="https://github.com/puddletag/puddletag/archive/2.0.1/puddletag-2.0.1.tar.gz"
+MD5SUM="e9fda1de4edbb949f5072334a80ed3cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="configobj mutagen pyparsing"
-MAINTAINER="Philip van der Hoeven"
-EMAIL="philip@vd-hoeven.nl"
+REQUIRES="python3 PyQt5 configobj mutagen python3-pyparsing"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/audio/pulseaudio-ctl/pulseaudio-ctl.SlackBuild b/audio/pulseaudio-ctl/pulseaudio-ctl.SlackBuild
index 67073bd786..743ae41496 100644
--- a/audio/pulseaudio-ctl/pulseaudio-ctl.SlackBuild
+++ b/audio/pulseaudio-ctl/pulseaudio-ctl.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for pulseaudio-ctl.
 #
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pulseaudio-ctl
-VERSION=${VERSION:-1.68}
+VERSION=${VERSION:-1.69}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/pulseaudio-ctl/pulseaudio-ctl.info b/audio/pulseaudio-ctl/pulseaudio-ctl.info
index ceb9054977..9329a8cfba 100644
--- a/audio/pulseaudio-ctl/pulseaudio-ctl.info
+++ b/audio/pulseaudio-ctl/pulseaudio-ctl.info
@@ -1,8 +1,8 @@
 PRGNAM="pulseaudio-ctl"
-VERSION="1.68"
+VERSION="1.69"
 HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-DOWNLOAD="https://github.com/graysky2/pulseaudio-ctl/archive/v1.68/pulseaudio-ctl-1.68.tar.gz"
-MD5SUM="bcc1f236ce41adcd42e866acf49d53ff"
+DOWNLOAD="https://github.com/graysky2/pulseaudio-ctl/archive/v1.69/pulseaudio-ctl-1.69.tar.gz"
+MD5SUM="2c1f99e7a616e78e6a2d4224314dc377"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/qjackctl/qjackctl.SlackBuild b/audio/qjackctl/qjackctl.SlackBuild
index 7ffd2edb27..1d7ff53113 100644
--- a/audio/qjackctl/qjackctl.SlackBuild
+++ b/audio/qjackctl/qjackctl.SlackBuild
@@ -25,13 +25,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210306 bkw: update for v0.9.1.
+# 20201218 bkw: update for v0.9.0.
+
 # 20200204 bkw:
 # - take over maintenance
 # - update for v0.6.1
 # - fix French man page
 
 PRGNAM=qjackctl
-VERSION=${VERSION:-0.6.1}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +77,10 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# 20201218 bkw: it's tripping over qt4's qmake, so force the issue:
+sed -i 's|\<qmake,|qmake-qt5,|' configure.ac
+autoreconf -if
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/audio/qjackctl/qjackctl.info b/audio/qjackctl/qjackctl.info
index ca3857d324..9ad9f359ef 100644
--- a/audio/qjackctl/qjackctl.info
+++ b/audio/qjackctl/qjackctl.info
@@ -1,8 +1,8 @@
 PRGNAM="qjackctl"
-VERSION="0.6.1"
+VERSION="0.9.1"
 HOMEPAGE="http://qjackctl.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/qjackctl/files/qjackctl/0.6.1/qjackctl-0.6.1.tar.gz"
-MD5SUM="738984a015119e5853beccca1cbf5124"
+DOWNLOAD="https://downloads.sourceforge.net/project/qjackctl/qjackctl/0.9.1/qjackctl-0.9.1.tar.gz"
+MD5SUM="7fe793055a6cb3e7770c4054417036a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 jack"
diff --git a/audio/qm-vamp-plugins/README b/audio/qm-vamp-plugins/README
index 883c5a5f54..6fc385a1dc 100644
--- a/audio/qm-vamp-plugins/README
+++ b/audio/qm-vamp-plugins/README
@@ -16,8 +16,3 @@ SSE=yes SSE2=yes # Force enable both SSE and SSE2
 SSE=yes SSE2=no  # Force enable SSE, force disable SSE2
 
 Leaving SSE blank or setting it to anything else means to autodetect.
-
-The source code includes prebuilt atlas, lapack, and blas libraries. So
-far, I have not succeeded in building qm-vamp-plugins with the atlas,
-lapack, and blas from SlackBuilds.org. If you distrust prebuilt
-binaries/libraries, you should not install this package.
diff --git a/audio/qm-vamp-plugins/qm-vamp-plugins.SlackBuild b/audio/qm-vamp-plugins/qm-vamp-plugins.SlackBuild
index 20cdd06a84..fceddcfec7 100644
--- a/audio/qm-vamp-plugins/qm-vamp-plugins.SlackBuild
+++ b/audio/qm-vamp-plugins/qm-vamp-plugins.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw: update for v1.8.0. qm-dsp source is included now, get
+# rid of separate download and build for it. Also, there's no longer
+# a prebuilt atlas, and the build uses a bundled blas and lapack
+# now. It also uses a bundled vamp-plugin-sdk, so I removed that from
+# REQUIRES.
+
 # 20200123 bkw: found out upstream includes a prebuilt libatlas.a, which
 # the build has been using all along. Remove atlas from REQUIRES since
 # it was never used anyway. Tried to build this with atlas, lapack,
@@ -18,7 +24,7 @@
 # Bump BUILD to 3, make it build against vamp-plugin-sdk 2.5 (whoops)
 
 PRGNAM=qm-vamp-plugins
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,33 +73,16 @@ fix_sse_flags() {
   fi
 }
 
-# Private static lib that's distributed as a separate tarball. Main
-# program links to it, but it doesn't need to be installed system-wide
-# as nothing else uses it. It's assumed that qm-dsp's version number
-# will always match the main one.
-LIBNAM=qm-dsp
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION $LIBNAM-$VERSION $LIBNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/$LIBNAM-$VERSION.tar.gz
-
-cd $LIBNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Why doesn't the include path include the project's own include/ dir?
-# (without this, it can't find its own headers)
-sed -i 's,-I\.,-I. -Iinclude,' build/general/Makefile.inc
-
-# Dirty hack: various qm-dsp headers use size_t without including anything
-# that defines it. Rather than laboriously find & patch them all, we'll
-# use a gcc-specific hack:
-sed -i '/^CFLAGS/s/$/ -include stddef.h/' build/linux/Makefile.linux64
-
 # SSE/SSE2 support:
 case "$SSE" in
   "yes") USE_SSE=yes ;;
@@ -123,39 +112,29 @@ fi
 
 echo "USE_SSE=$USE_SSE and USE_SSE2=$USE_SSE2"
 
-# Note about the Makefiles: Makefile.linux64 works fine on 32-bit. The difference
-# between the .linux and .linux64 Makefiles is that the .linux64 one uses atlas
-# instead of plain unoptimized lapack and blas. There's nothing magically 64-bit
-# about atlas...
-fix_sse_flags build/linux/Makefile.linux64
-make -f build/linux/Makefile.linux64
-cd -
-
-# main makefile looks for ../qm-dsp (no version suffix), so:
-ln -s $LIBNAM-$VERSION $LIBNAM
-
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+# Makefile.linux64 works fine on 32-bit.
+MAKEFILE=build/linux/Makefile.linux64
 
 # 20150403 bkw: crap. getting rid of vamp-plugin-sdk static libs
 # breaks this. Fix by getting rid of -Wl,-Bstatic and -Wl,-Bdynamic
 # options (so it doesn't insist on a static libvamp-sdk).
-sed -i 's/-Wl,-B[^ ]* //g' build/linux/Makefile.linux64
+sed -i 's/-Wl,-B[^ ]* //g' $MAKEFILE
 
-# 20191202 bkw: this used to be there, have to re-add it:
-sed -i "/^LDFLAGS/s,\$, -L$TMP/qm-dsp," build/linux/Makefile.linux64
+# Apply correct SSE-related flags. also we need c++11 starting with 1.8.0.
+fix_sse_flags $MAKEFILE
+sed -i '/^CXXFLAGS/s,=,= -std=c++11,' $MAKEFILE
 
-fix_sse_flags build/linux/Makefile.linux64
-make -f build/linux/Makefile.linux64
+# It's either 2 separate makes, or use -j1.
+make -f $MAKEFILE lib/qm-dsp
+make -f $MAKEFILE
 
 # no 'make install' target, just cp it.
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/vamp
+strip $PRGNAM.so
 cp $PRGNAM.so $PRGNAM.cat $PRGNAM.n3 $PKG/usr/lib$LIBDIRSUFFIX/vamp
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/qm-vamp-plugins/qm-vamp-plugins.info b/audio/qm-vamp-plugins/qm-vamp-plugins.info
index d372b4bbb1..bdf5d67afc 100644
--- a/audio/qm-vamp-plugins/qm-vamp-plugins.info
+++ b/audio/qm-vamp-plugins/qm-vamp-plugins.info
@@ -1,12 +1,10 @@
 PRGNAM="qm-vamp-plugins"
-VERSION="1.7.1"
+VERSION="1.8.0"
 HOMEPAGE="http://isophonics.net/QMVampPlugins"
-DOWNLOAD="https://code.soundsoftware.ac.uk/attachments/download/1604/qm-vamp-plugins-1.7.1.tar.gz \
-          https://code.soundsoftware.ac.uk/attachments/download/1582/qm-dsp-1.7.1.tar.gz"
-MD5SUM="6274bc8bff6f2363404a9f945613bf51 \
-        9c7a7b15926000e15a9e3c7c06492e58"
+DOWNLOAD="https://code.soundsoftware.ac.uk/attachments/download/2624/qm-vamp-plugins-1.8.0.tar.gz"
+MD5SUM="0bcb502c5b0199cd6359df54ae7b61d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vamp-plugin-sdk"
+REQUIRES=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/qmmp/qmmp.SlackBuild b/audio/qmmp/qmmp.SlackBuild
index 884668503d..bf85bdab51 100644
--- a/audio/qmmp/qmmp.SlackBuild
+++ b/audio/qmmp/qmmp.SlackBuild
@@ -21,7 +21,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qmmp
-VERSION=${VERSION:-0.12.7}
+VERSION=${VERSION:-0.12.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qmmp/qmmp.info b/audio/qmmp/qmmp.info
index 4c6d09252d..64edf7cc7c 100644
--- a/audio/qmmp/qmmp.info
+++ b/audio/qmmp/qmmp.info
@@ -1,8 +1,8 @@
 PRGNAM="qmmp"
-VERSION="0.12.7"
+VERSION="0.12.10"
 HOMEPAGE="http://qmmp.ylsoftware.com/"
-DOWNLOAD="http://qmmp.ylsoftware.com/files/qmmp-0.12.7.tar.bz2"
-MD5SUM="0a5ab2ba33c70e1663cea506a1dedaba"
+DOWNLOAD="http://qmmp.ylsoftware.com/files/qmmp-0.12.10.tar.bz2"
+MD5SUM="7008aa45862c4835bceb426a689b294e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/rubberband/rubberband.SlackBuild b/audio/rubberband/rubberband.SlackBuild
index c4bcaa1658..e92b591f61 100644
--- a/audio/rubberband/rubberband.SlackBuild
+++ b/audio/rubberband/rubberband.SlackBuild
@@ -8,6 +8,7 @@
 # Modified version licensed under the WTFPL. See
 # http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw: update for v1.9.0
 # 20180702 bkw:
 # - update for v1.8.2
 # - add optional Java support.
@@ -21,7 +22,7 @@
 # - add man page
 
 PRGNAM=rubberband
-VERSION=${VERSION:-1.8.2}
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,11 +62,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Fixup libdir on x86_64
 sed -i "s,\<lib\>,lib$LIBDIRSUFFIX,g" Makefile.in *.pc.in
@@ -107,7 +105,7 @@ mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG COPYING README.txt $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
diff --git a/audio/rubberband/rubberband.info b/audio/rubberband/rubberband.info
index e171e2c668..0065f91d96 100644
--- a/audio/rubberband/rubberband.info
+++ b/audio/rubberband/rubberband.info
@@ -1,8 +1,8 @@
 PRGNAM="rubberband"
-VERSION="1.8.2"
+VERSION="1.9.0"
 HOMEPAGE="http://www.breakfastquay.com/rubberband"
-DOWNLOAD="https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2"
-MD5SUM="db0ecb4f1a647bdaf7e43ef2ca2f7883"
+DOWNLOAD="https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2"
+MD5SUM="a203a53ef14f23bd4344f4b32514ed62"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ladspa_sdk vamp-plugin-sdk"
diff --git a/audio/samplv1/samplv1.SlackBuild b/audio/samplv1/samplv1.SlackBuild
index e7738e71b3..a1074630b2 100644
--- a/audio/samplv1/samplv1.SlackBuild
+++ b/audio/samplv1/samplv1.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201106 bkw: update for 0.9.18
 # 20200114 bkw: update for 0.9.12
 # 20191210 bkw: update for 0.9.11, document optional liblo dep, have slack-desc
 #               tell user whether or not optional deps are included.
@@ -19,7 +20,7 @@
 # 20170614 bkw: update for 0.8.2, drop qt5 dep, build with qt4
 
 PRGNAM=samplv1
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.9.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +63,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+export PATH=/usr/lib$LIBDIRSUFFIX/qt5/bin:$PATH
+
 LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,8 +87,8 @@ make install DESTDIR=$PKG
 [ -d $PKG/usr/share/metainfo ] && \
   mv $PKG/usr/share/metainfo $PKG/usr/share/appdata
 
-mkdir -p $PKG/usr/man/fr/man1 $PKG/usr/man/fr.UTF-8/man1
-mv $PKG/usr/man/man1/$PRGNAM.fr.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/man/fr.UTF-8/man1
+mv $PKG/usr/man/fr/man1/$PRGNAM.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
 zcat $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz | \
   iconv -f UTF-8 -t ISO-8859-1 | \
   gzip -9c \
diff --git a/audio/samplv1/samplv1.info b/audio/samplv1/samplv1.info
index 3fce23071f..21f7098dba 100644
--- a/audio/samplv1/samplv1.info
+++ b/audio/samplv1/samplv1.info
@@ -1,8 +1,8 @@
 PRGNAM="samplv1"
-VERSION="0.9.12"
+VERSION="0.9.18"
 HOMEPAGE="https://samplv1.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/samplv1/samplv1/0.9.12/samplv1-0.9.12.tar.gz"
-MD5SUM="0bedfeabbff160e795dcbc2f6ebdf92e"
+DOWNLOAD="https://downloads.sourceforge.net/project/samplv1/samplv1/0.9.18/samplv1-0.9.18.tar.gz"
+MD5SUM="4499df881c91f9442fc803fe9954a465"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack qt5"
diff --git a/audio/sonic-visualiser/sonic-visualiser.SlackBuild b/audio/sonic-visualiser/sonic-visualiser.SlackBuild
index 806b046073..41100d34b5 100644
--- a/audio/sonic-visualiser/sonic-visualiser.SlackBuild
+++ b/audio/sonic-visualiser/sonic-visualiser.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201104 bkw: update for 4.2.
 # 20191212 bkw:
 # - Update for 4.0.1.
 # - New deps: libfishsound capnproto opusfile.
@@ -60,7 +61,7 @@
 # - add realtime capabilities
 
 PRGNAM=sonic-visualiser
-VERSION=${VERSION:-4.0.1}
+VERSION=${VERSION:-4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/sonic-visualiser/sonic-visualiser.info b/audio/sonic-visualiser/sonic-visualiser.info
index 0f0b6bbee8..2328b16c2d 100644
--- a/audio/sonic-visualiser/sonic-visualiser.info
+++ b/audio/sonic-visualiser/sonic-visualiser.info
@@ -1,8 +1,8 @@
 PRGNAM="sonic-visualiser"
-VERSION="4.0.1"
+VERSION="4.2"
 HOMEPAGE="https://sonicvisualiser.org/"
-DOWNLOAD="https://code.soundsoftware.ac.uk/attachments/download/2607/sonic-visualiser-4.0.1.tar.gz"
-MD5SUM="722d4dbe5b2fdbc3b58d11f9c4e426ed"
+DOWNLOAD="https://code.soundsoftware.ac.uk/attachments/download/2755/sonic-visualiser-4.2.tar.gz"
+MD5SUM="8ea411b2014e694f8dfc1a9684f4f538"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 liblrdf rubberband vamp-plugin-sdk sord capnproto opusfile libfishsound"
diff --git a/audio/sooperlooper/README b/audio/sooperlooper/README
index cd9a878aa9..2f6ba84228 100644
--- a/audio/sooperlooper/README
+++ b/audio/sooperlooper/README
@@ -1,12 +1,10 @@
+sooperlooper (live audio looping sampler)
+
 SooperLooper is a live looping sampler capable of immediate loop
 recording, overdubbing, multiplying, reversing and more.  It allows 
 for multiple simultaneous multi-channel loops limited only by your 
 computer's available memory.
 
-If you have wxGTK3 installed and would prefer to build sooperlooper
-with it (instead of the default wxPython 2.8), set WXVER=3.0 in the
-script's environment.
-
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
 may be considered a security/stability risk. Please read
diff --git a/audio/sooperlooper/patches/04-build_with_wx_30.patch b/audio/sooperlooper/patches/04-build_with_wx_30.patch
deleted file mode 100644
index fee40e8f98..0000000000
--- a/audio/sooperlooper/patches/04-build_with_wx_30.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes@seznam.cz>, Olly Betts <olly@survex.com>
-Description: build against wx 3.0.
-Forwarded: yes
-
-Index: sooperlooper/src/gui/main_panel.cpp
-===================================================================
---- sooperlooper.orig/src/gui/main_panel.cpp
-+++ sooperlooper/src/gui/main_panel.cpp
-@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count)
- 		while (count < (int)_looper_panels.size()) {
- 			looperpan = _looper_panels.back();
- 			_looper_panels.pop_back();
--			_main_sizer->Remove(looperpan);
-+			_main_sizer->Detach(looperpan);
- 			looperpan->Destroy();
- 		}
- 	}
-@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas
- 		}
- 
- 
--		wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
-+		wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
- 		
- 		if ( !filename.empty() )
- 		{
-@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas
- 			index = 0;
- 		}
- 
--		wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
-+		wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
- 		
- 		if ( !filename.empty() )
- 		{
-@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index
- 
- void MainPanel::do_load_session ()
- {
--	wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
-+	wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
- 	
- 	if ( !filename.empty() )
- 	{
-@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session ()
- 
- void MainPanel::do_save_session (bool write_audio)
- {
--	wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
-+	wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
- 	
- 	if ( !filename.empty() )
- 	{
-Index: sooperlooper/src/gui/pix_button.cpp
-===================================================================
---- sooperlooper.orig/src/gui/pix_button.cpp
-+++ sooperlooper/src/gui/pix_button.cpp
-@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent &
- 		pt.x += bounds.x;
- 		pt.y += bounds.y;
- 
--		if (bounds.Inside(pt)) {
-+		if (bounds.Contains(pt)) {
- 			clicked (get_mouse_button(ev)); // emit
- 
- 			if (ev.MiddleUp() && ev.ControlDown()) {
-Index: sooperlooper/src/gui/looper_panel.cpp
-===================================================================
---- sooperlooper.orig/src/gui/looper_panel.cpp
-+++ sooperlooper/src/gui/looper_panel.cpp
-@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button,
- 	if (cmd == wxT("save"))
- 	{
- 		wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"),
--											      wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
-+											      wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
- 		
- 		if ( !filename.empty() )
- 		{
-@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button,
- 	}
- 	else if (cmd == wxT("load"))
- 	{
--		wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR);
-+		wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR);
- 		
- 		if ( !filename.empty() )
- 		{
-Index: sooperlooper/src/gui/keyboard_target.cpp
-===================================================================
---- sooperlooper.orig/src/gui/keyboard_target.cpp
-+++ sooperlooper/src/gui/keyboard_target.cpp
-@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const
-                         keycode = WXK_RETURN;
-                     }
-                     else if ( keyname == wxT("PGUP") ) {
--                        keycode = WXK_PRIOR;
-+                        keycode = WXK_PAGEUP;
-                     }
-                     else if ( keyname == wxT("PGDN") ) {
--                        keycode = WXK_NEXT;
-+                        keycode = WXK_PAGEDOWN;
-                     }
-                     else if ( keyname == wxT("LEFT") ) {
-                         keycode = WXK_LEFT;
-@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco
- 	case WXK_RETURN:
- 		text += wxT("return");
- 		break;
--	case WXK_PRIOR:
-+	case WXK_PAGEUP:
- 		text += wxT("pageup");
- 		break;
--	case WXK_NEXT:
-+	case WXK_PAGEDOWN:
- 		text += wxT("pagedown");
- 		break;
- 	case WXK_LEFT:
-Index: sooperlooper/src/gui/check_box.cpp
-===================================================================
---- sooperlooper.orig/src/gui/check_box.cpp
-+++ sooperlooper/src/gui/check_box.cpp
-@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e
- 	}
- 	else if (ev.LeftUp())
- 	{
--		if (bounds.Inside(ev.GetPosition())) {
-+		if (bounds.Contains(ev.GetPosition())) {
- 			// toggle value
- 			_value = !_value;
- 		
-Index: sooperlooper/src/gui/midi_bind_panel.cpp
-===================================================================
---- sooperlooper.orig/src/gui/midi_bind_panel.cpp
-+++ sooperlooper/src/gui/midi_bind_panel.cpp
-@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand
- 	}
- 	else if (ev.GetId() == ID_LoadButton)
- 	{
--		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
-+		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
- 		if ( !filename.empty() )
- 		{
- 			_parent->get_loop_control().load_midi_bindings(filename,  _append_check->GetValue());
-@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand
- 	}
- 	else if (ev.GetId() == ID_SaveButton)
- 	{
--		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
-+		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
- 
- 		if ( !filename.empty() )
- 		{
-Index: sooperlooper/src/gui/config_panel.cpp
-===================================================================
---- sooperlooper.orig/src/gui/config_panel.cpp
-+++ sooperlooper/src/gui/config_panel.cpp
-@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv
- 	else if (ev.GetId() == ID_MidiBrowseButton) {
- 		
- 		_parent->get_keyboard().set_enabled(false);
--		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
-+		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
- 		_parent->get_keyboard().set_enabled(true);
- 		
- 		if ( !filename.empty() )
-@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv
- 	else if (ev.GetId() == ID_SessionBrowseButton) {
- 		
- 		_parent->get_keyboard().set_enabled(false);
--		wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
--		//wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
-+		wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
-+		//wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
- 		_parent->get_keyboard().set_enabled(true);
- 		
- 		if ( !filename.empty() )
diff --git a/audio/sooperlooper/patches/06-use_sigc_bind.patch b/audio/sooperlooper/patches/06-use_sigc_bind.patch
deleted file mode 100644
index 995dcf048f..0000000000
--- a/audio/sooperlooper/patches/06-use_sigc_bind.patch
+++ /dev/null
@@ -1,655 +0,0 @@
-commit 0cb1e65166c777250cf3737c418fcfc12ffac815
-Author: vixus0 <vixus0@gmail.com>
-Date:   Tue Jun 7 22:10:39 2016 +0100
-
-    Use sigc::bind due to clash with std::bind
-
-diff --git a/src/engine.cpp b/src/engine.cpp
-index a7a6395..3175c20 100644
---- a/src/engine.cpp
-+++ b/src/engine.cpp
-@@ -313,7 +313,7 @@ void Engine::set_midi_bridge (MidiBridge * bridge)
- 		_midi_bridge->MidiControlEvent.connect (mem_fun(*this, &Engine::push_midi_control_event));
- 		_midi_bridge->MidiSyncEvent.connect (mem_fun(*this, &Engine::push_sync_event));
- 
--		ParamChanged.connect(bind (mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this));
-+		ParamChanged.connect(sigc::bind(mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this));
- 
- 		_midi_bridge->set_output_midi_clock(_output_midi_clock);
- 	}
-diff --git a/src/gui/latency_panel.cpp b/src/gui/latency_panel.cpp
-index 10e16e8..cb28723 100644
---- a/src/gui/latency_panel.cpp
-+++ b/src/gui/latency_panel.cpp
-@@ -150,7 +150,7 @@ void LatencyPanel::init()
- 	_input_spin->set_allow_outside_bounds(false);
- 	//_input_spin->SetFont (sliderFont);
- 	_input_spin->set_decimal_digits(0);
--	_input_spin->value_changed.connect (bind (mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_InputLatency));
-+	_input_spin->value_changed.connect (sigc::bind(mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_InputLatency));
- 	rowsizer->Add (_input_spin, 1, wxLEFT|wxEXPAND, 10);
- 
- 	_output_spin = new SpinBox(this, ID_OutputLatency, 0.0f, 100000.0f, 512.0f, false, wxDefaultPosition, wxSize(200, 35));
-@@ -160,7 +160,7 @@ void LatencyPanel::init()
- 	_output_spin->set_allow_outside_bounds(false);
- 	_output_spin->set_decimal_digits(0);
- 	//_output_spin->SetFont (sliderFont);
--	_output_spin->value_changed.connect (bind (mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_OutputLatency));
-+	_output_spin->value_changed.connect (sigc::bind(mem_fun (*this,  &LatencyPanel::on_spin_change), (int) ID_OutputLatency));
- 	rowsizer->Add (_output_spin, 1, wxLEFT|wxRIGHT|wxEXPAND, 10);
- 	
- 	
-diff --git a/src/gui/looper_panel.cpp b/src/gui/looper_panel.cpp
-index 4c5650d..34f7a84 100644
---- a/src/gui/looper_panel.cpp
-+++ b/src/gui/looper_panel.cpp
-@@ -212,8 +212,8 @@ LooperPanel::init()
- 	slider->set_show_indicator_bar (false);
- 	slider->set_scale_mode(SliderBar::ZeroGainMode);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	inthresh_sizer->Add (slider, 1, wxALL|wxEXPAND, 0);
- 	
- 	_thresh_control = slider = new SliderBar(this, ID_ThreshControl, 0.0f, 1.0f, 0.0f);
-@@ -222,8 +222,8 @@ LooperPanel::init()
- 	slider->set_show_indicator_bar (true);
- 	slider->set_scale_mode(SliderBar::ZeroGainMode);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	inthresh_sizer->Add (slider, 1, wxLEFT|wxEXPAND, 3);
- 	
- 	colsizer->Add (inthresh_sizer, 1, wxEXPAND|wxLEFT, 5);
-@@ -232,8 +232,8 @@ LooperPanel::init()
- 	slider->set_units(wxT("%"));
- 	slider->set_label(wxT("feedback"));
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 
- 	_maininsizer->Add (slider, 1, wxEXPAND|wxTOP, 5);
- 
-@@ -281,8 +281,8 @@ LooperPanel::init()
- // 	slider->set_label(wxT("dry"));
- // 	slider->set_scale_mode(SliderBar::ZeroGainMode);
- // 	slider->SetFont(sliderFont);
--// 	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--// 	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+// 	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+// 	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- // 	_toppansizer->Add (slider, 1, wxEXPAND, 0);
- 
- 	// panners are added later
-@@ -297,8 +297,8 @@ LooperPanel::init()
- 	slider->set_show_indicator_bar (true);
- 	slider->set_scale_mode(SliderBar::ZeroGainMode);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	_botpansizer->Add (slider, 1, wxEXPAND, 0);
- 
- 	/*
-@@ -307,7 +307,7 @@ LooperPanel::init()
- 	_outlatency_spin->set_label(wxT("o.lat"));
- 	_outlatency_spin->set_snap_mode (SpinBox::IntegerSnap);
- 	_outlatency_spin->set_allow_outside_bounds(true);
--	_outlatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _outlatency_spin->GetId()));
-+	_outlatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _outlatency_spin->GetId()));
- 	_outlatency_spin->SetFont(sliderFont);
- 	_botpansizer->Add (_outlatency_spin, 0, wxALL, 0);
- 
-@@ -316,7 +316,7 @@ LooperPanel::init()
- 	_inlatency_spin->set_label(wxT("i.lat"));
- 	_inlatency_spin->set_snap_mode (SpinBox::IntegerSnap);
- 	_inlatency_spin->set_allow_outside_bounds(true);
--	_inlatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _inlatency_spin->GetId()));
-+	_inlatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _inlatency_spin->GetId()));
- 	_inlatency_spin->SetFont(sliderFont);
- 	_botpansizer->Add (_inlatency_spin, 0, wxALL, 0);
- 	*/
-@@ -361,8 +361,8 @@ LooperPanel::init()
- 	_sync_check = new CheckBox(this, ID_SyncCheck, wxT("sync"), true, wxDefaultPosition, wxSize(55, 18));
- 	_sync_check->SetFont(sliderFont);
- 	_sync_check->SetToolTip(wxT("sync operations to quantize source"));
--	_sync_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("sync")));
--	_sync_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _sync_check->GetId()));
-+	_sync_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("sync")));
-+	_sync_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _sync_check->GetId()));
- 	lilrowsizer->Add (_sync_check, 1, wxLEFT, 3);
- 	lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0);
- 
-@@ -370,8 +370,8 @@ LooperPanel::init()
- 	_play_sync_check = new CheckBox(this, ID_PlaySyncCheck, wxT("play sync"), true, wxDefaultPosition, wxSize(55, 18));
- 	_play_sync_check->SetFont(sliderFont);
- 	_play_sync_check->SetToolTip(wxT("sync playback auto-triggering to quantized sync source"));
--	_play_sync_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("playback_sync")));
--	_play_sync_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_sync_check->GetId()));
-+	_play_sync_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("playback_sync")));
-+	_play_sync_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_sync_check->GetId()));
- 	lilrowsizer->Add (_play_sync_check, 1, wxLEFT, 3);
- 	lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0);
- 	
-@@ -379,15 +379,15 @@ LooperPanel::init()
- 	_play_feed_check = new CheckBox(this, ID_UseFeedbackPlayCheck, wxT("p. feedb"), true, wxDefaultPosition, wxSize(55, 18));
- 	_play_feed_check->SetFont(sliderFont);
- 	_play_feed_check->SetToolTip(wxT("enable feedback during playback"));
--	_play_feed_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("use_feedback_play")));
--	_play_feed_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_feed_check->GetId()));
-+	_play_feed_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("use_feedback_play")));
-+	_play_feed_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_feed_check->GetId()));
- 	lilrowsizer->Add (_play_feed_check, 1, wxLEFT, 3);
- 
- 	_tempo_stretch_check = new CheckBox(this, ID_TempoStretchCheck, wxT("t. stretch"), true, wxDefaultPosition, wxSize(55, 18));
- 	_tempo_stretch_check->SetFont(sliderFont);
- 	_tempo_stretch_check->SetToolTip(wxT("enable automatic timestretch when tempo changes"));
--	_tempo_stretch_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("tempo_stretch")));
--	_tempo_stretch_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _tempo_stretch_check->GetId()));
-+	_tempo_stretch_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("tempo_stretch")));
-+	_tempo_stretch_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _tempo_stretch_check->GetId()));
- 	lilrowsizer->Add (_tempo_stretch_check, 1, wxLEFT, 3);
- 
- 	lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0);
-@@ -440,8 +440,8 @@ LooperPanel::init()
- 	slider->set_show_value(false);
- 	slider->set_show_indicator_bar (true);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3);
- 
- 	// pitch control
-@@ -452,8 +452,8 @@ LooperPanel::init()
- 	slider->set_decimal_digits (1);
- 	slider->set_snap_mode(SliderBar::IntegerSnap);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3);
- 
- 	// pause
-@@ -476,8 +476,8 @@ LooperPanel::init()
- 	slider->set_style (SliderBar::CenterStyle);
- 	slider->set_decimal_digits (3);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3);
- 
- 	// stretch control
-@@ -487,8 +487,8 @@ LooperPanel::init()
- 	slider->set_style (SliderBar::CenterStyle);
- 	slider->set_decimal_digits (2);
- 	slider->SetFont(sliderFont);
--	slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--	slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+	slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+	slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 	rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3);
- 
- 
-@@ -498,7 +498,7 @@ LooperPanel::init()
- 	_triglatency_spin->set_label(wxT("t.lat"));
- 	_triglatency_spin->set_snap_mode (SpinBox::IntegerSnap);
- 	_triglatency_spin->set_allow_outside_bounds(true);
--	_triglatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _triglatency_spin->GetId()));
-+	_triglatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _triglatency_spin->GetId()));
- 	_triglatency_spin->SetFont(sliderFont);
- 	rowsizer->Add (_triglatency_spin, 0, wxALL, 0);
- 	*/
-@@ -555,15 +555,15 @@ LooperPanel::post_init()
- 		slider->set_label(wxT("in mon"));
- 		slider->set_scale_mode(SliderBar::ZeroGainMode);
- 		slider->SetFont(sliderFont);
--		slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
--		slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
-+		slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId()));
-+		slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId()));
- 		_toppansizer->Add (slider, 1, wxEXPAND, 0);
- 
- 		_use_main_in_check = new CheckBox(this, ID_UseMainInCheck, wxT("main in"), true, wxDefaultPosition, wxSize(65, 18));
- 		_use_main_in_check->SetFont(sliderFont);
- 		_use_main_in_check->SetToolTip(wxT("mix input from Main inputs"));
--		_use_main_in_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("use_common_ins")));
--		_use_main_in_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _use_main_in_check->GetId()));
-+		_use_main_in_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("use_common_ins")));
-+		_use_main_in_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _use_main_in_check->GetId()));
- 		_maininsizer->Add (_use_main_in_check, 0, wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL ,0);
- 		_maininsizer->Layout();
- 
-@@ -595,8 +595,8 @@ LooperPanel::post_init()
- 		slider->set_decimal_digits (3);
- 		slider->set_show_value (false);
- 		slider->SetFont(sliderFont);
--		slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::pan_events), (int) i));
--		slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::pan_bind_events), (int) i));
-+		slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pan_events), (int) i));
-+		slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::pan_bind_events), (int) i));
- 
- 		if (!_has_discrete_io) {
- 			_toppansizer->Add (slider, 1, (i==0) ? wxEXPAND : wxEXPAND|wxLEFT, 2);
-@@ -652,83 +652,83 @@ LooperPanel::set_index(int ind)
- void
- LooperPanel::bind_events()
- {
--	_undo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("undo"))));
--	_undo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("undo"))));
--	_undo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("undo"))));
-+	_undo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("undo"))));
-+	_undo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("undo"))));
-+	_undo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("undo"))));
- 
--	_redo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("redo"))));
--	_redo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("redo"))));
--	_redo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("redo"))));
-+	_redo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("redo"))));
-+	_redo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("redo"))));
-+	_redo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("redo"))));
- 
--	_record_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("record"))));
--	_record_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("record"))));
--	_record_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("record"))));
-+	_record_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("record"))));
-+	_record_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("record"))));
-+	_record_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("record"))));
- 
--	_overdub_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("overdub"))));
--	_overdub_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("overdub"))));
--	_overdub_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("overdub"))));
-+	_overdub_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("overdub"))));
-+	_overdub_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("overdub"))));
-+	_overdub_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("overdub"))));
- 
--	_multiply_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("multiply"))));
--	_multiply_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("multiply"))));
--	_multiply_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("multiply"))));
-+	_multiply_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("multiply"))));
-+	_multiply_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("multiply"))));
-+	_multiply_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("multiply"))));
- 
--	_replace_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("replace"))));
--	_replace_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("replace"))));
--	_replace_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("replace"))));
-+	_replace_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("replace"))));
-+	_replace_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("replace"))));
-+	_replace_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("replace"))));
- 
--	_insert_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("insert"))));
--	_insert_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("insert"))));
--	_insert_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("insert"))));
-+	_insert_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("insert"))));
-+	_insert_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("insert"))));
-+	_insert_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("insert"))));
- 
--	_once_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("oneshot"))));
--	_once_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("oneshot"))));
--	_once_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("oneshot"))));
-+	_once_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("oneshot"))));
-+	_once_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("oneshot"))));
-+	_once_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("oneshot"))));
- 
--	_trig_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("trigger"))));
--	_trig_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("trigger"))));
--	_trig_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("trigger"))));
-+	_trig_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("trigger"))));
-+	_trig_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("trigger"))));
-+	_trig_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("trigger"))));
- 
- 	_delay_button->pressed.connect (mem_fun (*this, &LooperPanel::delay_button_press_event));
- 	_delay_button->released.connect (mem_fun (*this, &LooperPanel::delay_button_release_event));
--	_delay_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("delay_trigger"))));
-+	_delay_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("delay_trigger"))));
- 
--	_reverse_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("reverse"))));
--	_reverse_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("reverse"))));
--	_reverse_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("reverse"))));
-+	_reverse_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("reverse"))));
-+	_reverse_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("reverse"))));
-+	_reverse_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("reverse"))));
- 
--	_substitute_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("substitute"))));
--	_substitute_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("substitute"))));
--	_substitute_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("substitute"))));
-+	_substitute_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("substitute"))));
-+	_substitute_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("substitute"))));
-+	_substitute_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("substitute"))));
- 	
--	_mute_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("mute"))));
--	_mute_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("mute"))));
--	_mute_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("mute"))));
-+	_mute_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("mute"))));
-+	_mute_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("mute"))));
-+	_mute_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("mute"))));
- 
--	_pause_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("pause"))));
--	_pause_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("pause"))));
--	_pause_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("pause"))));
-+	_pause_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("pause"))));
-+	_pause_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("pause"))));
-+	_pause_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("pause"))));
- 
--	_solo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("solo"))));
--	_solo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("solo"))));
--	_solo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("solo"))));
-+	_solo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("solo"))));
-+	_solo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("solo"))));
-+	_solo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("solo"))));
- 
--	_halfx_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 0.5f));
--	_halfx_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 0.5f));
--	_1x_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 1.0f));
--	_1x_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 1.0f));
--	_2x_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 2.0f));
--	_2x_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 2.0f));
-+	_halfx_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 0.5f));
-+	_halfx_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 0.5f));
-+	_1x_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 1.0f));
-+	_1x_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 1.0f));
-+	_2x_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 2.0f));
-+	_2x_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 2.0f));
- 
--	_scratch_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("scratch"))));
--	_scratch_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("scratch"))));
--	_scratch_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("scratch"))));
-+	_scratch_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("scratch"))));
-+	_scratch_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("scratch"))));
-+	_scratch_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("scratch"))));
- 
--	_save_button->clicked.connect (bind (mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("save"))));
--	_load_button->clicked.connect (bind (mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("load"))));
-+	_save_button->clicked.connect (sigc::bind(mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("save"))));
-+	_load_button->clicked.connect (sigc::bind(mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("load"))));
- 
- 
--	_scratch_control->pressed.connect (bind (mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_press"))));
--	_scratch_control->released.connect (bind (mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_release"))));
-+	_scratch_control->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_press"))));
-+	_scratch_control->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_release"))));
- 
- 	
- 	_loop_control->MidiBindingChanged.connect (mem_fun (*this, &LooperPanel::got_binding_changed));
-diff --git a/src/gui/main_panel.cpp b/src/gui/main_panel.cpp
-index 1734eb6..b0c1bac 100644
---- a/src/gui/main_panel.cpp
-+++ b/src/gui/main_panel.cpp
-@@ -217,7 +217,7 @@ MainPanel::init()
- 	_sync_choice->set_label (wxT("sync to"));
- 	_sync_choice->SetFont (sliderFont);
- 	_sync_choice->value_changed.connect (mem_fun (*this,  &MainPanel::on_syncto_change));
--	_sync_choice->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("sync")));
-+	_sync_choice->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("sync")));
- 	
- 	rowsizer->Add (_sync_choice, 0, wxALL|wxEXPAND, 2);
- 	
-@@ -228,7 +228,7 @@ MainPanel::init()
- 	_tempo_bar->set_allow_outside_bounds(true);
- 	_tempo_bar->SetFont (sliderFont);
- 	_tempo_bar->value_changed.connect (mem_fun (*this,  &MainPanel::on_tempo_change));
--	_tempo_bar->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("tempo")));
-+	_tempo_bar->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("tempo")));
- 	rowsizer->Add (_tempo_bar, 0, wxALL|wxEXPAND, 2);
- 
-  	_taptempo_button = new PixButton(_top_panel, ID_TapTempoButton, true);
-@@ -239,7 +239,7 @@ MainPanel::init()
- 	_taptempo_button->set_active_bitmap (wxBitmap(tap_tempo_active));
- 	_taptempo_button->pressed.connect (mem_fun (*this, &MainPanel::on_taptempo_press));
- 	_taptempo_button->released.connect (mem_fun (*this, &MainPanel::on_taptempo_release));
--	_taptempo_button->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("taptempo")));
-+	_taptempo_button->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("taptempo")));
-  	rowsizer->Add (_taptempo_button, 0, wxALL|wxEXPAND, 2);
- 	
- 
-@@ -250,7 +250,7 @@ MainPanel::init()
- 	_eighth_cycle_bar->set_allow_outside_bounds(true);
- 	_eighth_cycle_bar->SetFont (sliderFont);
- 	_eighth_cycle_bar->value_changed.connect (mem_fun (*this,  &MainPanel::on_eighth_change));
--	_eighth_cycle_bar->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("eighth")));
-+	_eighth_cycle_bar->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("eighth")));
- 	rowsizer->Add (_eighth_cycle_bar, 0, wxALL|wxEXPAND, 2);
- 	
- 
-@@ -258,7 +258,7 @@ MainPanel::init()
- 	_quantize_choice->SetFont (sliderFont);
- 	_quantize_choice->set_label (wxT("quantize"));
- 	_quantize_choice->value_changed.connect (mem_fun (*this,  &MainPanel::on_quantize_change));
--	_quantize_choice->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("quantize")));
-+	_quantize_choice->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("quantize")));
- 	_quantize_choice->append_choice (wxT("off"), 0);
- 	_quantize_choice->append_choice (wxT("cycle"), 1);
- 	_quantize_choice->append_choice (wxT("8th"), 2);
-@@ -269,21 +269,21 @@ MainPanel::init()
- 	_mute_quant_check->SetFont(sliderFont);
- 	_mute_quant_check->SetToolTip(wxT("quantize mute operations"));
- 	_mute_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_mute_quant_check));
--	_mute_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("mute_quantized")));
-+	_mute_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("mute_quantized")));
- 	rowsizer->Add (_mute_quant_check, 0, wxALL|wxEXPAND, 2);
- 
- 	_odub_quant_check = new CheckBox(_top_panel, ID_OdubQuantCheck, wxT("odub quant"), true, wxDefaultPosition, wxSize(90, 18));
- 	_odub_quant_check->SetFont(sliderFont);
- 	_odub_quant_check->SetToolTip(wxT("quantize overdub operations"));
- 	_odub_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_odub_quant_check));
--	_odub_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("overdub_quantized")));
-+	_odub_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("overdub_quantized")));
- 	rowsizer->Add (_odub_quant_check, 0, wxALL|wxEXPAND, 2);
- 
- 	_repl_quant_check = new CheckBox(_top_panel, ID_ReplQuantCheck, wxT("repl quant"), true, wxDefaultPosition, wxSize(90, 18));
- 	_repl_quant_check->SetFont(sliderFont);
- 	_repl_quant_check->SetToolTip(wxT("quantize replace and substitute operations"));
- 	_repl_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_repl_quant_check));
--	_repl_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("replace_quantized")));
-+	_repl_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("replace_quantized")));
- 	rowsizer->Add (_repl_quant_check, 0, wxALL|wxEXPAND, 2);
- 
- 
-@@ -305,7 +305,7 @@ MainPanel::init()
- 	_xfade_bar->set_decimal_digits (0);
- 	_xfade_bar->SetFont (sliderFont);
- 	_xfade_bar->value_changed.connect (mem_fun (*this,  &MainPanel::on_xfade_change));
--	_xfade_bar->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("fade_samples")));
-+	_xfade_bar->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("fade_samples")));
- 	rowsizer->Add (_xfade_bar, 0, wxALL|wxEXPAND, 2);
- 
- 	_common_ingain_bar = new SliderBar(_top_panel, ID_InGainControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20));
-@@ -315,7 +315,7 @@ MainPanel::init()
- 	_common_ingain_bar->set_show_indicator_bar(true);
- 	_common_ingain_bar->SetFont(sliderFont);
- 	_common_ingain_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_ingain_change));
--	_common_ingain_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("input_gain")));
-+	_common_ingain_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("input_gain")));
- 	rowsizer->Add (_common_ingain_bar, 0, wxALL|wxEXPAND, 2);
- 	
- 	_common_dry_bar = new SliderBar(_top_panel, ID_DryControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20));
-@@ -325,7 +325,7 @@ MainPanel::init()
- 	_common_dry_bar->set_show_indicator_bar(true);
- 	_common_dry_bar->SetFont(sliderFont);
- 	_common_dry_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_dry_change));
--	_common_dry_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("dry")));
-+	_common_dry_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("dry")));
- 	rowsizer->Add (_common_dry_bar, 0, wxALL|wxEXPAND, 2);
- 
- 	_common_wet_bar = new SliderBar(_top_panel, ID_WetControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20));
-@@ -335,7 +335,7 @@ MainPanel::init()
- 	_common_wet_bar->set_show_indicator_bar(true);
- 	_common_wet_bar->SetFont(sliderFont);
- 	_common_wet_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_wet_change));
--	_common_wet_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("wet")));
-+	_common_wet_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("wet")));
- 	rowsizer->Add (_common_wet_bar, 0, wxALL|wxEXPAND, 2);
- 	
- 
-@@ -343,13 +343,13 @@ MainPanel::init()
- 	_round_check = new CheckBox (_top_panel, ID_RoundCheck, wxT("round"), true, wxDefaultPosition, wxSize(60, 20));
- 	_round_check->SetFont (sliderFont);
- 	_round_check->value_changed.connect (mem_fun (*this, &MainPanel::on_round_check));
--	_round_check->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("round")));
-+	_round_check->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("round")));
- 	rowsizer->Add (_round_check, 0, wxALL|wxEXPAND, 2);
- 
- 	_relsync_check = new CheckBox (_top_panel, ID_RelSyncCheck, wxT("rel sync"), true, wxDefaultPosition, wxSize(75, 20));
- 	_relsync_check->SetFont (sliderFont);
- 	_relsync_check->value_changed.connect (mem_fun (*this, &MainPanel::on_relsync_check));
--	_relsync_check->bind_request.connect (bind (mem_fun (*this,  &MainPanel::on_bind_request), wxT("relative_sync")));
-+	_relsync_check->bind_request.connect (sigc::bind(mem_fun (*this,  &MainPanel::on_bind_request), wxT("relative_sync")));
- 	rowsizer->Add (_relsync_check, 0, wxALL|wxEXPAND, 2);
- 	
- 
-@@ -357,7 +357,7 @@ MainPanel::init()
- 	_smart_eighths_check->SetFont(sliderFont);
- 	_smart_eighths_check->SetToolTip(wxT("auto adjust 8ths per cycle with tempo"));
- 	_smart_eighths_check->value_changed.connect (mem_fun (*this, &MainPanel::on_smart_eighths_check));
--	_smart_eighths_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("smart_eighths")));
-+	_smart_eighths_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("smart_eighths")));
- 	rowsizer->Add (_smart_eighths_check, 0, wxALL|wxEXPAND, 2);
- 
- 
-@@ -379,7 +379,7 @@ MainPanel::init()
- 
- 	// todo request how many loopers to construct based on connection
- 	_loop_connect_connection = _loop_control->LooperConnected.connect (mem_fun (*this, &MainPanel::init_loopers));
--	_loop_disconnect_connection = _loop_control->Disconnected.connect (bind (mem_fun (*this, &MainPanel::init_loopers), 0));
-+	_loop_disconnect_connection = _loop_control->Disconnected.connect (sigc::bind(mem_fun (*this, &MainPanel::init_loopers), 0));
- 	_loop_update_connection = _loop_control->NewDataReady.connect (mem_fun (*this, &MainPanel::osc_data_ready));
- 
- 
-@@ -1112,67 +1112,67 @@ MainPanel::process_key_event (wxKeyEvent &ev)
- void MainPanel::intialize_keybindings ()
- {
- 	
--	_keyboard->add_action ("record", bind (mem_fun (*this, &MainPanel::command_action), wxT("record")));
--	_keyboard->add_action ("overdub", bind (mem_fun (*this, &MainPanel::command_action), wxT("overdub")));
--	_keyboard->add_action ("multiply", bind (mem_fun (*this, &MainPanel::command_action), wxT("multiply")));
--	_keyboard->add_action ("insert", bind (mem_fun (*this, &MainPanel::command_action), wxT("insert")));
--	_keyboard->add_action ("replace", bind (mem_fun (*this, &MainPanel::command_action), wxT("replace")));
--	_keyboard->add_action ("reverse", bind (mem_fun (*this, &MainPanel::command_action), wxT("reverse")));
--	_keyboard->add_action ("scratch", bind (mem_fun (*this, &MainPanel::command_action), wxT("scratch")));
--	_keyboard->add_action ("substitute", bind (mem_fun (*this, &MainPanel::command_action), wxT("substitute")));
--	_keyboard->add_action ("mute", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute")));
--	_keyboard->add_action ("mute_on", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_on")));
--	_keyboard->add_action ("mute_off", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_off")));
--	_keyboard->add_action ("mute_trigger", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_trigger")));
--	_keyboard->add_action ("undo", bind (mem_fun (*this, &MainPanel::command_action), wxT("undo")));
--	_keyboard->add_action ("redo", bind (mem_fun (*this, &MainPanel::command_action), wxT("redo")));	
--	_keyboard->add_action ("undo_all", bind (mem_fun (*this, &MainPanel::command_action), wxT("undo_all")));
--	_keyboard->add_action ("redo_all", bind (mem_fun (*this, &MainPanel::command_action), wxT("redo_all")));	
--	_keyboard->add_action ("oneshot", bind (mem_fun (*this, &MainPanel::command_action), wxT("oneshot")));
--	_keyboard->add_action ("trigger", bind (mem_fun (*this, &MainPanel::command_action), wxT("trigger")));
--	_keyboard->add_action ("pause", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause")));
--	_keyboard->add_action ("pause_on", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause_on")));
--	_keyboard->add_action ("pause_off", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause_off")));
--	_keyboard->add_action ("solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo")));
--	_keyboard->add_action ("solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo_prev")));
--	_keyboard->add_action ("solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo_next")));
--	_keyboard->add_action ("record_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo")));
--	_keyboard->add_action ("record_solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo_prev")));
--	_keyboard->add_action ("record_solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo_next")));
--	_keyboard->add_action ("set_sync_pos", bind (mem_fun (*this, &MainPanel::command_action), wxT("set_sync_pos")));
--	_keyboard->add_action ("reset_sync_pos", bind (mem_fun (*this, &MainPanel::command_action), wxT("reset_sync_pos")));
--	_keyboard->add_action ("record_or_overdub", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub")));
--	_keyboard->add_action ("record_exclusive", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive")));
--	_keyboard->add_action ("record_exclusive_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_next")));
--	_keyboard->add_action ("record_exclusive_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_prev")));	
--	_keyboard->add_action ("record_or_overdub_excl", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl")));
--	_keyboard->add_action ("record_or_overdub_excl_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_next")));
--	_keyboard->add_action ("record_or_overdub_excl_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_prev")));
--	_keyboard->add_action ("record_or_overdub_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo")));
--	_keyboard->add_action ("record_or_overdub_solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_next")));
--	_keyboard->add_action ("record_or_overdub_solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_prev")));
--	_keyboard->add_action ("record_overdub_end_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo")));
--	_keyboard->add_action ("record_overdub_end_solo_trig", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo_trig")));
-+	_keyboard->add_action ("record", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record")));
-+	_keyboard->add_action ("overdub", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("overdub")));
-+	_keyboard->add_action ("multiply", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("multiply")));
-+	_keyboard->add_action ("insert", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("insert")));
-+	_keyboard->add_action ("replace", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("replace")));
-+	_keyboard->add_action ("reverse", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("reverse")));
-+	_keyboard->add_action ("scratch", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("scratch")));
-+	_keyboard->add_action ("substitute", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("substitute")));
-+	_keyboard->add_action ("mute", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute")));
-+	_keyboard->add_action ("mute_on", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_on")));
-+	_keyboard->add_action ("mute_off", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_off")));
-+	_keyboard->add_action ("mute_trigger", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_trigger")));
-+	_keyboard->add_action ("undo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("undo")));
-+	_keyboard->add_action ("redo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("redo")));	
-+	_keyboard->add_action ("undo_all", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("undo_all")));
-+	_keyboard->add_action ("redo_all", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("redo_all")));	
-+	_keyboard->add_action ("oneshot", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("oneshot")));
-+	_keyboard->add_action ("trigger", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("trigger")));
-+	_keyboard->add_action ("pause", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause")));
-+	_keyboard->add_action ("pause_on", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause_on")));
-+	_keyboard->add_action ("pause_off", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause_off")));
-+	_keyboard->add_action ("solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo")));
-+	_keyboard->add_action ("solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo_prev")));
-+	_keyboard->add_action ("solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo_next")));
-+	_keyboard->add_action ("record_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo")));
-+	_keyboard->add_action ("record_solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo_prev")));
-+	_keyboard->add_action ("record_solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo_next")));
-+	_keyboard->add_action ("set_sync_pos", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("set_sync_pos")));
-+	_keyboard->add_action ("reset_sync_pos", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("reset_sync_pos")));
-+	_keyboard->add_action ("record_or_overdub", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub")));
-+	_keyboard->add_action ("record_exclusive", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive")));
-+	_keyboard->add_action ("record_exclusive_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_next")));
-+	_keyboard->add_action ("record_exclusive_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_prev")));	
-+	_keyboard->add_action ("record_or_overdub_excl", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl")));
-+	_keyboard->add_action ("record_or_overdub_excl_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_next")));
-+	_keyboard->add_action ("record_or_overdub_excl_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_prev")));
-+	_keyboard->add_action ("record_or_overdub_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo")));
-+	_keyboard->add_action ("record_or_overdub_solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_next")));
-+	_keyboard->add_action ("record_or_overdub_solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_prev")));
-+	_keyboard->add_action ("record_overdub_end_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo")));
-+	_keyboard->add_action ("record_overdub_end_solo_trig", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo_trig")));
- 
-     
--	_keyboard->add_action ("delay", bind (mem_fun (*this, &MainPanel::misc_action), wxT("delay")));
--	_keyboard->add_action ("taptempo", bind (mem_fun (*this, &MainPanel::misc_action), wxT("taptempo")));
--	_keyboard->add_action ("load", bind (mem_fun (*this, &MainPanel::misc_action), wxT("load")));
--	_keyboard->add_action ("save", bind (mem_fun (*this, &MainPanel::misc_action), wxT("save")));
--	_keyboard->add_action ("cancel_midi_learn", bind (mem_fun (*this, &MainPanel::misc_action), wxT("cancel_learn")));
--
--	_keyboard->add_action ("select_prev_loop", bind (mem_fun (*this, &MainPanel::select_loop_action), -2));
--	_keyboard->add_action ("select_next_loop", bind (mem_fun (*this, &MainPanel::select_loop_action), -1));
--	_keyboard->add_action ("select_loop_1", bind (mem_fun (*this, &MainPanel::select_loop_action), 1));
--	_keyboard->add_action ("select_loop_2", bind (mem_fun (*this, &MainPanel::select_loop_action), 2));
--	_keyboard->add_action ("select_loop_3", bind (mem_fun (*this, &MainPanel::select_loop_action), 3));
--	_keyboard->add_action ("select_loop_4", bind (mem_fun (*this, &MainPanel::select_loop_action), 4));
--	_keyboard->add_action ("select_loop_5", bind (mem_fun (*this, &MainPanel::select_loop_action), 5));
--	_keyboard->add_action ("select_loop_6", bind (mem_fun (*this, &MainPanel::select_loop_action), 6));
--	_keyboard->add_action ("select_loop_7", bind (mem_fun (*this, &MainPanel::select_loop_action), 7));
--	_keyboard->add_action ("select_loop_8", bind (mem_fun (*this, &MainPanel::select_loop_action), 8));
--	_keyboard->add_action ("select_loop_9", bind (mem_fun (*this, &MainPanel::select_loop_action), 9));
--	_keyboard->add_action ("select_loop_all", bind (mem_fun (*this, &MainPanel::select_loop_action), 0));
-+	_keyboard->add_action ("delay", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("delay")));
-+	_keyboard->add_action ("taptempo", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("taptempo")));
-+	_keyboard->add_action ("load", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("load")));
-+	_keyboard->add_action ("save", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("save")));
-+	_keyboard->add_action ("cancel_midi_learn", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("cancel_learn")));
-+
-+	_keyboard->add_action ("select_prev_loop", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), -2));
-+	_keyboard->add_action ("select_next_loop", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), -1));
-+	_keyboard->add_action ("select_loop_1", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 1));
-+	_keyboard->add_action ("select_loop_2", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 2));
-+	_keyboard->add_action ("select_loop_3", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 3));
-+	_keyboard->add_action ("select_loop_4", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 4));
-+	_keyboard->add_action ("select_loop_5", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 5));
-+	_keyboard->add_action ("select_loop_6", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 6));
-+	_keyboard->add_action ("select_loop_7", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 7));
-+	_keyboard->add_action ("select_loop_8", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 8));
-+	_keyboard->add_action ("select_loop_9", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 9));
-+	_keyboard->add_action ("select_loop_all", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 0));
- 
- 	
- 	// these are the defaults... they get overridden by rc file
diff --git a/audio/sooperlooper/patches/libsigc.patch b/audio/sooperlooper/patches/libsigc.patch
deleted file mode 100644
index 6072b02d5f..0000000000
--- a/audio/sooperlooper/patches/libsigc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ur a/sooperlooper-1.7.3/src/control_osc.hpp b/sooperlooper-1.7.3/src/control_osc.hpp
---- a/sooperlooper-1.7.3/src/control_osc.hpp	2013-10-18 18:37:39.000000000 +0300
-+++ b/sooperlooper-1.7.3/src/control_osc.hpp	2015-12-05 01:40:01.848107565 +0200
-@@ -27,7 +27,7 @@
- #include <list>
- #include <utility>
- 
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- 
- #include "event.hpp"
- #include "event_nonrt.hpp"
-diff -ur a/sooperlooper-1.7.3/src/gui/app_frame.hpp b/sooperlooper-1.7.3/src/gui/app_frame.hpp
---- a/sooperlooper-1.7.3/src/gui/app_frame.hpp	2014-02-03 18:52:15.000000000 +0200
-+++ b/sooperlooper-1.7.3/src/gui/app_frame.hpp	2015-12-05 01:40:01.844774250 +0200
-@@ -26,7 +26,7 @@
- #include <string>
- #include <vector>
- 
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- #include <sigc++/signal.h>
- #include <sigc++/connection.h>
- 
-diff -ur a/sooperlooper-1.7.3/src/gui/config_panel.hpp b/sooperlooper-1.7.3/src/gui/config_panel.hpp
---- a/sooperlooper-1.7.3/src/gui/config_panel.hpp	2013-10-18 18:37:39.000000000 +0300
-+++ b/sooperlooper-1.7.3/src/gui/config_panel.hpp	2015-12-05 01:40:01.841440935 +0200
-@@ -26,7 +26,7 @@
- 
- #include <string>
- #include <vector>
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- 
- class wxListCtrl;
- class wxSpinCtrl;
-diff -ur a/sooperlooper-1.7.3/src/gui/keys_panel.hpp b/sooperlooper-1.7.3/src/gui/keys_panel.hpp
---- a/sooperlooper-1.7.3/src/gui/keys_panel.hpp	2013-10-18 18:37:39.000000000 +0300
-+++ b/sooperlooper-1.7.3/src/gui/keys_panel.hpp	2015-12-05 01:40:01.838107619 +0200
-@@ -26,7 +26,7 @@
- 
- #include <string>
- #include <vector>
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- 
- class wxListCtrl;
- 
-diff -ur a/sooperlooper-1.7.3/src/gui/latency_panel.hpp b/sooperlooper-1.7.3/src/gui/latency_panel.hpp
---- a/sooperlooper-1.7.3/src/gui/latency_panel.hpp	2013-10-18 18:37:39.000000000 +0300
-+++ b/sooperlooper-1.7.3/src/gui/latency_panel.hpp	2015-12-05 01:40:01.834774304 +0200
-@@ -26,7 +26,7 @@
- 
- #include <string>
- #include <vector>
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- 
- class wxListCtrl;
- 
-diff -ur a/sooperlooper-1.7.3/src/gui/main_panel.hpp b/sooperlooper-1.7.3/src/gui/main_panel.hpp
---- a/sooperlooper-1.7.3/src/gui/main_panel.hpp	2014-02-04 18:39:55.000000000 +0200
-+++ b/sooperlooper-1.7.3/src/gui/main_panel.hpp	2015-12-05 01:40:01.831440989 +0200
-@@ -26,7 +26,7 @@
- #include <string>
- #include <vector>
- 
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- #include <sigc++/signal.h>
- #include <sigc++/connection.h>
- 
-diff -ur a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp
---- a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp	2013-10-18 18:37:39.000000000 +0300
-+++ b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp	2015-12-05 01:40:01.828107674 +0200
-@@ -26,7 +26,7 @@
- 
- #include <string>
- #include <vector>
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- #include <list>
- 
- #include <midi_bind.hpp>
-diff -ur a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp
---- a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp	2013-10-18 18:37:39.000000000 +0300
-+++ b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp	2015-12-05 01:40:01.824774358 +0200
-@@ -26,7 +26,7 @@
- 
- #include <string>
- #include <vector>
--#include <sigc++/object.h>
-+#include <sigc++/trackable.h>
- 
- class wxListCtrl;
- class wxSpinCtrl;
diff --git a/audio/sooperlooper/sooperlooper.SlackBuild b/audio/sooperlooper/sooperlooper.SlackBuild
index 43f361f97e..8030542ea8 100644
--- a/audio/sooperlooper/sooperlooper.SlackBuild
+++ b/audio/sooperlooper/sooperlooper.SlackBuild
@@ -6,10 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20170622 bkw: fix build on -current, BUILD=3
+# 20201104 bkw: update for v1.7.6. The wxPython (wx 2.8) build is
+# currently broken. Temporarily disabled, but I dunno if upstream
+# will fix it (may not care about 2.8 any longer).
 
-# 20150514 bkw:
-# - update for v1.7.3
+# 20201028 bkw: update for v1.7.4. patches/* removed, no longer needed.
+# 20170622 bkw: fix build on -current, BUILD=3
+# 20150514 bkw: update for v1.7.3
 
 # 20140910 bkw:
 # - update for v1.7.2
@@ -18,8 +21,8 @@
 # - add option to build against wxGTK3
 
 PRGNAM=sooperlooper
-VERSION=${VERSION:-1.7.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.7.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -52,12 +55,14 @@ fi
 set -e
 
 # We can't trust the /usr/bin/wx-config symlink.
-# Find the correct wx-config, if it exists. User can override by setting WXVER
-# in the env, or by setting WXCONFIG to the full path.
-WXVER=${WXVER:-2.8}
-WXMAYBE="$( ls /usr/lib$LIBDIRSUFFIX/wx/config/*-$WXVER 2>/dev/null | head -1 )"
-WXCONFIG=${WXCONFIG:-$WXMAYBE}
-WXCONFIG=${WXCONFIG:-/usr/bin/wx-config}
+# Find the correct wx-config, if it exists.
+# 20201104 bkw: in 1.7.6, the 2.8 build is broken, it's 3.0 or nothing.
+WXVER=3.0
+WXCONFIG="$( ls /usr/lib$LIBDIRSUFFIX/wx/config/*-$WXVER 2>/dev/null | head -1 )"
+if [ ! -x "$WXCONFIG" ]; then
+  echo "*** $0: can't find wxGTK 3.0.x installation (2.8 not supported)" 1>&2
+  exit 1
+fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -66,20 +71,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# allow building with wx 3.0, using a patch from Debian
-[ "$WXVER" = "3.0" ] && patch -p1 < $CWD/patches/04-build_with_wx_30.patch
-
-# build against libsigc++ 2.x. can't remember where I found this patch.
-patch -p2 < $CWD/patches/libsigc.patch
-
-# another Deb patch, need for -current's newer sigc++ (does no harm on 14.2)
-patch -p1 < $CWD/patches/06-use_sigc_bind.patch
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Note: the CFLAGS are actually ignored here. Oh well.
 CFLAGS="$SLKCFLAGS" \
@@ -98,9 +91,9 @@ CPPFLAGS="-std=c++11" \
 make
 make install DESTDIR=$PKG
 
-# 'make install-strip' in 1.7.0 fails to install the slconsole and slregister
-# binaries. Rather than plumb the murky depths of autotools, I'll just
-# do it manually.
+# 'make install-strip' in 1.7.0 fails to strip the slconsole
+# and slregister binaries. Rather than plumb the murky depths of
+# autotools, I'll just do it manually.
 strip $PKG/usr/bin/*
 
 # Man pages, desktop, icon borrowed from Debian (thanks!)
diff --git a/audio/sooperlooper/sooperlooper.info b/audio/sooperlooper/sooperlooper.info
index fecab263d8..878390a8f2 100644
--- a/audio/sooperlooper/sooperlooper.info
+++ b/audio/sooperlooper/sooperlooper.info
@@ -1,10 +1,10 @@
 PRGNAM="sooperlooper"
-VERSION="1.7.3"
+VERSION="1.7.6"
 HOMEPAGE="http://essej.net/sooperlooper/"
-DOWNLOAD="http://essej.net/sooperlooper/sooperlooper-1.7.3.tar.gz"
-MD5SUM="9a841cbaf2b4707174232ea3ce01b0f2"
+DOWNLOAD="http://essej.net/sooperlooper/sooperlooper-1.7.6.tar.gz"
+MD5SUM="56d5b33dcfc58bb436f0f1652121deff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack liblo rubberband wxPython"
+REQUIRES="jack liblo rubberband wxGTK3"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/sunvox/sunvox.SlackBuild b/audio/sunvox/sunvox.SlackBuild
index 99ce5d4447..34df418a94 100644
--- a/audio/sunvox/sunvox.SlackBuild
+++ b/audio/sunvox/sunvox.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sunvox
-VERSION=${VERSION:-1.9.4}
+VERSION=${VERSION:-1.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,7 +44,7 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-install -d ${PKG}/usr/{bin,doc,share/{${PRGNAM}/instruments/,${PRGNAM}/effects/,${PRGNAM}/examples/,${PRGNAM}/docs/,${PRGNAM}/icon/,applications/}}
+install -d ${PKG}/usr/{bin,doc,share/{${PRGNAM}/instruments/,${PRGNAM}/effects/,${PRGNAM}/examples/,${PRGNAM}/docs/,${PRGNAM}/curves/,${PRGNAM}/icon/,applications/}}
 
 cd $TMP
 rm -rf $PRGNAM
@@ -70,7 +70,7 @@ fi
 install -Dm644 $CWD/sunvox.desktop $PKG/usr/share/applications/
 install -Dm644 $CWD/sunvox.png $PKG/usr/share/sunvox/icon/
 
-for dir in instruments effects examples docs ; do
+for dir in instruments effects examples docs curves ; do
   cd "$TMP/$PRGNAM/$dir/"
   find . -type d -exec install -d "$PKG/usr/share/$PRGNAM/${dir}/"{} \;
   find . -type f -exec install -Dm644 {,"$PKG/usr/share/$PRGNAM/${dir}/"}{} \;
diff --git a/audio/sunvox/sunvox.info b/audio/sunvox/sunvox.info
index a87db3ffdb..2e30268c76 100644
--- a/audio/sunvox/sunvox.info
+++ b/audio/sunvox/sunvox.info
@@ -1,8 +1,8 @@
 PRGNAM="sunvox"
-VERSION="1.9.4"
+VERSION="1.9.6"
 HOMEPAGE="http://www.warmplace.ru/soft/sunvox/"
-DOWNLOAD="http://www.warmplace.ru/soft/sunvox/sunvox-1.9.4c.zip"
-MD5SUM="e75b186ba163bdefc388b65c5eb82c0a"
+DOWNLOAD="http://www.warmplace.ru/soft/sunvox/sunvox-1.9.6c.zip"
+MD5SUM="8c01d68f4f3917013c99b1a02e2c65f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/synthv1/synthv1.SlackBuild b/audio/synthv1/synthv1.SlackBuild
index e1d0f2ff32..1196fe0b5b 100644
--- a/audio/synthv1/synthv1.SlackBuild
+++ b/audio/synthv1/synthv1.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201106 bkw: update for v0.9.18
 # 20200114 bkw: update for v0.9.12
 # 20191210 bkw: update for v0.9.11, document optional liblo dep, have slack-desc
 #               tell user whether or not optional deps are included.
@@ -21,7 +22,7 @@
 # 20170324 bkw: updated for v0.8.1
 
 PRGNAM=synthv1
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.9.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,6 +65,11 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# This thing can't be told to use qmake-qt5, and keeps choking on
+# /usr/bin/qmake. The --with-qt option doesn't help, only putting
+# qt5's bin/ before /usr/bin in $PATH will do.
+export PATH=/usr/lib$LIBDIRSUFFIX/qt5/bin:$PATH
+
 LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -114,8 +120,8 @@ make install DESTDIR=$PKG
 # block!) and ship only the UTF-8 man page. For now, include both,
 # to be -current-friendly.
 
-mkdir -p $PKG/usr/man/fr/man1 $PKG/usr/man/fr.UTF-8/man1
-mv $PKG/usr/man/man1/$PRGNAM.fr.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/man/fr.UTF-8/man1
+mv $PKG/usr/man/fr/man1/$PRGNAM.1.gz $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz
 zcat $PKG/usr/man/fr.UTF-8/man1/$PRGNAM.1.gz | \
   iconv -f UTF-8 -t ISO-8859-1 | \
   gzip -9c \
diff --git a/audio/synthv1/synthv1.info b/audio/synthv1/synthv1.info
index 470c1db71d..988bb1a96a 100644
--- a/audio/synthv1/synthv1.info
+++ b/audio/synthv1/synthv1.info
@@ -1,8 +1,8 @@
 PRGNAM="synthv1"
-VERSION="0.9.12"
+VERSION="0.9.18"
 HOMEPAGE="https://synthv1.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/synthv1/synthv1/0.9.12/synthv1-0.9.12.tar.gz"
-MD5SUM="a2840bafb8253c7a898066d21e479698"
+DOWNLOAD="https://downloads.sourceforge.net/project/synthv1/synthv1/0.9.18/synthv1-0.9.18.tar.gz"
+MD5SUM="81b45cbb00dfb332edfa0c1642683ad7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack qt5"
diff --git a/audio/tauonmb/README b/audio/tauonmb/README
new file mode 100644
index 0000000000..2ec6049609
--- /dev/null
+++ b/audio/tauonmb/README
@@ -0,0 +1,9 @@
+Tauon music box is a modern streamlined music player with a minimal
+interface that's packed with features! An emphasis on playlists and
+direct file importing puts you in control of your music collection.
+Uses GStreamer for playback.
+
+Special thanks to Reza Talebi who helped me for porting this player to
+Slackware.
+
+By ~red
diff --git a/audio/tauonmb/doinst.sh b/audio/tauonmb/doinst.sh
new file mode 100644
index 0000000000..a66207c787
--- /dev/null
+++ b/audio/tauonmb/doinst.sh
@@ -0,0 +1,21 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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
+
+if [ -e /usr/bin/tauonmb ]; then
+    chmod +x /usr/bin/tauonmb
+fi
+
+if [ -e /opt/tauon-music-box/tauonmb.sh ]; then
+    chmod +x /opt/tauon-music-box/tauonmb.sh
+fi
diff --git a/audio/tauonmb/slack-desc b/audio/tauonmb/slack-desc
new file mode 100644
index 0000000000..419b9bca70
--- /dev/null
+++ b/audio/tauonmb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+tauonmb: tauonmb (TauonMusicBox Player)
+tauonmb:
+tauonmb: Tauon music box is a modern streamlined music player with a minimal
+tauonmb: interface that's packed with features! An emphasis on playlists and
+tauonmb: direct file importing puts you in control of your music collection.
+tauonmb: Uses GStreamer for playback.
+tauonmb:
+tauonmb:
+tauonmb:
+tauonmb: Project URL: https://tauonmusicbox.rocks/
+tauonmb: GitHub URL: https://github.com/Taiko2k/TauonMusicBox/
diff --git a/network/dissenter-browser/dissenter-browser.SlackBuild b/audio/tauonmb/tauonmb.SlackBuild
index 7eaedda22e..7580fe0b37 100644
--- a/network/dissenter-browser/dissenter-browser.SlackBuild
+++ b/audio/tauonmb/tauonmb.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for dissenter-browser
+# Slackware build script for tauonmb
 
-# Copyright 2019 Donald Cooley South Haven, Indiana USA
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=dissenter-browser
-VERSION=${VERSION:-1.5.114}
+PRGNAM=tauonmb
+VERSION=${VERSION:-6.5.4}
+SRCNAM=TauonMusicBox
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -31,7 +32,7 @@ if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    *) ARCH=$( uname -m ) ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -40,44 +41,35 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Abort build if architecture is not 64-bit.
-if [ "$ARCH" != "x86_64" ]; then
-  echo "$ARCH is not supported."
-  exit 1
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-rpm2cpio < $CWD/${PRGNAM}-${VERSION}-${BUILD}.${ARCH}.rpm | cpio -imdv
+rm -rf $SRCNAM-$VERSION
+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 \
--o -perm 511 \) -exec chmod 755 {} \; -o \
+ -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 {} \;
-
-cp -ap usr opt $PKG/
-
-# Slackware doesn't ship a GNOME desktop so I don't see any reason for gnome-control-center
-rm -rf $PKG/usr/share/gnome-control-center
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Move icon into place
-mkdir -p $PKG/usr/share/pixmaps
-cp opt/dissenter.com/dissenter/*.xpm $PKG/usr/share/pixmaps/dissenter-browser.xpm
+mkdir -p $PKG/opt/tauon-music-box $PKG/usr/bin
+mv * $PKG/opt/tauon-music-box
+cp $PKG/opt/tauon-music-box/extra/tauonmb.sh $PKG/opt/tauon-music-box/tauonmb.sh
 
-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/share/applications
+cp $CWD/tauonmb.desktop $PKG/usr/share/applications
 
-rm -rf $PKG/usr/lib
+mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
+cp $PKG/opt/tauon-music-box/assets/icon-128.png $PKG/usr/share/icons/hicolor/128x128/apps/tauonmb.png
 
-# Place man page(s) where The Man likes 'em
-mv $PKG/usr/share/man $PKG/usr/man
+(
+cd $PKG/usr/bin
+ln -s /opt/tauon-music-box/extra/tauonmb.sh ./tauonmb
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -87,4 +79,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 -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/tauonmb/tauonmb.desktop b/audio/tauonmb/tauonmb.desktop
new file mode 100644
index 0000000000..fbaaebc307
--- /dev/null
+++ b/audio/tauonmb/tauonmb.desktop
@@ -0,0 +1,39 @@
+[Desktop Action Next]
+Exec=/opt/tauon-music-box/tauonmb.sh --no-start --next
+Name=Next Track
+
+[Desktop Action PlayPause]
+Exec=/opt/tauon-music-box/tauonmb.sh --no-start --play-pause
+Name=Play/Pause
+
+[Desktop Action Previous]
+Exec=/opt/tauon-music-box/tauonmb.sh --no-start --previous
+Name=Previous Track
+
+[Desktop Entry]
+Actions=PlayPause;Previous;Next
+Categories=AudioVideo;Player;Audio;
+Comment[en_GB]=Ultra player for your music collection
+Comment=Ultra player for your music collection
+Comment[de]=Ultra Player für deine Musiksammlung
+Comment[ja]=音楽コレクション�ウルトラプレーヤー
+Exec=/opt/tauon-music-box/tauonmb.sh %U
+GenericName[en_GB]=Audio Player
+GenericName=Audio Player
+GenericName[de]=Musik-Player
+GenericName[ja]=音楽プレイヤー
+GenericName[zh_CN]=音�播放器
+Icon=/opt/tauon-music-box/assets/v4-a.png
+MimeType=x-content/audio-player;audio/x-wav;audio/x-wav;audio/x-vorbis+ogg;audio/x-tta;audio/x-tta;audio/x-scpls;audio/x-scpls;audio/x-opus+ogg;audio/x-mpegurl;audio/x-ape;audio/ogg;audio/ogg;audio/mpeg;audio/mpeg;audio/mp4;audio/mp4;audio/flac;audio/flac;application/ogg;application/ogg;
+Name[en_GB]=Tauon Music Box
+Name=Tauon Music Box
+Path=
+StartupNotify=false
+StartupWMClass=Tauon Music Box
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/audio/tauonmb/tauonmb.info b/audio/tauonmb/tauonmb.info
new file mode 100644
index 0000000000..d88056e24d
--- /dev/null
+++ b/audio/tauonmb/tauonmb.info
@@ -0,0 +1,10 @@
+PRGNAM="tauonmb"
+VERSION="6.5.4"
+HOMEPAGE="https://tauonmusicbox.rocks/"
+DOWNLOAD="https://github.com/Taiko2k/TauonMusicBox/archive/v6.5.4/TauonMusicBox-6.5.4.tar.gz"
+MD5SUM="ee1e7cb7a039431ecf9b0b185ac10852"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-tekore python3-stagger python3-pysdl2 python3-pypresence python3-pylyrics python3-pillow python3-pulsectl python3-plexapi python3-isounidecode python3-hsaudiotag3k pylast setproctitle send2trash musicbrainzngs"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/audio/vimpc/vimpc.SlackBuild b/audio/vimpc/vimpc.SlackBuild
index 4ed652fef1..a6fb15156c 100644
--- a/audio/vimpc/vimpc.SlackBuild
+++ b/audio/vimpc/vimpc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vimpc
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 PRGNAM=vimpc
 VERSION=${VERSION:-0.09.1}
diff --git a/audio/vimpc/vimpc.info b/audio/vimpc/vimpc.info
index 45b2e7cdae..e210b1a6c5 100644
--- a/audio/vimpc/vimpc.info
+++ b/audio/vimpc/vimpc.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmpdclient"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/audio/vmpk/vmpk.SlackBuild b/audio/vmpk/vmpk.SlackBuild
index 2c3a54f21a..bc98e70985 100644
--- a/audio/vmpk/vmpk.SlackBuild
+++ b/audio/vmpk/vmpk.SlackBuild
@@ -3,13 +3,13 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=vmpk
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -20,8 +20,8 @@ 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"
@@ -40,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/audio/vmpk/vmpk.info b/audio/vmpk/vmpk.info
index 1ee631be38..0ac857f908 100644
--- a/audio/vmpk/vmpk.info
+++ b/audio/vmpk/vmpk.info
@@ -1,10 +1,10 @@
 PRGNAM="vmpk"
-VERSION="0.5.1"
+VERSION="0.7.1"
 HOMEPAGE="http://vmpk.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/vmpk/vmpk-0.5.1.tar.bz2"
-MD5SUM="07e376936c38c7c244374ff9ddca6a72"
+DOWNLOAD="http://downloads.sourceforge.net/vmpk/vmpk-0.7.1.tar.bz2"
+MD5SUM="75f43b19ae379e282e1db67f21028836"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack"
+REQUIRES="jack drumstick"
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
diff --git a/audio/zita-ajbridge/zita-ajbridge.SlackBuild b/audio/zita-ajbridge/zita-ajbridge.SlackBuild
index 1b4fa67008..fc485d046b 100644
--- a/audio/zita-ajbridge/zita-ajbridge.SlackBuild
+++ b/audio/zita-ajbridge/zita-ajbridge.SlackBuild
@@ -6,13 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201104 bkw: updated for v0.8.4
 # 20191202 bkw: updated for v0.8.2
 # 20170122 bkw: updated for v0.7.0
 # 20151105 bkw: updated for v0.6.0, which now has man pages, so
 # got rid of the ones I wrote.
 
 PRGNAM=zita-ajbridge
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/zita-ajbridge/zita-ajbridge.info b/audio/zita-ajbridge/zita-ajbridge.info
index 47aa551c14..22b14b97f6 100644
--- a/audio/zita-ajbridge/zita-ajbridge.info
+++ b/audio/zita-ajbridge/zita-ajbridge.info
@@ -1,8 +1,8 @@
 PRGNAM="zita-ajbridge"
-VERSION="0.8.2"
+VERSION="0.8.4"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-0.8.2.tar.bz2"
-MD5SUM="7819cf53deff4a5877a1c17d6d18d825"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-0.8.4.tar.bz2"
+MD5SUM="d5fe3491445654dbe599d5af8c63e5e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack zita-resampler zita-alsa-pcmi"
diff --git a/business/ledger/CMakeLists.txt.patch b/business/ledger/CMakeLists.txt.patch
new file mode 100644
index 0000000000..2f292ffb81
--- /dev/null
+++ b/business/ledger/CMakeLists.txt.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15cb7ef90..bb8bfa2dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@ set(Ledger_TEST_TIMEZONE "America/Chicago")
+
+ # Point CMake at any custom modules we may ship
+ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+-if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
++if ((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.7.0") AND (${CMAKE_VERSION} VERSION_LESS "3.16.0"))
+   # use backported module from 3.15 (introduced 3.12) to support older versions of cmake
+   list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/python-backport")
+ endif()
\ No newline at end of file
diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild
index 04a1c1b7aa..89b8bc095e 100644
--- a/business/ledger/ledger.SlackBuild
+++ b/business/ledger/ledger.SlackBuild
@@ -4,7 +4,7 @@
 # Updated by simotrone (simotrone at gmail dot com)
 
 PRGNAM=ledger
-VERSION=${VERSION:-3.1.3}
+VERSION=${VERSION:-3.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,8 +36,16 @@ 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 {} \;
 
-./acprep --prefix=/usr update
-make install DESTDIR=$PKG
+patch -p1 < $CWD/CMakeLists.txt.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    ..
+  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
diff --git a/business/ledger/ledger.info b/business/ledger/ledger.info
index cf83d5a190..49666f11fc 100644
--- a/business/ledger/ledger.info
+++ b/business/ledger/ledger.info
@@ -1,8 +1,8 @@
 PRGNAM="ledger"
-VERSION="3.1.3"
+VERSION="3.2.1"
 HOMEPAGE="https://ledger-cli.org"
-DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.3/ledger-3.1.3.tar.gz"
-MD5SUM="6d9b8293f5f909aab4b95cffa2b3c120"
+DOWNLOAD="https://github.com/ledger/ledger/archive/v3.2.1/ledger-3.2.1.tar.gz"
+MD5SUM="4f82445bf8a39010e51b6367cf82c6d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="utfcpp"
diff --git a/business/stansoft/README b/business/stansoft/README
index f320703acd..49faa20204 100644
--- a/business/stansoft/README
+++ b/business/stansoft/README
@@ -1,18 +1,17 @@
-Stansoft is Linux financial accounting software for business. It
-uses a PostgreSQL database, which is included. You can optionally
-use an IBM Informix Innovator-C database, which can be downloaded
-free of charge from IBM. There is no limit on the number of users
-per installation, which allows for scalability from small to large
-companies. The user interface is ncurses / terminal based to optimize
-data entry efficiency. It can be run locally or deployed remotely on a
-virtual cloud server.
+Stansoft is Linux financial accounting software for business. It uses a
+PostgreSQL database, which is included. You can optionally use an IBM
+Informix Innovator-C database, which can be downloaded free of charge
+from IBM. There is no limit on the number of users per installation,
+which allows for scalability from small to large companies. The user
+interface is ncurses / terminal based to optimize data entry efficiency.
+It can be run locally or deployed remotely on a virtual cloud server.
 
 You must have a stansoft user and group to run this script:
 # groupadd -g 325 stansoft
 # useradd -u 325 -g 325 -c \"Stansoft user\" -s /bin/bash stansoft
 
-If you wish to use IBM Informix, please add an informix user and group
-as well:
+If you wish to use IBM Informix, please add informix user and group as
+well
 # groupadd -g 326 informix
 # useradd -u 326 -g 326 -c \"Informix user\" -s /bin/bash informix
 
diff --git a/business/stansoft/stansoft.SlackBuild b/business/stansoft/stansoft.SlackBuild
index 6efc30d530..2a487d35cd 100644
--- a/business/stansoft/stansoft.SlackBuild
+++ b/business/stansoft/stansoft.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=stansoft
-VERSION=${VERSION:-7.19}
+VERSION=${VERSION:-7.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/business/stansoft/stansoft.info b/business/stansoft/stansoft.info
index 8484e35030..ab7d1df48d 100644
--- a/business/stansoft/stansoft.info
+++ b/business/stansoft/stansoft.info
@@ -1,10 +1,10 @@
 PRGNAM="stansoft"
-VERSION="7.19"
+VERSION="7.21"
 HOMEPAGE="http://www.stansoft.org"
-DOWNLOAD="http://download.stansoft.org/files/stansoft-v7.19-x86.tar.bz2"
-MD5SUM="6eacb817ae4a84c476f4539f1135417a"
-DOWNLOAD_x86_64="http://download.stansoft.org/files/stansoft-v7.19-x86_64.tar.bz2"
-MD5SUM_x86_64="051a8f6987810fd658e9cee594a9f013"
+DOWNLOAD="http://download.stansoft.org/files/stansoft-v7.21-x86.tar.bz2"
+MD5SUM="187c64bc05deb0baed8b9bc3a3e3c6d5"
+DOWNLOAD_x86_64="http://download.stansoft.org/files/stansoft-v7.21-x86_64.tar.bz2"
+MD5SUM_x86_64="bacb9ed1cfe5f6f4466e118c953ae6ad"
 REQUIRES=""
 MAINTAINER="Stansoft"
 EMAIL="info@stansoft.org"
diff --git a/desktop/ClipboardViewer/ClipboardViewer.info b/desktop/ClipboardViewer/ClipboardViewer.info
index d62a62232d..d3d81ed720 100644
--- a/desktop/ClipboardViewer/ClipboardViewer.info
+++ b/desktop/ClipboardViewer/ClipboardViewer.info
@@ -1,6 +1,6 @@
 PRGNAM="ClipboardViewer"
 VERSION="0.1"
-HOMEPAGE="http://keithhedger.freetzi.com/index.html"
+HOMEPAGE="http://web.archive.org/web/20150112013411/http://keithhedger.hostingsiteforfree.com/pages/clipviewer/clip.html"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/121667-ClipboardViewer-0.1.tar.gz"
 MD5SUM="52b6492adc517da2138fb3f1c90b1f43"
 DOWNLOAD_x86_64=""
diff --git a/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild b/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
index 2956c90b1a..51d5c467e5 100644
--- a/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
+++ b/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
@@ -23,14 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Qogir-icon-theme
-VERSION=${VERSION:-20200622}
+SRCVER=${SRCVER:-2020-11-22}
+VERSION=${VERSION:-$(echo $SRCVER | tr -d -)}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
 
-SRCVER=${SRCVER:-2020-06-22}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
diff --git a/desktop/Qogir-icon-theme/Qogir-icon-theme.info b/desktop/Qogir-icon-theme/Qogir-icon-theme.info
index 21c8ccdfe4..eb7e6e4302 100644
--- a/desktop/Qogir-icon-theme/Qogir-icon-theme.info
+++ b/desktop/Qogir-icon-theme/Qogir-icon-theme.info
@@ -1,8 +1,8 @@
 PRGNAM="Qogir-icon-theme"
-VERSION="20200622"
+VERSION="20201122"
 HOMEPAGE="https://github.com/vinceliuice/Qogir-icon-theme"
-DOWNLOAD="https://github.com/vinceliuice/Qogir-icon-theme/archive/2020-06-22/Qogir-icon-theme-2020-06-22.tar.gz"
-MD5SUM="52705e1cbc3f6e1f62126ec0f4c12f3e"
+DOWNLOAD="https://github.com/vinceliuice/Qogir-icon-theme/archive/2020-11-22/Qogir-icon-theme-2020-11-22.tar.gz"
+MD5SUM="1551db25ff324df04453ddd6f3368003"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/Surfn/Surfn.SlackBuild b/desktop/Surfn/Surfn.SlackBuild
index a4896dc5c7..141fe6cdca 100644
--- a/desktop/Surfn/Surfn.SlackBuild
+++ b/desktop/Surfn/Surfn.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Surfn
 
-# Copyright 2018-2019 Leonardo Citrolo, Italy
+# Copyright 2018-2020 Leonardo Citrolo, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Surfn
-VERSION=${VERSION:-9.7.1}
+SRCVER=${SRCVER:-20.12-7}
+VERSION=${VERSION:-$(echo $SRCVER | tr - .)}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,20 +40,27 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+# It's better not to be verbose, there's an awful lot of files to extract
+echo "Extracting files..."
+tar xf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 
 mkdir -p $PKG/usr/share/icons
 cp -a surfn-icons/$PRGNAM* $PKG/usr/share/icons
 find $PKG/usr/share/icons \
-  \( -name create-new-icon-theme.cache.sh -o -name icon-theme.cache \) -exec rm -f {} \;
+  \( -name CREDITS \
+  -o -name LICENSE \
+  -o -name create-new-icon-theme.cache.sh \
+  -o -name icon-theme.cache \) -exec rm -f {} \;
+rm -f $PKG/usr/share/icons/Surfn/changelog \
+  $PKG/usr/share/icons/Surfn/LICENSE.txt
 find $PKG/usr/share/icons -type d -exec chmod 755 {} \;
 find $PKG/usr/share/icons -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md \
+cp -a surfn-icons/Surfn/{changelog,CREDITS,LICENSE.txt} README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/Surfn/Surfn.info b/desktop/Surfn/Surfn.info
index 365c765a17..a8415d2672 100644
--- a/desktop/Surfn/Surfn.info
+++ b/desktop/Surfn/Surfn.info
@@ -1,8 +1,8 @@
 PRGNAM="Surfn"
-VERSION="9.7.1"
+VERSION="20.12.7"
 HOMEPAGE="https://github.com/erikdubois/Surfn"
-DOWNLOAD="https://github.com/erikdubois/Surfn/archive/9.7.1/Surfn-9.7.1.tar.gz"
-MD5SUM="de17cb11336eb9ed647734a25b6ff321"
+DOWNLOAD="https://github.com/erikdubois/Surfn/archive/20.12-7/Surfn-20.12-7.tar.gz"
+MD5SUM="e9a0311e36c591118a4a968a9371e24d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.info b/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.info
index d9046d1190..00bd9cc8e2 100644
--- a/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.info
+++ b/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.info
@@ -1,6 +1,6 @@
 PRGNAM="Xfce-Theme-Manager"
 VERSION="0.3.4"
-HOMEPAGE="http://keithhedger.hostingsiteforfree.com"
+HOMEPAGE="http://web.archive.org/web/20140723200425/http://keithhedger.hostingsiteforfree.com/screenshots/xfcethemescrshots/metatab.png"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/xfce-theme-manager-0.3.4.tar.gz"
 MD5SUM="763fba31d893afef551d63d47a43a9dd"
 DOWNLOAD_x86_64=""
diff --git a/desktop/anki/anki.info b/desktop/anki/anki.info
index f5a1e01478..960e5a995f 100644
--- a/desktop/anki/anki.info
+++ b/desktop/anki/anki.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://apps.ankiweb.net/downloads/archive/anki-2.1.16-source.tgz"
 MD5SUM="fb79abdae4c6cc10d5d8c5bef0c059f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQtWebEngine send2trash python3-certifi python-requests decorator Markdown python3-jsonschema python-distro BeautifulSoup4"
+REQUIRES="python3-PyQtWebEngine send2trash python-certifi python-requests decorator Markdown python3-jsonschema python-distro BeautifulSoup4"
 MAINTAINER="Timothy Pollard"
 EMAIL="sbo@timp.com.au"
diff --git a/desktop/autorandr/README b/desktop/autorandr/README
index 8a7fa388e3..6506aed846 100644
--- a/desktop/autorandr/README
+++ b/desktop/autorandr/README
@@ -2,3 +2,13 @@ autorandr is a Python program that provides command-line utilities
 to manage display configuration. In addition, it has built in udev
 configuration files to detect monitor changes, bash-completion, xdg
 autostart scripts and pm-utils helpers.
+
+You can optionally specify a TARGETS option to select which
+components to build and install. The manpage is always necessary.
+
+For example:
+
+TARGETS="manpage autorandr launcher udev pmutils"
+
+The available options are manpage, autorandr, launcher, udev,
+pmutils, autostart_config, bash_completion.
diff --git a/desktop/autorandr/autorandr.SlackBuild b/desktop/autorandr/autorandr.SlackBuild
index dcf8055885..ff53d4584c 100644
--- a/desktop/autorandr/autorandr.SlackBuild
+++ b/desktop/autorandr/autorandr.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=autorandr
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,10 @@ 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 {} \;
 
+[ -n "$TARGETS" ] && TARGETS="TARGETS=$TARGETS"
+
 make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
-make install PREFIX=/usr MANDIR=/usr/man/man1 DESTDIR=$PKG
+make install $TARGETS PREFIX=/usr MANDIR=/usr/man/man1 DESTDIR=$PKG
 
 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
diff --git a/desktop/autorandr/autorandr.info b/desktop/autorandr/autorandr.info
index 3fa6721f17..e15315819e 100644
--- a/desktop/autorandr/autorandr.info
+++ b/desktop/autorandr/autorandr.info
@@ -1,8 +1,8 @@
 PRGNAM="autorandr"
-VERSION="1.10.1"
+VERSION="1.11"
 HOMEPAGE="https://github.com/phillipberndt/autorandr"
-DOWNLOAD="https://github.com/phillipberndt/autorandr/archive/1.10.1/autorandr-1.10.1.tar.gz"
-MD5SUM="7155aae15fd6b2cddaff43b6103a4412"
+DOWNLOAD="https://github.com/phillipberndt/autorandr/archive/1.11/autorandr-1.11.tar.gz"
+MD5SUM="39308bf22013fb576336e4c98487fef2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/buku/buku.SlackBuild b/desktop/buku/buku.SlackBuild
index e8906c072e..de94fa02d2 100644
--- a/desktop/buku/buku.SlackBuild
+++ b/desktop/buku/buku.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=buku
-VERSION=${VERSION:-4.4}
+VERSION=${VERSION:-4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/buku/buku.info b/desktop/buku/buku.info
index 17c765d70c..f5ff78da4b 100644
--- a/desktop/buku/buku.info
+++ b/desktop/buku/buku.info
@@ -1,10 +1,10 @@
 PRGNAM="buku"
-VERSION="4.4"
+VERSION="4.5"
 HOMEPAGE="https://github.com/jarun/buku"
-DOWNLOAD="https://github.com/jarun/buku/archive/v4.4/buku-4.4.tar.gz"
-MD5SUM="20713d04d072f3770c813263bb611fed"
+DOWNLOAD="https://github.com/jarun/buku/archive/v4.5/buku-4.5.tar.gz"
+MD5SUM="efbe08f2bef0725c20fb236d673a03ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-urllib3 BeautifulSoup4 cryptography html5lib python3-certifi"
+REQUIRES="python-urllib3 BeautifulSoup4 cryptography html5lib python-certifi"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/desktop/bukubrow/bukubrow.SlackBuild b/desktop/bukubrow/bukubrow.SlackBuild
index 9e3fd28f29..bc663b30dc 100644
--- a/desktop/bukubrow/bukubrow.SlackBuild
+++ b/desktop/bukubrow/bukubrow.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bukubrow
 
-# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=bukubrow
 SRCNAM=bukubrow-host
-VERSION=${VERSION:-5.1.0}
+VERSION=${VERSION:-5.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/bukubrow/bukubrow.info b/desktop/bukubrow/bukubrow.info
index 4f1f959b7b..ec839c21d5 100644
--- a/desktop/bukubrow/bukubrow.info
+++ b/desktop/bukubrow/bukubrow.info
@@ -1,130 +1,154 @@
 PRGNAM="bukubrow"
-VERSION="5.1.0"
+VERSION="5.2.0"
 HOMEPAGE="https://github.com/SamHH/bukubrow-host"
-DOWNLOAD="https://github.com/SamHH/bukubrow-host/archive/v5.1.0/bukubrow-host-5.1.0.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/argon2rs/argon2rs-0.2.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2-rfc/blake2-rfc-0.2.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.25.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.5.crate \
+DOWNLOAD="https://github.com/SamHH/bukubrow-host/archive/v5.2.0/bukubrow-host-5.2.0.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ahash/ahash-0.4.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bumpalo/bumpalo-3.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.67.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-3.0.0-beta.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap_derive/clap_derive-3.0.0-beta.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-3.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fallible-iterator/fallible-iterator-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fallible-streaming-iterator/fallible-streaming-iterator-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libsqlite3-sys/libsqlite3-sys-0.15.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lru-cache/lru-cache-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/numtoa/numtoa-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_os/rand_os-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.40.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rusqlite/rusqlite-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.79.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.79.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.30.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.10.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.40.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/webbrowser/webbrowser-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/widestring/widestring-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.16.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hashlink/hashlink-0.6.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/heck/heck-0.3.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/js-sys/js-sys-0.3.47.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.86.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libsqlite3-sys/libsqlite3-sys-0.20.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/os_str_bytes/os_str_bytes-2.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/platforms/platforms-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rusqlite/rusqlite-0.24.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.8.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.123.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.123.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.63.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.10.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.60.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.12.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-segmentation/unicode-segmentation-1.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.70.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.70.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.70.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.70.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen/wasm-bindgen-0.2.70.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/web-sys/web-sys-0.3.47.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/webbrowser/webbrowser-0.5.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/widestring/widestring-0.4.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.6.crate"
-MD5SUM="7427a6e088d0a5945a64249c45554194 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        e1efb9a37395a38bd80ccfc911d4a6e8 \
-        46a048c0b8b765bcbdc131e166410510 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        ba6e371a9a197673d52165be88cc3b64 \
-        9589900bcef3f72593483ce5b717fe3c \
-        e5767560aad375059c975285c07022c0 \
-        027635e453eccbfd0a2b02a440e334a6 \
-        e5ff029879cdacd29148cd31da1f0564 \
-        47b86728f2d479bd97148b8da4497027 \
-        097e0d2392a5e65f9471f7af7001940a \
-        135f6d6306e50606f0475ada50c33ce2 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
-        701334c674b3fc3ace74045e3a2fae50 \
-        030ff4289783a9bb97480dd12c3f366b \
-        402ff46c00c8c6d2e9b27de4e8e93dc4 \
-        6d780ab18da07be9ed423e7edfbcfd7e \
-        e8e663e88ee02ec47cfb984382cb62ae \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.8.0.crate"
+MD5SUM="cb23e8e4872be6ebd7fd513bca089c3c \
+        fe7079bf5cee07190293a2eb8ffe563b \
+        6ff474dd60c839a9c788844b7a42c72c \
+        c83252f91435a921e7e4434956010344 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        c6443ec8d007c729ba5482008d0c864d \
+        80a2c27647a6acb1890a3a7de8fded72 \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        8dcd8db8f0e4971b7c9b13c273ab8b10 \
+        06210e7277a768ca35f83a6fefa9e99b \
+        c0c854d9b92b342470c85564612651fb \
+        8637708206e07c0b9e726c7b2f4412d6 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        57b8c26cd0bfcda9d1555c8ce2d71f6e \
+        870b3aea5f4d987d8adb7b2afe222906 \
+        ec9751a4c0d35e7313e52ddb7147376b \
+        423c3b61f34b9b865899d1b14f5309d0 \
+        8b70009baf55df3c0eea3582883f148b \
+        3eaf0fcec214234d8b1f127ddf807ee8 \
         e43e22ba1741e5cfa00482591ae324c7 \
         7543e8639ad2e29866b522e20c35152a \
-        27260b46db6b9ac40318143d70a80ba3 \
-        7bebca3c6217218fb42f89544d1499db \
-        5524b53de0aad9352ca0d4d899f87046 \
-        7ab9526dd1d76fbad73ab535c28716a5 \
-        42f81584165177e35c3ab677fe5a3c72 \
-        d281b59288f72c10056097b190d0144e \
-        514a89ff59a9bf0671d7db4812725459 \
-        8a39d8bd95f15af0840d2049f0e78a37 \
-        bbda7e9c572f651774dfdb0006b9f085 \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        ec258ed7b78c959a921262150d47e001 \
-        0fb98687d43d7ffd5c1aa097a076f1e6 \
-        8cab41822d03dfa674870315308fa392 \
-        7058895bdca83bbda052d66b087f902e \
-        5acfdc8656212bce8df1bcc43db34c3d \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        7e94bf91e9faf1557da812a3444f23cc \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        d5a91ba6d74914190df5b355f891d6b1 \
-        7ee6c5a3fac9056475c231d31cff0b25 \
-        1d805df8d3022cb5bbe233d0a1898261 \
-        eb5f242e1152146eda805ada56599088 \
-        b492e0a70603c3903a44ec5cabd3ba21 \
-        9dafb7952c4c6ba2ebc82a05f110286c \
-        3b1280b17c2516528070bbeeda7a9bd5 \
-        4aa06cafa12c56ee1e0515f2d0430bf5 \
-        781d4ccf5d04c98fa02af207a9639249 \
-        68b01820b3e985acc694d7c437f0a5ca \
-        d155c08de6c18bd55639ffed629894b9 \
-        9f1f6e2fe9afbbcc351a7430962a7571 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        9775850c1cc8a4f209f2b6c03a6e700b \
-        d7c493ca4f84a7d50b53646421a37487 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        e75c0721667b6bc86472ecf7b286d9fc \
-        0eedbc32447f40b3045d6de3910b5415 \
-        7f899d29628cfd67b7a46eee83bf2115 \
-        85a67f6f40cf2df6e1f12791a2b1cf9a \
+        15d3113e5507c411419fa64f6b9d5349 \
+        58285dfb5134c5df5503066a20dc9d2c \
+        61c4162c014b9713b9777b45cb73f02a \
+        9fe760ab0dc374dd15c478e637a00f26 \
+        2c4bc5c16b345ce4d4bbf977577fab35 \
+        acd3ce35bdaa48ec384fcfec07c0f0dd \
+        4379362bf1be77d47a45c7223a01eead \
+        6851477dfee976137ed2986927ab628a \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        04f84e88732a1057a37b5d01c23eac1d \
+        62d14f43d8ca0029ad87ebc2ddfc9e0b \
+        40e508baeee8cdccbc471489b0f449ff \
+        fa3630e5867493e09296155763e4f4a0 \
+        1de020fbed6169e608ef14d79c687ee9 \
+        448bc61aee07661464d98da7660e9a1d \
+        153637f2b880cf957b1ee602d6e25b18 \
+        7d76a523677de261dda1b65d29a93c4e \
+        6a32bab57772c3a1146d599b65ffb0cb \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        3233400d1bc56e7c78d4d7564d8e5b74 \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        870008bba2e68db4988c31e511fbd9c4 \
+        10faa3e1252f94fb4353773d3cd8d1f6 \
+        29e548496d699fbd888e4a65ec2d1488 \
+        a69721c73263cd2040e1a5f120b03a6f \
+        e16bb0d9c46839fbf5d1a69673b00c4c \
+        6ec70075835fed0250bc4407f32d5928 \
+        fda2c98a814c843ac0ce3b6f43f59c3b \
+        e1b37f2526a1f0eed9c0bda62b8095ba \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        c72a927acc4cc7695ae9c73c19964a6f \
+        ebdff467249aa3dca005a441dc824236 \
+        5786032aa0136f31c53dd38375764e12 \
+        1e6fa2fdbe3b634693d08074df47a4ba \
+        4272c279b06b88f8b0ffce7109348e27 \
+        a51c43692084979295641a7ffba4b297 \
+        e17e2583e10c6947982de78aeae42a5c \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        8b01b016a9b6deebc1b43f296057efb5 \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
+        2cc9426e0128ea4fb5d0779389d39e61 \
+        0eba16186eb62d98f68a3a5959c350cd \
+        1b51876703f5aeb680ec9d68faa5b3a8 \
+        d31fa135641b7db9cfa4bbe2fe9d0db8 \
+        2a4ff1aee251cce2dabd454eb875b0ac \
+        4529db06be7b0b8d69837b6b090444f4 \
+        193368dc66153a9a0514b2914c9cfaa5 \
+        b76284441fb8fbd5dfbd9e450eb8acde \
         db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
-        40909511b3d0e2dba891f438715808d0"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        ab839ba7cdb06278c67f0ff9ad05ab61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/bumblebee-status/README b/desktop/bumblebee-status/README
new file mode 100644
index 0000000000..2b6483e3b2
--- /dev/null
+++ b/desktop/bumblebee-status/README
@@ -0,0 +1,20 @@
+bumblebee-status - a modular, theme-able status line generator for the i3 window manager.
+
+Focus is on:
+
+ease of use, sane defaults (no mandatory configuration file)
+easy creation of custom themes
+easy creation of custom modules
+
+Required i3wm version: 4.12+ (in earlier versions, blocks won't have background colors)
+
+Supported Python versions: 3.4, 3.5, 3.6, 3.7, 3.8, 3.9
+
+Supported FontAwesome version: 4 (free version of 5 doesn't include some of the icons)
+
+Available modules lists the dependencies (Python modules and external executables) for each module.
+If you are not using a module, you don't need the dependencies.
+
+To get a list, do :
+$ bumblebee-status -l themes
+$ bumblebee-status -l modules
diff --git a/desktop/bumblebee-status/bumblebee-status.SlackBuild b/desktop/bumblebee-status/bumblebee-status.SlackBuild
new file mode 100644
index 0000000000..d629fc7ee2
--- /dev/null
+++ b/desktop/bumblebee-status/bumblebee-status.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackware build script for bumblebee-status
+
+# Copyright 2020 Tonus, France
+# 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=bumblebee-status
+VERSION=${VERSION:-2.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-02 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-02 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-02"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-${PRGNAM}
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+patch -p0 < $CWD/commit_7b1659a1b594cc49f8207a2858b499086cda27a8.patch
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.md docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/bumblebee-status/bumblebee-status.info b/desktop/bumblebee-status/bumblebee-status.info
new file mode 100644
index 0000000000..52b4308a2b
--- /dev/null
+++ b/desktop/bumblebee-status/bumblebee-status.info
@@ -0,0 +1,11 @@
+PRGNAM="bumblebee-status"
+VERSION="2.1.1"
+HOMEPAGE="https://github.com/tobi-wan-kenobi/bumblebee-status/"
+DOWNLOAD="https://github.com/tobi-wan-kenobi/bumblebee-status/archive/v2.1.1/bumblebee-status-2.1.1.tar.gz"
+MD5SUM="afe2f15135f6b5f44cd3ab99eebd6c21"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="i3 python3"
+MAINTAINER="Tonus"
+EMAIL="tonus1@gmail.com"
+
diff --git a/desktop/bumblebee-status/commit_7b1659a1b594cc49f8207a2858b499086cda27a8.patch b/desktop/bumblebee-status/commit_7b1659a1b594cc49f8207a2858b499086cda27a8.patch
new file mode 100644
index 0000000000..579c7a03fe
--- /dev/null
+++ b/desktop/bumblebee-status/commit_7b1659a1b594cc49f8207a2858b499086cda27a8.patch
@@ -0,0 +1,10 @@
+--- bumblebee-status-2.1.1/bumblebee_status/core/theme.py	2020-12-07 10:00:20.000000000 +0100
++++ bumblebee-status-2.1.1/bumblebee_status/core/theme.py.patched	2020-12-20 21:12:27.216695638 +0100
+@@ -17,6 +17,7 @@
+     os.path.join(THEME_BASE_DIR, "../../themes"),
+     os.path.expanduser("~/.config/bumblebee-status/themes"),
+     os.path.expanduser("~/.local/share/bumblebee-status/themes"),  # PIP
++    "/usr/share/bumblebee-status/themes",
+ ]
+ 
+ 
diff --git a/desktop/bumblebee-status/slack-desc b/desktop/bumblebee-status/slack-desc
new file mode 100644
index 0000000000..1f08f88138
--- /dev/null
+++ b/desktop/bumblebee-status/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+bumblebee-status: bumblebee-status (status line generator)
+bumblebee-status:
+bumblebee-status: bumblebee-status is a modular, theme-able status line generator
+bumblebee-status:
+bumblebee-status: for the i3 window manager
+bumblebee-status:
+bumblebee-status:
+bumblebee-status:
+bumblebee-status:
+bumblebee-status:
+bumblebee-status:
diff --git a/desktop/caffeine-ng/README b/desktop/caffeine-ng/README
index 3e3a614974..c069c054cc 100644
--- a/desktop/caffeine-ng/README
+++ b/desktop/caffeine-ng/README
@@ -1,7 +1,7 @@
-Caffeine is a little daemon that sits in your systray, and prevents the
-screensaver from showing up, or the system from going to sleep. It does
-so when an application is fullscreened (eg: youtube), or when you click
-on the systray icon (which you can do, when, eg: reading).
+Caffeine is a little daemon that sits in your systray, and prevents
+the screensaver from showing up, or the system from going to sleep. It
+does so when an application is fullscreened (eg: youtube), or when
+you click on the systray icon (which you can do, when, eg: reading).
 
 This is a fork of Caffeine 2.4, since later versions dropped support
 for the systray icon in favour of automatic detection of fullscreen
diff --git a/desktop/caffeine-ng/caffeine-ng.info b/desktop/caffeine-ng/caffeine-ng.info
index 87c6b7aefd..92a49a3e18 100644
--- a/desktop/caffeine-ng/caffeine-ng.info
+++ b/desktop/caffeine-ng/caffeine-ng.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/caffeine-ng/caffeine-ng/releases/download/v3.4.2/ca
 MD5SUM="f8a8504541585b499c66a53478c738c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dbus-python3 docopt pyewmh pygobject3-python3 pyxdg setproctitle wheel"
+REQUIRES="dbus-python3 docopt pyewmh pygobject3-python3 python3-six pyxdg setproctitle wheel"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/desktop/clipmenu/clipmenu.SlackBuild b/desktop/clipmenu/clipmenu.SlackBuild
index 44cd34628e..b87666bdb1 100644
--- a/desktop/clipmenu/clipmenu.SlackBuild
+++ b/desktop/clipmenu/clipmenu.SlackBuild
@@ -6,8 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw: updated for v6.2.0 (clipnotify stays at 1.0.2).
+
 PRGNAM=clipmenu
-VERSION=${VERSION:-6.1.0}
+VERSION=${VERSION:-6.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/clipmenu/clipmenu.info b/desktop/clipmenu/clipmenu.info
index 0191cd7fe8..06e0cf6450 100644
--- a/desktop/clipmenu/clipmenu.info
+++ b/desktop/clipmenu/clipmenu.info
@@ -1,9 +1,9 @@
 PRGNAM="clipmenu"
-VERSION="6.1.0"
+VERSION="6.2.0"
 HOMEPAGE="https://github.com/cdown/clipmenu/"
-DOWNLOAD="https://github.com/cdown/clipmenu/archive/6.1.0/clipmenu-6.1.0.tar.gz \
+DOWNLOAD="https://github.com/cdown/clipmenu/archive/6.2.0/clipmenu-6.2.0.tar.gz \
           https://github.com/cdown/clipnotify/archive/1.0.2/clipnotify-1.0.2.tar.gz"
-MD5SUM="87c856cb095a6b6107ff619205860517 \
+MD5SUM="ce5284e0ec3f256ffd30d4934e9cdb64 \
         fd384b9a04576fd55687faf289c3f31a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/cwm/cwm.SlackBuild b/desktop/cwm/cwm.SlackBuild
index 761905d29b..36db2c9006 100644
--- a/desktop/cwm/cwm.SlackBuild
+++ b/desktop/cwm/cwm.SlackBuild
@@ -23,6 +23,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201020 bkw: update for v6.7.
 # 20200221 bkw: update for v6.6.
 
 # 20180914 bkw:
@@ -33,7 +34,7 @@
 # 20180802 bkw: take over maintenance, no script changes.
 
 PRGNAM=cwm
-VERSION=${VERSION:-6.6}
+VERSION=${VERSION:-6.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/cwm/cwm.info b/desktop/cwm/cwm.info
index 433b44ea7b..81b2ea1202 100644
--- a/desktop/cwm/cwm.info
+++ b/desktop/cwm/cwm.info
@@ -1,8 +1,8 @@
 PRGNAM="cwm"
-VERSION="6.6"
-HOMEPAGE="https://github.com/chneukirchen/cwm"
-DOWNLOAD="https://github.com/chneukirchen/cwm/archive/v6.6/cwm-6.6.tar.gz"
-MD5SUM="9a6b62f86a95547765e4d663ebb2b2f9"
+VERSION="6.7"
+HOMEPAGE="https://github.com/leahneukirchen/cwm"
+DOWNLOAD="https://github.com/leahneukirchen/cwm/archive/v6.7/cwm-6.7.tar.gz"
+MD5SUM="3d6f20f90d6a05f3628b82625f1c3e77"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/dmenu2/README b/desktop/dmenu2/README
deleted file mode 100644
index 30bf059666..0000000000
--- a/desktop/dmenu2/README
+++ /dev/null
@@ -1,12 +0,0 @@
-dmenu2 (dynamic menu extended)
-
-dmenu2 is a fork of the original dmenu - an efficient dynamic menu for
-X patched with XFT, quiet, x & y, token, fuzzy matching, follow focus,
-tab nav, filter.
-
-Added option to set screen on which dmenu appears, as well as opacity,
-window class and window name. Also allows to dim screen with selected
-color and opacity while dmenu2 is running. Added underline color and
-height. (options -uc and -uh)
-
-NOTE: This package conflicts with the original dmenu package.
diff --git a/desktop/dmenu2/dmenu2-0.2-config-fix.diff b/desktop/dmenu2/dmenu2-0.2-config-fix.diff
deleted file mode 100644
index dd4316a847..0000000000
--- a/desktop/dmenu2/dmenu2-0.2-config-fix.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- config.mk	2014-09-13 18:36:13.478755045 +0300
-+++ a/config.mk	2014-09-13 18:36:18.552755303 +0300
-@@ -1,9 +1,10 @@
- # dmenu2 version
--VERSION = 0.1
-+VERSION = 0.2
- 
- # paths
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
-+LIBDIR = /usr/local/lib
- 
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -18,12 +19,13 @@
- 
- # includes and libs
- INCS = -I${X11INC} ${XFTINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
-+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
- 
- # flags
-+OPTS ?= 0s
- CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS   = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
- LDFLAGS  = -s ${LIBS}
- 
- # compiler and linker
diff --git a/desktop/dmenu2/dmenu2.info b/desktop/dmenu2/dmenu2.info
deleted file mode 100644
index 243f34cbe6..0000000000
--- a/desktop/dmenu2/dmenu2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dmenu2"
-VERSION="0.2"
-HOMEPAGE="https://bitbucket.org/melek/dmenu2"
-DOWNLOAD="https://bitbucket.org/melek/dmenu2/downloads/dmenu2-0.2.tar.gz"
-MD5SUM="bc694c8b9fa3b8f6e7be8046d46e5bc5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Симон Болоканов"
-EMAIL="sbolokanov@abv.bg"
diff --git a/desktop/dmenu2/slack-desc b/desktop/dmenu2/slack-desc
deleted file mode 100644
index aedbfafd4d..0000000000
--- a/desktop/dmenu2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-dmenu2: dmenu2 (dynamic menu extended)
-dmenu2:
-dmenu2: dmenu2 is a fork of original dmenu - an efficient dynamic menu
-dmenu2: for X, patched with XFT, quiet, x & y, token, fuzzy matching, follow
-dmenu2: focus, tab nav, filter. Added option to set screen on which dmenu
-dmenu2: appears, as well as opacity, window class and window name.
-dmenu2: Also allows to dim screen with selected color and opacity while
-dmenu2: dmenu2 is running. Added underline color and height.
-dmenu2:
-dmenu2: Homepage: https://bitbucket.org/melek/dmenu2
-dmenu2:
diff --git a/desktop/dunst/README b/desktop/dunst/README
index e6211b084e..4ccb5add33 100644
--- a/desktop/dunst/README
+++ b/desktop/dunst/README
@@ -7,5 +7,5 @@ we all love to customize to perfection.
 
 Configuration:
 
-To customize dunst you have to copy /usr/share/dunst/dunstrc to
+To customize dunst copy /etc/xdg/dunst/dunstrc to
 ~/.config/dunst/dunstrc and then modify it to your liking.
diff --git a/desktop/dunst/doinst.sh b/desktop/dunst/doinst.sh
new file mode 100644
index 0000000000..c3a0ab28b9
--- /dev/null
+++ b/desktop/dunst/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/xdg/dunst/dunstrc.new
diff --git a/desktop/dunst/dunst.SlackBuild b/desktop/dunst/dunst.SlackBuild
index cb82fa0e70..62f7e5092b 100644
--- a/desktop/dunst/dunst.SlackBuild
+++ b/desktop/dunst/dunst.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2016 Симонъ С. Болокановъ – Бдинъ, Българи�
+# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <sbolokanov@abv.bg>
+#                     С. С. Болоканаръ, Българи�
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,21 +21,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Симонъ С. Болокановъ <sbolokanov@abv.bg>
-# changelog:
-#    v1.0.0 - Simon Bolokanov
-#    v1.1.0 - revised for SBo - 09.10.2014
-#     15.3.2015 - main site is down, fixed download url. Made some script clean ups
-#     3.4.2016 - don't clobber the config
-
 PRGNAM=dunst
 VERSION=${VERSION:-1.5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +39,8 @@ 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"
@@ -74,12 +68,18 @@ 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 {} \;
 
+# Fix config path
+sed -i 's|${DATADIR}/dunst/dunstrc|/etc/xdg/dunst/dunstrc|g' Makefile
+
 CFLAGS="$SLKCFLAGS" \
 make DESTDIR=$PKG \
   PREFIX=/usr \
   MANPREFIX=/usr/man \
   all install
 
+# Don't clobber config
+mv -v $PKG/etc/xdg/dunst/dunstrc $PKG/etc/xdg/dunst/dunstrc.new
+
 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
 
@@ -93,6 +93,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -pv $PKG/install
 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}
diff --git a/desktop/dunst/dunst.info b/desktop/dunst/dunst.info
index ec286e724b..39b0e93474 100644
--- a/desktop/dunst/dunst.info
+++ b/desktop/dunst/dunst.info
@@ -6,5 +6,5 @@ MD5SUM="e42e7a53741066b137dcb92bb8c22020"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Симонъ С. Болокановъ"
+MAINTAINER="S. S. Bolokanar"
 EMAIL="sbolokanov@abv.bg"
diff --git a/desktop/e16/README b/desktop/e16/README
index c5ccab5494..05b3864251 100644
--- a/desktop/e16/README
+++ b/desktop/e16/README
@@ -1,16 +1,16 @@
-The Enlightenment DR16 Window Manager is a robust, flexible,
-highly configurable, graphically rich, yet unobtrusive desktop
-environment for the X11 windowing system. It is fully themable and
-easily configured. There are a wide range of configuration options to
-suit any taste. The menu system is flexible, providing easy access to
-applications, theme selection, documentation, settings, and background
-selection. Enlightenment DR16 integrates well with other desktop
-environments, such as Gnome, KDE, and LXDE. Replace the default window
-managers with E16 and you'll have the power to leverage the best
-of those desktop environments, while at the same time enjoying the
-superior windowing interface that Enlightenment provides.
+The Enlightenment DR16 Window Manager is a robust, flexible, highly
+configurable, graphically rich, yet unobtrusive desktop environment for
+the X11 windowing system. It is fully themable and easily configured.
+There are a wide range of configuration options to suit any taste. The
+menu system is flexible, providing easy access to applications, theme
+selection, documentation, settings, and background selection.
+Enlightenment DR16 integrates well with other desktop environments, such
+as Gnome, KDE, and LXDE. Replace the default window managers with E16
+and you'll have the power to leverage the best of those desktop
+environments, while at the same time enjoying the superior windowing
+interface that Enlightenment provides.
 
 To disable building and installing the core themes or the E-docs, set
-$THEMES (for themes) or $DOCS (for documentation) to anything other
-than "YES". This SlackBuild does not install Epplets, or the key- or
+$THEMES (for themes) or $DOCS (for documentation) to anything other than
+"YES". This SlackBuild does not install Epplets, or the key- or
 menu-editing packages.
diff --git a/desktop/e16/e16.SlackBuild b/desktop/e16/e16.SlackBuild
index 9c1a988b7d..e6882c0984 100644
--- a/desktop/e16/e16.SlackBuild
+++ b/desktop/e16/e16.SlackBuild
@@ -23,15 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=e16
-VERSION=${VERSION:-1.0.21}
+VERSION=${VERSION:-1.0.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Optional themes and documentation
-THEMES=${THEMES:-1} # install themes by default
+THEMES=${THEMES:-YES} # install themes by default
 TNAME=e16-themes
 TVERSION=${TVERSION:-1.0.2}
-DOCS=${DOCS:-1} # install documentation by default
+DOCS=${DOCS:-YES} # install documentation by default
 DNAME=e16-docs
 DVERSION=${DVERSION:-0.16.8.0.2}
 
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -134,6 +134,7 @@ fi
 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
 
+# Compress man pages
 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
 
diff --git a/desktop/e16/e16.info b/desktop/e16/e16.info
index fafa13da11..8f67add2c9 100644
--- a/desktop/e16/e16.info
+++ b/desktop/e16/e16.info
@@ -1,10 +1,10 @@
 PRGNAM="e16"
-VERSION="1.0.21"
+VERSION="1.0.22"
 HOMEPAGE="https://sourceforge.net/projects/enlightenment"
-DOWNLOAD="http://downloads.sourceforge.net/project/enlightenment/e16/1.0.21/e16-1.0.21.tar.gz \
+DOWNLOAD="http://downloads.sourceforge.net/project/enlightenment/e16/1.0.22/e16-1.0.22.tar.xz \
           http://downloads.sourceforge.net/project/enlightenment/e16-themes/1.0.2/e16-themes-1.0.2.tar.gz \
           http://downloads.sourceforge.net/project/enlightenment/e16-docs/0.16.8.0.2/e16-docs-0.16.8.0.2.tar.gz"
-MD5SUM="28ed676b7d67c068052114dc775e747a \
+MD5SUM="d95643d671b138359842794d54f86e12 \
         124259d70237dfc47fa8bc0a1109f03b \
         46bcdcc5cdad76159923671cfcea93f9"
 DOWNLOAD_x86_64=""
diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild
index 5f90e39325..988122f400 100644
--- a/desktop/fvwm3/fvwm3.SlackBuild
+++ b/desktop/fvwm3/fvwm3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fvwm3
 
-# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2020-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fvwm3
-VERSION=${VERSION:-1.0.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,10 +63,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-sed -i '/^@FVWM_BUILD_GOLANG_TRUE@GOBUILD = $(GOCMD) build/s/$/ -mod=vendor/' \
-  bin/FvwmPrompt/Makefile.in
-
-sed -i 's/go1.14\*)/go1.13\* | go1.14\*)/' configure
+patch -p1 < $CWD/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
 
 mkdir -p bin/FvwmPrompt/vendor/golang.org/x
 for DEPENDENCY in \
@@ -93,6 +90,8 @@ do
   fi
 done
 
+cat $CWD/modules.txt > bin/FvwmPrompt/vendor/modules.txt
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -127,24 +126,33 @@ zcat $CWD/xinitrc.fvwm3.gz > $PKG/etc/X11/xinit/xinitrc.fvwm3
 chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm3
 
 rm -rf $PKG/usr/share/doc
-
 rm -rf $PKG/usr/share/locale
+rm -f $PKG/usr/bin/fvwm3-convert-2.6
+mv $PKG/usr/bin/FvwmCommand $PKG/usr/bin/Fvwm3Command
+mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot3
 
-rm -rf $PKG/usr/bin/fvwm3-convert-2.6
-rm -rf $PKG/usr/man/man1/fvwm3-convert-2.6.1.gz
+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
 
-mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot3
-mv $PKG/usr/man/man1/xpmroot.1 $PKG/usr/man/man1/xpmroot3.1
+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
 
 for m in $PKG/usr/man/man1/Fvwm* ; do
+  case "$m" in *FvwmPrompt*) continue ;; esac
   mv $m ${m/Fvwm/Fvwm3}
 done
 
-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
+for m in $PKG/usr/man/man1/fvwm-* ; do
+  mv $m ${m/fvwm-/fvwm3-}
+done
 
-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
+rm -f $PKG/usr/man/man1/xpmroot*
+ln -s fvwm3-root.1.gz $PKG/usr/man/man1/xpmroot3.1.gz
+
+rm -f $PKG/usr/man/man1/fvwm3-convert-2.6.1.gz
+rm -f $PKG/usr/man/man1/fvwm3-config-2.6.1.gz
+rm -f $PKG/usr/man/man1/Fvwm3Console.1.gz
+rm -f $PKG/usr/man/man1/Fvwm3ConsoleC.pl.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info
index 62e01773e0..a272b80016 100644
--- a/desktop/fvwm3/fvwm3.info
+++ b/desktop/fvwm3/fvwm3.info
@@ -1,7 +1,7 @@
 PRGNAM="fvwm3"
-VERSION="1.0.1"
+VERSION="1.0.2"
 HOMEPAGE="https://github.com/fvwmorg/fvwm3"
-DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.1/fvwm3-1.0.1.tar.gz \
+DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.2/fvwm3-1.0.2.tar.gz \
           https://github.com/abiosoft/ishell/archive/v2.0.0/ishell-2.0.0.tar.gz \
           https://github.com/abiosoft/readline/archive/155bce2042db95a783081fab225e74dd879055b0/readline-155bce2042db95a783081fab225e74dd879055b0.tar.gz \
           https://github.com/fatih/color/archive/v1.9.0/color-1.9.0.tar.gz \
@@ -10,7 +10,7 @@ DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.1/fvwm3-1.0.1.t
           https://github.com/mattn/go-isatty/archive/v0.0.12/go-isatty-0.0.12.tar.gz \
           https://github.com/sirupsen/logrus/archive/v1.6.0/logrus-1.6.0.tar.gz \
           https://github.com/golang/sys/archive/12a6c2dcc1e4cb348b57847c73987099e261714b/sys-12a6c2dcc1e4cb348b57847c73987099e261714b.tar.gz"
-MD5SUM="5bf56ca74f4a111df66de3c61cf6fcba \
+MD5SUM="afdf88159cf06486a8a86d3d64b69b18 \
         3058feb8c64ce23c122c212673a769fc \
         5f9283762aece4866ec12481c911dc04 \
         63c08b74df39b3df587594710c13d543 \
@@ -21,6 +21,6 @@ MD5SUM="5bf56ca74f4a111df66de3c61cf6fcba \
         62bb00c7e07850c8fa836a3614667ded"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libbson google-go-lang"
+REQUIRES="libbson google-go-lang python3 rubygem-asciidoctor"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/desktop/fvwm3/modules.txt b/desktop/fvwm3/modules.txt
new file mode 100644
index 0000000000..01470c4d21
--- /dev/null
+++ b/desktop/fvwm3/modules.txt
@@ -0,0 +1,31 @@
+# github.com/abiosoft/ishell v2.0.0+incompatible
+## explicit
+github.com/abiosoft/ishell
+# github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db
+## explicit
+github.com/abiosoft/readline
+# github.com/chzyer/logex v1.1.10
+## explicit
+# github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1
+## explicit
+# github.com/fatih/color v1.9.0
+## explicit
+github.com/fatih/color
+# github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
+## explicit
+github.com/flynn-archive/go-shlex
+# github.com/konsorten/go-windows-terminal-sequences v1.0.3
+github.com/konsorten/go-windows-terminal-sequences
+# github.com/mattn/go-colorable v0.1.4
+github.com/mattn/go-colorable
+# github.com/mattn/go-isatty v0.0.12
+## explicit
+github.com/mattn/go-isatty
+# github.com/sirupsen/logrus v1.6.0
+## explicit
+github.com/sirupsen/logrus
+# github.com/stretchr/testify v1.6.1
+## explicit
+# golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4
+## explicit
+golang.org/x/sys/unix
diff --git a/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch b/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
new file mode 100644
index 0000000000..8635f5a35c
--- /dev/null
+++ b/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
@@ -0,0 +1,13 @@
+diff -Nur fvwm3-1.0.2.orig/fvwm/screen.h fvwm3-1.0.2/fvwm/screen.h
+--- fvwm3-1.0.2.orig/fvwm/screen.h	2020-12-12 03:37:08.000000000 +0300
++++ fvwm3-1.0.2/fvwm/screen.h	2020-12-22 03:21:41.103120674 +0300
+@@ -485,8 +485,7 @@
+ 		get_unshaded_geometry((fw), &g);			   \
+ 		mnew = FindScreenOfXY((fw)->g.frame.x, (fw)->g.frame.y);   \
+ 		/* Avoid unnecessary updates. */			   \
+-		if (mnew == (fw)->m &&					   \
+-		    (fw)->Desk == mnew->virtual_scr.CurrentDesk)	   \
++		if (mnew == (fw)->m)					   \
+ 			break;						   \
+ 		(fw)->m_prev = (fw)->m;					   \
+ 		(fw)->m = mnew;						   \
diff --git a/desktop/glabels/README b/desktop/glabels/README
index 2a4477025a..fc8831c15c 100644
--- a/desktop/glabels/README
+++ b/desktop/glabels/README
@@ -6,7 +6,7 @@ the GNU General Public License (GPL).
 
 Optional dependencies are:
    - libebook      (https://sourceforge.net/projects/libebook/)
-   - GNU barcode   (http://www.gnu.org/software/barcode/)
-   - zint          (http://sourceforge.net/projects/zint/)
+   - GNU barcode   (available on SBo)
+   - zint          (available on SBo)
    - iec16022      (http://datenfreihafen.org/projects/iec16022.html)
    - qrencode      (available on SBo)
diff --git a/desktop/glabels/glabels.SlackBuild b/desktop/glabels/glabels.SlackBuild
index af74539da5..14e37c2584 100644
--- a/desktop/glabels/glabels.SlackBuild
+++ b/desktop/glabels/glabels.SlackBuild
@@ -2,34 +2,29 @@
 
 # Slackware build script for glabels
 
-# Copyright (c) 2016 Alan Alberghini <414N@slacky.it>
+# Copyright (c) 2021 Alan Alberghini <414N@slacky.it>
 # All rights reserved.
 #
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-#   THIS SOFTWARE IS PROVIDED AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# Build history:
-#
-# 1 - Initial release.
+#  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=glabels
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 DOCS="README AUTHORS ChangeLog NEWS TODO COPYING*"
diff --git a/desktop/glabels/glabels.info b/desktop/glabels/glabels.info
index 45db224b47..24cc7f8a17 100644
--- a/desktop/glabels/glabels.info
+++ b/desktop/glabels/glabels.info
@@ -1,8 +1,8 @@
 PRGNAM="glabels"
-VERSION="3.4.0"
+VERSION="3.4.1"
 HOMEPAGE="http://glabels.org"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"
-MD5SUM="6b364a487b9856b831c9db0e845e67a2"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.1.tar.xz"
+MD5SUM="095105ac95872bd9a767764fa60d5152"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/gmrun/gmrun.SlackBuild b/desktop/gmrun/gmrun.SlackBuild
index b221579f9c..48d1fb8e6a 100644
--- a/desktop/gmrun/gmrun.SlackBuild
+++ b/desktop/gmrun/gmrun.SlackBuild
@@ -4,7 +4,7 @@
 #
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2017-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 #
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gmrun
-VERSION=${VERSION:-0.9.5w}
+VERSION=${VERSION:-1.1w}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,7 +98,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 AUTHORS COPYING ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS ChangeLog 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/desktop/gmrun/gmrun.info b/desktop/gmrun/gmrun.info
index 7c6d2c2ee0..52c26c19a1 100644
--- a/desktop/gmrun/gmrun.info
+++ b/desktop/gmrun/gmrun.info
@@ -1,8 +1,8 @@
 PRGNAM="gmrun"
-VERSION="0.9.5w"
+VERSION="1.1w"
 HOMEPAGE="https://github.com/wdlkmpx/gmrun/"
-DOWNLOAD="https://github.com/wdlkmpx/gmrun/archive/0.9.5w/gmrun-0.9.5w.tar.gz"
-MD5SUM="8d7fdf893f15306df9bb9daca6cf897d"
+DOWNLOAD="https://github.com/wdlkmpx/gmrun/archive/1.1w/gmrun-1.1w.tar.gz"
+MD5SUM="fc2e7535dda6b3d7455bfea49329fa13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/gxkb/gxkb.SlackBuild b/desktop/gxkb/gxkb.SlackBuild
index 5fd05a5f41..c7c7a887c0 100644
--- a/desktop/gxkb/gxkb.SlackBuild
+++ b/desktop/gxkb/gxkb.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gxkb
 
-# Copyright 2015-19 NK
+# Copyright 2015-21 NK
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gxkb
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,6 +49,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
diff --git a/desktop/gxkb/gxkb.info b/desktop/gxkb/gxkb.info
index 83f1948bf8..778189d6d9 100644
--- a/desktop/gxkb/gxkb.info
+++ b/desktop/gxkb/gxkb.info
@@ -1,8 +1,8 @@
 PRGNAM="gxkb"
-VERSION="0.8.1"
+VERSION="0.8.2"
 HOMEPAGE="https://zen-tools.github.io/gxkb/"
-DOWNLOAD="http://downloads.sourceforge.net/project/gxkb/gxkb-0.8.1.tar.gz"
-MD5SUM="4d27f71d04e065a9bab5eb6fcb7b3677"
+DOWNLOAD="http://downloads.sourceforge.net/project/gxkb/gxkb-0.8.2.tar.gz"
+MD5SUM="3ada6f300ce3ab1ba5a80630b26fcee8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/gxkb/slack-desc b/desktop/gxkb/slack-desc
index 8f779c1ccd..781b1a1bf6 100644
--- a/desktop/gxkb/slack-desc
+++ b/desktop/gxkb/slack-desc
@@ -8,12 +8,12 @@
     |-----handy-ruler------------------------------------------------------|
 gxkb: gxkb (X11 keyboard indicator and switcher)
 gxkb:
-gxkb: It shows a flag of current keyboard in a systray area and allows you
-gxkb: to switch to another one. It's written in C and uses the GTK library
-gxkb: (no GNOME is needed).
-gxkb:
-gxkb: Homepage: https://zen-tools.github.io/gxkb/
-gxkb:
+gxkb: gxkb is a little indicator applet which allows one to quickly switch
+gxkb: between different keyboard layouts in X. A flag corresponding to the 
+gxkb: country of the active layout is shown in the indicator area.
 gxkb:
+gxkb: The applet is written in C and uses the GTK+ library and therefore
+gxkb: does not depend on any GNOME components.
 gxkb:
+gxkb: Homepage: https://zen-tools.github.io/gxkb
 gxkb:
diff --git a/desktop/herbe/README b/desktop/herbe/README
new file mode 100644
index 0000000000..0fab12394d
--- /dev/null
+++ b/desktop/herbe/README
@@ -0,0 +1,4 @@
+herbe
+
+Daemon-less notifications without D-Bus. Minimal and lightweight.
+
diff --git a/desktop/herbe/herbe.SlackBuild b/desktop/herbe/herbe.SlackBuild
new file mode 100644
index 0000000000..25f420a730
--- /dev/null
+++ b/desktop/herbe/herbe.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for herbe
+
+# Copyright 2020 Jeff Parent <jeff+SBo@sh0.xyz>
+# 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=herbe
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make
+make install DESTDIR=$PKG PREFIX=/usr
+
+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 \
+   README.md $TMP/$PRGNAM-$VERSION/LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/herbe/herbe.info b/desktop/herbe/herbe.info
new file mode 100644
index 0000000000..e616a21bab
--- /dev/null
+++ b/desktop/herbe/herbe.info
@@ -0,0 +1,10 @@
+PRGNAM="herbe"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/dudik/herbe"
+DOWNLOAD="https://github.com/dudik/herbe/archive/1.0.0/herbe-1.0.0.tar.gz"
+MD5SUM="4fd93df9ac95be8c9643972788f8d38f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jeff Parent"
+EMAIL="jeff+SBo@sh0.xyz"
diff --git a/development/dwarf/slack-desc b/desktop/herbe/slack-desc
index 5a22cf812c..30dbe3f64e 100644
--- a/development/dwarf/slack-desc
+++ b/desktop/herbe/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-dwarf: dwarf (library to consume and produce DWARF debug information)
-dwarf:
-dwarf: The DWARF Debugging Information Format is of interest to programmers
-dwarf: working on compilers and debuggers (and anyone interested in reading
-dwarf: or writing DWARF information). It was developed by a committee (known
-dwarf: as the PLSIG at the time) starting around 1991.
-dwarf:
-dwarf:
-dwarf:
-dwarf:
-dwarf:
+herbe: herbe (Daemon-less notifications without D-Bus)
+herbe:
+herbe: https://github.com/dudik/herbe
+herbe:
+herbe:
+herbe:
+herbe:
+herbe:
+herbe:
+herbe:
+herbe:
diff --git a/desktop/hushboard/README b/desktop/hushboard/README
new file mode 100644
index 0000000000..e01fe07a54
--- /dev/null
+++ b/desktop/hushboard/README
@@ -0,0 +1,7 @@
+Never listen to the thundering sounds of someone typing on a video
+call ever again!
+
+Well, nobody who talks to you will have to listen to it. If you
+don’t want to listen to it either, encourage your friends and
+colleagues to install Hushboard. While you’re typing, your mic is
+muted. When you stop, it unmutes again.
diff --git a/desktop/hushboard/doinst.sh b/desktop/hushboard/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/desktop/hushboard/doinst.sh
@@ -0,0 +1,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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/hushboard/hushboard.SlackBuild b/desktop/hushboard/hushboard.SlackBuild
new file mode 100644
index 0000000000..8306861f90
--- /dev/null
+++ b/desktop/hushboard/hushboard.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for hushboard
+
+# Copyright 2021 Justin Teague <arcadellama@posteo.net>
+# 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=hushboard
+VERSION=${VERSION:-20210221_223b6f9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+COMMIT=${COMMIT:-223b6f97164656bd57bd6c86e9bd297caa37cf85}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python3 setup.py build
+python3 setup.py install --root=$PKG
+
+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/share/applications $PKG/usr/share/pixmaps
+cp -a $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+cp -a $PRGNAM-512.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a {LICENSE,README.md} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/desktop/hushboard/hushboard.desktop b/desktop/hushboard/hushboard.desktop
new file mode 100644
index 0000000000..d4d11e5f0f
--- /dev/null
+++ b/desktop/hushboard/hushboard.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=Hushboard
+Comment=Mute your microphone while typing
+Comment[en_US]=Mute your microphone while typing
+GenericName=Hushboard
+GenericName[en_US]=Hushboard
+Icon=hushboard
+Exec=hushboard
+Terminal=false
+Keywords=audio;mute;microphone;conference;call;
+Categories=GTK;Utility;
diff --git a/desktop/hushboard/hushboard.info b/desktop/hushboard/hushboard.info
new file mode 100644
index 0000000000..bed638a4f2
--- /dev/null
+++ b/desktop/hushboard/hushboard.info
@@ -0,0 +1,10 @@
+PRGNAM="hushboard"
+VERSION="20210221_223b6f9"
+HOMEPAGE="https://kryogenix.org/code/hushboard"
+DOWNLOAD="https://github.com/stuartlangridge/hushboard/archive/223b6f97164656bd57bd6c86e9bd297caa37cf85/hushboard-223b6f97164656bd57bd6c86e9bd297caa37cf85.tar.gz"
+MD5SUM="08578fd3b9907b728ff4d9eb40270d87"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 py3cairo pygobject3-python3 six python-xlib"
+MAINTAINER="Justin Teague"
+EMAIL="arcadellama@posteo.net"
diff --git a/desktop/hushboard/slack-desc b/desktop/hushboard/slack-desc
new file mode 100644
index 0000000000..67a9950937
--- /dev/null
+++ b/desktop/hushboard/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+hushboard: hushboard (Mute your microphone while typing.)
+hushboard:
+hushboard: Never listen to the thundering sounds of someone typing on a video
+hushboard: call ever again!
+hushboard:
+hushboard: Well, nobody who talks to you will have to listen to it. If you
+hushboard: don't want to listen to it either, encourage your friends and
+hushboard: colleagues to install Hushboard. While you're typing, your mic is
+hushboard: muted. When you stop, it unmutes again.
+hushboard:
+hushboard: https://kryogenix.org/code/hushboard/
diff --git a/desktop/i3-gaps/i3-gaps.SlackBuild b/desktop/i3-gaps/i3-gaps.SlackBuild
index 0c00cbcc05..acab752bee 100644
--- a/desktop/i3-gaps/i3-gaps.SlackBuild
+++ b/desktop/i3-gaps/i3-gaps.SlackBuild
@@ -6,6 +6,7 @@
 # Updated by Eugene Suter <easuter@gmail.com>
 # Updated by Marcin Herda <mherda@slackword.net>
 # Used for i3-gaps by Melvin Mawhin <mmawhin@hotmail.com>
+# Updated by Julian Grinblat <julian@dotcore.co.il>
 # Cleaning up docs by ponce
 # Copyright 2017 - 2018  Johannes Schoepfer, Germany
 #
@@ -27,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=i3-gaps
-VERSION=${VERSION:-4.18.2}
+VERSION=${VERSION:-4.18.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/i3-gaps/i3-gaps.info b/desktop/i3-gaps/i3-gaps.info
index 9e4e568ffb..ee52367d4e 100644
--- a/desktop/i3-gaps/i3-gaps.info
+++ b/desktop/i3-gaps/i3-gaps.info
@@ -1,10 +1,10 @@
 PRGNAM="i3-gaps"
-VERSION="4.18.2"
+VERSION="4.18.3"
 HOMEPAGE="https://github.com/Airblader/i3"
-DOWNLOAD="https://github.com/Airblader/i3/archive/4.18.2/i3-4.18.2.tar.gz"
-MD5SUM="464c8b0ad765cbf9047445b93a1859eb"
+DOWNLOAD="https://github.com/Airblader/i3/archive/4.18.3/i3-4.18.3.tar.gz"
+MD5SUM="951cec592968c5c3146377322b4aec04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu libev libxkbcommon xcb-util-xrm yajl perl-JSON-XS perl-AnyEvent"
-MAINTAINER="Melvin Mawhin"
-EMAIL="mmawhin@hotmail.com"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/desktop/i3-gaps/i3-gaps.patch b/desktop/i3-gaps/i3-gaps.patch
index 932e8a4d4a..cf23d503d1 100644
--- a/desktop/i3-gaps/i3-gaps.patch
+++ b/desktop/i3-gaps/i3-gaps.patch
@@ -1,5 +1,5 @@
---- i3-4.18.2/include/libi3.h	2020-07-26 10:35:49.000000000 +0200
-+++ i3-4.18.2/include/libi3.h.new	2020-09-21 09:53:05.502446300 +0200
+--- i3-4.18.3/include/libi3.h	2020-10-20 17:06:25.000000000 +0900
++++ i3-4.18.3.patched/include/libi3.h	2021-01-09 16:11:52.571112045 +0900
 @@ -341,7 +341,7 @@
   */
  uint32_t get_colorpixel(const char *hex) __attribute__((const));
@@ -9,8 +9,9 @@
  /**
   * Taken from FreeBSD
   * Returns a pointer to a new string which is a duplicate of the
---- i3-4.18.2/libi3/strndup.c	2020-07-26 10:35:49.000000000 +0200
-+++ i3-4.18.2/libi3/strndup.c.new	2020-09-21 09:51:37.792446300 +0200
+diff --color -ruN i3-4.18.3/libi3/strndup.c i3-4.18.3.patched/libi3/strndup.c
+--- i3-4.18.3/libi3/strndup.c	2020-10-20 17:06:25.000000000 +0900
++++ i3-4.18.3.patched/libi3/strndup.c	2021-01-09 16:12:46.972114812 +0900
 @@ -10,7 +10,7 @@
  #include <sys/types.h>
  #include <string.h>
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index db6a6483b8..6de5ff8b9a 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw: update for 2.18 release
 # 20191128 bkw:
 # - Update for 2.17 release.
 # - Upstream now includes the man page in the tarball, use that
@@ -35,7 +36,7 @@
 # - Added default terminal selection
 
 PRGNAM=j4-dmenu-desktop
-VERSION=${VERSION:-2.17}
+VERSION=${VERSION:-2.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
index 47fe4504b9..1c65e2f33f 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
@@ -1,8 +1,8 @@
 PRGNAM="j4-dmenu-desktop"
-VERSION="2.17"
+VERSION="2.18"
 HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.17/j4-dmenu-desktop-r2.17.tar.gz"
-MD5SUM="18c5cd5f56c49535c19a7de9a34a2119"
+DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.18/j4-dmenu-desktop-r2.18.tar.gz"
+MD5SUM="5df37206da5daf8512d7582e277a9a4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu"
diff --git a/desktop/jgmenu/jgmenu.SlackBuild b/desktop/jgmenu/jgmenu.SlackBuild
index 8ed44d04a8..a4ddd4678d 100644
--- a/desktop/jgmenu/jgmenu.SlackBuild
+++ b/desktop/jgmenu/jgmenu.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for jgmenu.
 #
-# Copyright 2017-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jgmenu
-VERSION=${VERSION:-4.2.1}
+VERSION=${VERSION:-4.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/jgmenu/jgmenu.info b/desktop/jgmenu/jgmenu.info
index 89a5ae4876..a2de36d5f3 100644
--- a/desktop/jgmenu/jgmenu.info
+++ b/desktop/jgmenu/jgmenu.info
@@ -1,8 +1,8 @@
 PRGNAM="jgmenu"
-VERSION="4.2.1"
+VERSION="4.3.0"
 HOMEPAGE="https://www.github.com/johanmalm/jgmenu/"
-DOWNLOAD="https://github.com/johanmalm/jgmenu/archive/v4.2.1/jgmenu-4.2.1.tar.gz"
-MD5SUM="0bdd00ea9bc319f338600da48d2c111c"
+DOWNLOAD="https://github.com/johanmalm/jgmenu/archive/v4.3.0/jgmenu-4.3.0.tar.gz"
+MD5SUM="b12ee41c072155981df914ecf45bb591"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 menu-cache"
diff --git a/desktop/kdocker/README b/desktop/kdocker/README
new file mode 100644
index 0000000000..acfc008205
--- /dev/null
+++ b/desktop/kdocker/README
@@ -0,0 +1,4 @@
+kdocker (Helper to dock any application into the system tray)
+
+kdocker is an application to help you dock any application into
+the system tray.
diff --git a/desktop/kdocker/doinst.sh b/desktop/kdocker/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/desktop/kdocker/doinst.sh
@@ -0,0 +1,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/desktop/kdocker/kdocker.SlackBuild b/desktop/kdocker/kdocker.SlackBuild
new file mode 100644
index 0000000000..685f455758
--- /dev/null
+++ b/desktop/kdocker/kdocker.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for kdocker
+
+# Copyright 2021 Igor Alexandrov <igor.alexandrov@outlook.com>
+# 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=kdocker
+VERSION=${VERSION:-5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=KDocker
+
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$(uname -m) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+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 \
+    -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 {} \;
+
+qmake-qt5 \
+  QMAKE_CFLAGS="$SLKCFLAGS" \
+  QMAKE_CXXFLAGS="$SLKCFLAGS"
+
+make
+make install INSTALL_ROOT=$PKG
+
+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
+
+install -Dm644 helpers/kdocker.1 $PKG/usr/man/man1/kdocker.1
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING CREDITS ChangeLog README.md TODO VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/desktop/kdocker/kdocker.info b/desktop/kdocker/kdocker.info
new file mode 100644
index 0000000000..a0ac6fac4f
--- /dev/null
+++ b/desktop/kdocker/kdocker.info
@@ -0,0 +1,10 @@
+PRGNAM="kdocker"
+VERSION="5.3"
+HOMEPAGE="https://github.com/user-none/KDocker"
+DOWNLOAD="https://github.com/user-none/KDocker/archive/5.3/KDocker-5.3.tar.gz"
+MD5SUM="bd28476a96b859e812a7d639a3ac650c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Igor Alexandrov"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/libraries/libgltf/slack-desc b/desktop/kdocker/slack-desc
index a83e233a21..fba8f28304 100644
--- a/libraries/libgltf/slack-desc
+++ b/desktop/kdocker/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-libgltf: libgltf (rendering library for glTF models)
-libgltf:
-libgltf: LIBGLTF is a C++ library for rendering OpenGL models stored in glTF
-libgltf: format.
-libgltf:
-libgltf: Homepage: https://wiki.documentfoundation.org/Development/libgltf
-libgltf:
-libgltf:
-libgltf:
-libgltf:
-libgltf:
+kdocker: kdocker (Helper to dock any application into the system tray)
+kdocker:
+kdocker: kdocker is an application to help you dock any application into
+kdocker: the system tray.
+kdocker:
+kdocker: https://github.com/user-none/KDocker
+kdocker:
+kdocker:
+kdocker:
+kdocker:
+kdocker:
diff --git a/desktop/kwalletcli/kwalletcli.SlackBuild b/desktop/kwalletcli/kwalletcli.SlackBuild
index 302164ba37..52bc4e11f0 100644
--- a/desktop/kwalletcli/kwalletcli.SlackBuild
+++ b/desktop/kwalletcli/kwalletcli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kwalletcli
 
-# Copyright 2012-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2012-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kwalletcli
-VERSION=${VERSION:-3.02}
+VERSION=${VERSION:-3.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/kwalletcli/kwalletcli.info b/desktop/kwalletcli/kwalletcli.info
index 3486e10277..864eb49eba 100644
--- a/desktop/kwalletcli/kwalletcli.info
+++ b/desktop/kwalletcli/kwalletcli.info
@@ -1,8 +1,8 @@
 PRGNAM="kwalletcli"
-VERSION="3.02"
+VERSION="3.03"
 HOMEPAGE="https://www.mirbsd.org/kwalletcli.htm"
-DOWNLOAD="https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-3.02.tar.gz"
-MD5SUM="88a6fad867d59239a3aa5e3df6dbd0f0"
+DOWNLOAD="https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-3.03.tar.gz"
+MD5SUM="ef98d7a9a8702d555135cd2c372a15ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mksh"
diff --git a/desktop/lxhotkey/lxhotkey.SlackBuild b/desktop/lxhotkey/lxhotkey.SlackBuild
index d6739e9765..3c78e4c8f9 100644
--- a/desktop/lxhotkey/lxhotkey.SlackBuild
+++ b/desktop/lxhotkey/lxhotkey.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lxhotkey
 
-# Copyright 2018 Leonardo Citrolo, Italy
+# Copyright 2018-2021 Leonardo Citrolo, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lxhotkey
-VERSION=${VERSION:-0.1.0}
+VERSION=${VERSION:-0.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/lxhotkey/lxhotkey.info b/desktop/lxhotkey/lxhotkey.info
index d8a144ad09..2081cd37b3 100644
--- a/desktop/lxhotkey/lxhotkey.info
+++ b/desktop/lxhotkey/lxhotkey.info
@@ -1,8 +1,8 @@
 PRGNAM="lxhotkey"
-VERSION="0.1.0"
+VERSION="0.1.1"
 HOMEPAGE="https://wiki.lxde.org/en/LXHotkey"
-DOWNLOAD="https://downloads.sourceforge.net/lxde/lxhotkey-0.1.0.tar.xz"
-MD5SUM="7851d4fc375a1dae8df4c87021eba455"
+DOWNLOAD="https://downloads.sourceforge.net/lxde/lxhotkey-0.1.1.tar.xz"
+MD5SUM="8c932c568fa822f3e1bf4ce23f00d881"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libfm"
diff --git a/desktop/lxpanel/fix_battery_alarm.patch b/desktop/lxpanel/fix_battery_alarm.patch
deleted file mode 100644
index 2753619444..0000000000
--- a/desktop/lxpanel/fix_battery_alarm.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 19936f24c343437447ef7e765113fc4679df07eb Mon Sep 17 00:00:00 2001
-From: Andriy Grytsenko <andrej@rep.kiev.ua>
-Date: Wed, 27 Feb 2019 02:49:00 +0200
-Subject: [PATCH] fix battery alarm when measurement of current is missing.
-
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854643
----
- ChangeLog           | 4 ++++
- plugins/batt/batt.c | 3 ++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index c0861de..0d610c8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+0.10.1
-+-------------------------------------------------------------------------
-+* Fixed battery alarm when measurement of current is missing.
-+
- 0.10.0
- -------------------------------------------------------------------------
- * Fixed delayed application of font cnahges on dclock and weather plugins.
-diff --git a/plugins/batt/batt.c b/plugins/batt/batt.c
-index f47549c..cc7bfea 100644
---- a/plugins/batt/batt.c
-+++ b/plugins/batt/batt.c
-@@ -111,6 +111,7 @@ static void * alarmProcess(void *arg) {
-     sem_wait(a->lock);
-     if (system(a->command) != 0)
-         g_warning("plugin batt: failed to execute alarm command \"%s\"", a->command);
-+    sleep(51); /* do not spam messages more often than once a minute */
-     sem_post(a->lock);
- 
-     g_free(a);
-@@ -257,7 +258,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) {
-         isCharging = battery_is_charging ( b );
- 
-     /* Consider running the alarm command */
--    if ( !isCharging && rate > 0 &&
-+    if ( !isCharging &&
-         ( ( battery_get_remaining( b ) / 60 ) < (int)lx_b->alarmTime ) )
-     {
-         /* FIXME: this should be done using glibs process functions */
--- 
-2.1.4
-
diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild
index cce093b1e7..edbbc89a7e 100644
--- a/desktop/lxpanel/lxpanel.SlackBuild
+++ b/desktop/lxpanel/lxpanel.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for lxpanel
 
 # (C) 2008 Michael Wagner <lapinours@web.de>
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # Modified by Matteo Bernardini <ponce@slackbuilds.org>
 
 PRGNAM=lxpanel
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,8 +74,6 @@ 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 {} \;
 
-patch -p1 < $CWD/fix_battery_alarm.patch
-
 sh autogen.sh || true
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info
index be31b8a229..acb7f1aa94 100644
--- a/desktop/lxpanel/lxpanel.info
+++ b/desktop/lxpanel/lxpanel.info
@@ -1,8 +1,8 @@
 PRGNAM="lxpanel"
-VERSION="0.10.0"
+VERSION="0.10.1"
 HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.0.tar.xz"
-MD5SUM="e6a1f9bd5cf39812e1c5d2453a34a7c5"
+DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.1.tar.xz"
+MD5SUM="c922d044789c3d7ae028f0e80dea18b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libfm"
diff --git a/desktop/obmenu-generator/obmenu-generator.SlackBuild b/desktop/obmenu-generator/obmenu-generator.SlackBuild
index 783af44db7..c25df0d34f 100644
--- a/desktop/obmenu-generator/obmenu-generator.SlackBuild
+++ b/desktop/obmenu-generator/obmenu-generator.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=obmenu-generator
-VERSION=${VERSION:-0.88}
+VERSION=${VERSION:-0.89}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/obmenu-generator/obmenu-generator.info b/desktop/obmenu-generator/obmenu-generator.info
index f7d007a55f..e38ef0af19 100644
--- a/desktop/obmenu-generator/obmenu-generator.info
+++ b/desktop/obmenu-generator/obmenu-generator.info
@@ -1,8 +1,8 @@
 PRGNAM="obmenu-generator"
-VERSION="0.88"
+VERSION="0.89"
 HOMEPAGE="https://github.com/trizen/obmenu-generator/"
-DOWNLOAD="https://github.com/trizen/obmenu-generator/archive/0.88/obmenu-generator-0.88.tar.gz"
-MD5SUM="a53b7f06760612b7cf4203c47b190971"
+DOWNLOAD="https://github.com/trizen/obmenu-generator/archive/0.89/obmenu-generator-0.89.tar.gz"
+MD5SUM="201591765a1fa38e1a5725a74c4ad47e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-linux-desktop-files perl-gtk2 perl-file-desktopentry"
diff --git a/desktop/pinentry-dmenu/README b/desktop/pinentry-dmenu/README
new file mode 100644
index 0000000000..43a529dbf3
--- /dev/null
+++ b/desktop/pinentry-dmenu/README
@@ -0,0 +1,8 @@
+pinentry-dmenu is a pinentry program with the charm of dmenu.
+
+This program is a fork from spine which is also a fork from
+dmenu.
+
+To use pinentry-dmenu add in ~/.gnupg/gpg-agent.conf:
+
+pinentry-program <absolute path to pinentry-dmenu>
diff --git a/desktop/pinentry-dmenu/pinentry-dmenu.SlackBuild b/desktop/pinentry-dmenu/pinentry-dmenu.SlackBuild
new file mode 100644
index 0000000000..d2df0e3fd3
--- /dev/null
+++ b/desktop/pinentry-dmenu/pinentry-dmenu.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for pinentry-dmenu
+
+# Copyright 2020 Julian Grinblat <julian@dotcore.co.il>
+# 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=pinentry-dmenu
+VERSION=${VERSION:-0.2.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make
+make install DESTDIR=$PKG MANPREFIX=/usr/man PREFIX=/usr
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+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/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/pinentry-dmenu/pinentry-dmenu.info b/desktop/pinentry-dmenu/pinentry-dmenu.info
new file mode 100644
index 0000000000..07abb7deda
--- /dev/null
+++ b/desktop/pinentry-dmenu/pinentry-dmenu.info
@@ -0,0 +1,10 @@
+PRGNAM="pinentry-dmenu"
+VERSION="0.2.2"
+HOMEPAGE="https://github.com/ritze/pinentry-dmenu"
+DOWNLOAD="https://github.com/ritze/pinentry-dmenu/archive/0.2.2/pinentry-dmenu-0.2.2.tar.gz"
+MD5SUM="cf7d157da81a501888fc0b462e2b4cf0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libconfig"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/desktop/pinentry-dmenu/slack-desc b/desktop/pinentry-dmenu/slack-desc
new file mode 100644
index 0000000000..21b07206cb
--- /dev/null
+++ b/desktop/pinentry-dmenu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+pinentry-dmenu: pinentry-dmenu (pinentry program)
+pinentry-dmenu:
+pinentry-dmenu: pinentry-dmenu is a pinentry program with the charm of dmenu.
+pinentry-dmenu: This program is a fork from spine which is also a fork from dmenu.
+pinentry-dmenu:
+pinentry-dmenu: https://github.com/ritze/pinentry-dmenu
+pinentry-dmenu:
+pinentry-dmenu:
+pinentry-dmenu:
+pinentry-dmenu:
+pinentry-dmenu:
diff --git a/desktop/redshift/disable-appindicator.patch b/desktop/redshift/disable-appindicator.patch
new file mode 100644
index 0000000000..ffd2e3ede5
--- /dev/null
+++ b/desktop/redshift/disable-appindicator.patch
@@ -0,0 +1,16 @@
+diff -Nur redshift-1.12.orig/src/redshift-gtk/statusicon.py redshift-1.12/src/redshift-gtk/statusicon.py
+--- redshift-1.12.orig/src/redshift-gtk/statusicon.py	2017-10-19 17:51:59.000000000 -0500
++++ redshift-1.12/src/redshift-gtk/statusicon.py	2021-01-03 21:48:00.721741441 -0600
+@@ -32,11 +32,7 @@
+ 
+ from gi.repository import Gtk, GLib
+ 
+-try:
+-    gi.require_version('AppIndicator3', '0.1')
+-    from gi.repository import AppIndicator3 as appindicator
+-except (ImportError, ValueError):
+-    appindicator = None
++appindicator = None
+ 
+ from .controller import RedshiftController
+ from . import defs
diff --git a/desktop/redshift/redshift.SlackBuild b/desktop/redshift/redshift.SlackBuild
index 4c26391061..055801ccb5 100644
--- a/desktop/redshift/redshift.SlackBuild
+++ b/desktop/redshift/redshift.SlackBuild
@@ -67,6 +67,9 @@ if ! $(command -v python3 &>/dev/null); then
   autopoint -f && AUTOPOINT="intltoolize --automake --copy" autoreconf -vif
 fi
 
+# Disable AppIndicator support if desired (uncomment next line)
+# cat $CWD/disable-appindicator.patch | patch -p1 || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/desktop/rofi/rofi.SlackBuild b/desktop/rofi/rofi.SlackBuild
index b374703b01..582d8d7b15 100644
--- a/desktop/rofi/rofi.SlackBuild
+++ b/desktop/rofi/rofi.SlackBuild
@@ -1,12 +1,29 @@
 #!/bin/sh
-# Slackware build script for rofi
 
-# Copyright 2018 Andrew Payne phalange@komputermatrix.com
+# Copyright 2018-2020 Andrew Payne <phalange@komputermatrix.com>
 # Written by Andrew Lobanov <spline @ rooker dot ru>
 # Modified by Eugene M., <damagedone at gmx dot com>
+# 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=rofi
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/rofi/rofi.info b/desktop/rofi/rofi.info
index 9ddc9a47d7..eccf31c5f2 100644
--- a/desktop/rofi/rofi.info
+++ b/desktop/rofi/rofi.info
@@ -1,8 +1,8 @@
 PRGNAM="rofi"
-VERSION="1.6.0"
+VERSION="1.6.1"
 HOMEPAGE="https://github.com/DaveDavenport/rofi/"
-DOWNLOAD="https://github.com/davatorium/rofi/releases/download/1.6.0/rofi-1.6.0.tar.xz"
-MD5SUM="8c6a36b39b588834b24db3b1da3222da"
+DOWNLOAD="https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.xz"
+MD5SUM="776a7fd8d1a0ec5a6f8dc7e6f6a031a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="check libxkbcommon xcb-util-xrm"
diff --git a/desktop/screenkey/screenkey.SlackBuild b/desktop/screenkey/screenkey.SlackBuild
index 1e58348e6a..59c132c8e0 100644
--- a/desktop/screenkey/screenkey.SlackBuild
+++ b/desktop/screenkey/screenkey.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for screenkey
 
-# Copyright 2013-2019 Benjamin Trigona-Harany
+# Copyright 2013-2021 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=screenkey
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -69,14 +69,14 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 install -D -m 0644 data/$PRGNAM.desktop \
   $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING.txt NEWS.rst README.rst \
+  README.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/screenkey/screenkey.info b/desktop/screenkey/screenkey.info
index 13aa436c68..b2e68c86aa 100644
--- a/desktop/screenkey/screenkey.info
+++ b/desktop/screenkey/screenkey.info
@@ -1,10 +1,10 @@
 PRGNAM="screenkey"
-VERSION="0.9"
+VERSION="1.4"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
-DOWNLOAD="https://www.thregr.org/~wavexx/software/screenkey/releases/screenkey-0.9.tar.gz"
-MD5SUM="14b194d2b3c937ae6bc905dea69f3502"
+DOWNLOAD="https://www.thregr.org/~wavexx/software/screenkey/releases/screenkey-1.4.tar.gz"
+D5SUM="14b1.4d2b3c937ae6bc905dea69f3502"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="FontAwesome setuptools-git python-distutils-extra slop"
+REQUIRES="FontAwesome setuptools-git pygobject3-python3 python3-babel slop"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/desktop/simplenote/simplenote.SlackBuild b/desktop/simplenote/simplenote.SlackBuild
index ebf9116884..3948fe1d97 100644
--- a/desktop/simplenote/simplenote.SlackBuild
+++ b/desktop/simplenote/simplenote.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=simplenote
 SRCNAM=Simplenote
-VERSION=${VERSION:-1.16.0}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/simplenote/simplenote.info b/desktop/simplenote/simplenote.info
index a7bf6a97d4..4190057b85 100644
--- a/desktop/simplenote/simplenote.info
+++ b/desktop/simplenote/simplenote.info
@@ -1,10 +1,10 @@
 PRGNAM="simplenote"
-VERSION="1.16.0"
+VERSION="2.1.0"
 HOMEPAGE="https://simplenote.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Automattic/simplenote-electron/releases/download/v1.16.0/Simplenote-linux-1.16.0-x64.tar.gz"
-MD5SUM_x86_64="ffc3557926cbd5ded05a893b18a55417"
+DOWNLOAD_x86_64="https://github.com/Automattic/simplenote-electron/releases/download/v2.1.0/Simplenote-linux-2.1.0-x64.tar.gz"
+MD5SUM_x86_64="500f3ee6a1a53e64c7f7ef500da6f4ff"
 REQUIRES=""
 MAINTAINER="Skaendo"
 EMAIL="skaendo@linuxmail.org"
diff --git a/desktop/ssr/ssr.SlackBuild b/desktop/ssr/ssr.SlackBuild
index 9e35e632c0..498cc54261 100644
--- a/desktop/ssr/ssr.SlackBuild
+++ b/desktop/ssr/ssr.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for ssr
 
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ssr
-VERSION=${VERSION:-0.4.2}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/ssr/ssr.info b/desktop/ssr/ssr.info
index 3fd83cacf3..8efda9a0ef 100644
--- a/desktop/ssr/ssr.info
+++ b/desktop/ssr/ssr.info
@@ -1,8 +1,8 @@
 PRGNAM="ssr"
-VERSION="0.4.2"
+VERSION="0.4.3"
 HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
-DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.4.2/ssr-0.4.2.tar.gz"
-MD5SUM="c43eb407d13006e0173f087ba5111214"
+DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.4.3/ssr-0.4.3.tar.gz"
+MD5SUM="3f8337db93f5a6a3f64525e7249815d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/desktop/sun/sun.SlackBuild b/desktop/sun/sun.SlackBuild
index c3b7fe8737..5903063579 100644
--- a/desktop/sun/sun.SlackBuild
+++ b/desktop/sun/sun.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sun
 
-# Copyright 2015-2020  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sun
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/sun/sun.info b/desktop/sun/sun.info
index 462469387f..112aa31c77 100644
--- a/desktop/sun/sun.info
+++ b/desktop/sun/sun.info
@@ -1,8 +1,8 @@
 PRGNAM="sun"
-VERSION="1.3.0"
+VERSION="1.3.1"
 HOMEPAGE="https://gitlab.com/dslackw/sun"
-DOWNLOAD="https://gitlab.com/dslackw/sun/-/archive/1.3.0/sun-1.3.0.tar.gz"
-MD5SUM="8131a16bd5a1cd5be88fabce11f05e8e"
+DOWNLOAD="https://gitlab.com/dslackw/sun/-/archive/1.3.1/sun-1.3.1.tar.gz"
+MD5SUM="739857d3e5587638466c8f0257e12f22"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-notify2 dbus-python3 pygobject3-python3 python-urllib3"
diff --git a/desktop/wmii/wmii.SlackBuild b/desktop/wmii/wmii.SlackBuild
index 62673bff17..d7e25f3518 100644
--- a/desktop/wmii/wmii.SlackBuild
+++ b/desktop/wmii/wmii.SlackBuild
@@ -27,7 +27,7 @@
 PRGNAM=wmii
 SRCNAM=wmii+ixp
 VERSION=${VERSION:-3.9.2}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,12 +77,18 @@ patch -p1 < $CWD/wmii-3.9.2-config_mk.diff
 # Fixup mk/hdr.mk
 patch -p1 < $CWD/wmii-3.9.2-mk_hdr_mk.diff
 
+# Fix the man pages
+sed -zi 's,\.P[^@]@DOCDIR@/wmii\.pdf,,' man/wmii.1
+sed -i "s,@DOCDIR@,/usr/doc/$PRGNAM-$VERSION,g" man/wmii.1
+sed -i "s,@CONFPREFIX@,/etc,g" man/wmii.1
+
 LDFLAGS="-lX11 -lXrender" \
 make \
   OPT="$SLKCFLAGS" \
   PREFIX=/usr \
   MAN=/usr/man \
   ETC=/etc \
+  DOC=/usr/doc/$PRGNAM-$VERSION \
   LIBDIRSUFFIX=${LIBDIRSUFFIX}
 
 make install \
@@ -90,6 +96,7 @@ make install \
   PREFIX=$PKG/usr \
   MAN=$PKG/usr/man \
   ETC=$PKG/etc \
+  DOC=$PKG/usr/doc/$PRGNAM-$VERSION \
   LIBDIRSUFFIX=${LIBDIRSUFFIX}
 
 # Add wmii to xwmconfig's list...
@@ -111,11 +118,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mv $PKG/usr/share/doc $PKG/usr
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+# The directories were there, but no files
+cp -r alternative_wmiircs $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
+# hmm?
+#( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/wmtime/README b/desktop/wmtime/README
index 0e80e3fa4a..dd0763c36b 100644
--- a/desktop/wmtime/README
+++ b/desktop/wmtime/README
@@ -3,17 +3,7 @@ wmtime (time dockapp for WindowMaker)
 WMTime, guess what, displays the time and date and gives you
 some nice additional features too...
 
-wmtime supports several languages for displaying the days of the week
-and month names. By default, "us" (aka English) is used. This can be
-changed by setting LANGUAGE in the script's environment. Supported
-languages are:
-
-de
-es
-fr
-nl
-slovene
-us
-
-To change the language after package installation, you can adjust the
-symlink at /usr/share/wmtime/language.
+If you're upgrading from a previous version of wmtime and wonder what
+happened to the locale support: wmtime now uses the system's locales
+for the days of the week and month names. It supports more languages
+than it did before, and respects LANG in the environment.
diff --git a/desktop/wmtime/de.lang b/desktop/wmtime/de.lang
deleted file mode 100644
index 01902dafa6..0000000000
--- a/desktop/wmtime/de.lang
+++ /dev/null
@@ -1,19 +0,0 @@
-SO
-MO
-DI
-MI
-DO
-FR
-SA
-JAN
-FEB
-MAR
-APR
-MAI
-JUN
-JUL
-AUG
-SEP
-OKT
-NOV
-DEZ
diff --git a/desktop/wmtime/es.lang b/desktop/wmtime/es.lang
deleted file mode 100644
index 9a52bfb38b..0000000000
--- a/desktop/wmtime/es.lang
+++ /dev/null
@@ -1,19 +0,0 @@
-DO
-LU
-MA
-MI
-JU
-VI
-SA
-ENE
-FEB
-MAR
-ABR
-MAY
-JUN
-JUL
-AGO
-SEP
-OCT
-NOV
-DIC
diff --git a/desktop/wmtime/fr.lang b/desktop/wmtime/fr.lang
deleted file mode 100644
index 12d9444fbc..0000000000
--- a/desktop/wmtime/fr.lang
+++ /dev/null
@@ -1,19 +0,0 @@
-DI
-LU
-MA
-ME
-JE
-VE
-SA
-JAN
-FEV
-MAR
-AVR
-MAI
-JUN
-JUL
-AOU
-SEP
-OCT
-NOV
-DEC
diff --git a/desktop/wmtime/wmtime.1 b/desktop/wmtime/wmtime.1
deleted file mode 100644
index d5397a0cbd..0000000000
--- a/desktop/wmtime/wmtime.1
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH WMTIME 1 "2017-02-11" "1.0b2" "SlackBuilds.org"
-.SH NAME
-wmtime \- clock/calendar dockapp for windowmaker
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.\" RST source for wmtime(1) man page. Convert with:
-.
-.\" rst2man.py wmtime.rst > wmtime.1
-.
-.\" rst2man.py comes from the SBo development/docutils package.
-.
-.SH SYNOPSIS
-.sp
-wmtime [\-digital] [\-display \fIdpy\fP] [\-h] [\-v]
-.SH DESCRIPTION
-.sp
-wmtime is a clock and calendar dockapp for windowmaker. It can display
-an analog\-style clock face or a digital\-style readout. The current month,
-day, and day of week are displayed also.
-.sp
-wmtime supports multiple languages for the weekday and month names. See
-\fIFILES\fP below for details on how to change the language.
-.SH OPTIONS
-.INDENT 0.0
-.TP
-.B \-h
-Print usage message and exit.
-.TP
-.B \-v
-Print version number and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \fB\-digital\fP
-Display a digital clock face (default is analog).
-.TP
-.B \fB\-display\fP \fIdpy\fP
-X11 display. Default is to read the DISPLAY environment variable.
-.UNINDENT
-.SH FILES
-.INDENT 0.0
-.TP
-.B /usr/share/wmtime/languages/*.lang
-Language support files. Each is a text file with exactly 19 lines. The
-first 7 lines are the 2\-letter weekday name abbreviations, starting
-with Sunday. The other 12 lines are the 3\-letter month name abbreviations,
-starting with January. Only ASCII is supported, no Unicode or extended 8859\-*
-character sets.
-.TP
-.B /usr/share/wmtime/language
-Symlink to one of the files in /usr/share/wmtime/languages/. This is the
-language the application will use. The system administrator can adjust the
-symlink, but there\(aqs no way for a normal user to use a different language
-than the system default.
-.UNINDENT
-.SH COPYRIGHT
-.sp
-See the file /usr/doc/wmtime\-1.0b2/COPYING for license information.
-.SH AUTHORS
-.sp
-wmtime was written by tijno and warp.
-.sp
-This man page written for the SlackBuilds.org project
-by B. Watson, and is licensed under the WTFPL.
-.\" Generated by docutils manpage writer.
-.
diff --git a/desktop/wmtime/wmtime.SlackBuild b/desktop/wmtime/wmtime.SlackBuild
index d2cb2df416..cad9aee916 100644
--- a/desktop/wmtime/wmtime.SlackBuild
+++ b/desktop/wmtime/wmtime.SlackBuild
@@ -8,6 +8,10 @@
 # had no license, modified version released under the WTFPL. See
 # http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210219 bkw: update for v1.4. This adds libdockapp as a dep, and
+# greatly simplifies the locale support. Also upstream added a man page,
+# so get rid of mine.
+
 # 20170211 bkw:
 # - Add man page, BUILD=3
 
@@ -18,8 +22,8 @@
 # - Add Spanish, French, German language support.
 
 PRGNAM=wmtime
-VERSION=${VERSION:-1.0b2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,45 +58,23 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM.app
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM.app
+rm -rf $PRGNAM-$VERSION
+
+# The top-level dir is named dockapps-<githash>, force it to decompress to
+# a sanely-named directory:
+mkdir -p $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components=1
+cd $PRGNAM-$VERSION
+
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# make the language stuff actually work
-sed -i \
-  "s,fopen(\"language\",fopen(\"/usr/share/$PRGNAM/language\"," \
-  $PRGNAM/$PRGNAM.c
-
-# much as I like the Beatles, we can't have 8 weekday names here:
-sed -i '8d' languages/slovene.lang
-
-sed -i "s/cc -c/cc -c -fgnu89-inline $SLKCFLAGS/" $PRGNAM/Makefile
-make -C $PRGNAM
-mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM/languages
-install -m0755 -s $PRGNAM/$PRGNAM $PKG/usr/bin
-install -m0644 languages/* $CWD/*.lang $PKG/usr/share/$PRGNAM/languages
-
-LANGUAGE="${LANGUAGE:-us}"
-if [ -e $PKG/usr/share/$PRGNAM/languages/$LANGUAGE.lang ]; then
-  ln -s languages/$LANGUAGE.lang $PKG/usr/share/$PRGNAM/language
-else
-  echo "Invalid LANGUAGE '$LANGUAGE'. Supported values are:" 2>&1
-  ls $PKG/usr/share/$PRGNAM/languages/*.lang | sed 's,.*/\([^/]*\)\.lang,\1,g'
-  exit 1
-fi
+chmod 644 *
 
-# man page written for this slackbuild
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+make CFLAGS="$SLKCFLAGS" LDFLAGS="-Wl,-s" PREFIX=/usr
+make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man/man1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/wmtime/wmtime.info b/desktop/wmtime/wmtime.info
index 5a3ebb4580..f60fd08502 100644
--- a/desktop/wmtime/wmtime.info
+++ b/desktop/wmtime/wmtime.info
@@ -1,10 +1,10 @@
 PRGNAM="wmtime"
-VERSION="1.0b2"
-HOMEPAGE="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html"
-DOWNLOAD="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmtime-1.0b2.tar.gz"
-MD5SUM="04c03e001aa702cf653b6b6c3f58bf87"
+VERSION="1.4"
+HOMEPAGE="https://www.dockapps.net/wmtime"
+DOWNLOAD="https://www.dockapps.net/download/wmtime-1.4.tar.gz"
+MD5SUM="b4efbb4113ad4f1252cf5488796789dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libdockapp"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/desktop/wmtime/wmtime.rst b/desktop/wmtime/wmtime.rst
deleted file mode 100644
index b72e406838..0000000000
--- a/desktop/wmtime/wmtime.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-.. RST source for wmtime(1) man page. Convert with:
-..   rst2man.py wmtime.rst > wmtime.1
-.. rst2man.py comes from the SBo development/docutils package.
-
-.. |version| replace:: 1.0b2
-.. |date| date::
-
-======
-wmtime
-======
-
---------------------------------------
-clock/calendar dockapp for windowmaker
---------------------------------------
-
-:Manual section: 1
-:Manual group: SlackBuilds.org
-:Date: |date|
-:Version: |version|
-
-SYNOPSIS
-========
-
-wmtime [-digital] [-display *dpy*] [-h] [-v]
-
-DESCRIPTION
-===========
-
-wmtime is a clock and calendar dockapp for windowmaker. It can display
-an analog-style clock face or a digital-style readout. The current month,
-day, and day of week are displayed also.
-
-wmtime supports multiple languages for the weekday and month names. See
-*FILES* below for details on how to change the language.
-
-OPTIONS
-=======
-
--h
-    Print usage message and exit.
- 
--v
-    Print version number and exit.
-
-**-digital**
-    Display a digital clock face (default is analog).
-
-**-display** *dpy*
-    X11 display. Default is to read the DISPLAY environment variable.
-
-FILES
-=====
-
-/usr/share/wmtime/languages/\*.lang
-    Language support files. Each is a text file with exactly 19 lines. The
-    first 7 lines are the 2-letter weekday name abbreviations, starting
-    with Sunday. The other 12 lines are the 3-letter month name abbreviations,
-    starting with January. Only ASCII is supported, no Unicode or extended 8859-*
-    character sets.
-
-/usr/share/wmtime/language
-    Symlink to one of the files in /usr/share/wmtime/languages/. This is the
-    language the application will use. The system administrator can adjust the
-    symlink, but there's no way for a normal user to use a different language
-    than the system default.
-
-COPYRIGHT
-=========
-
-See the file /usr/doc/wmtime-|version|/COPYING for license information.
-
-AUTHORS
-=======
-
-wmtime was written by tijno and warp.
-
-This man page written for the SlackBuilds.org project
-by B. Watson, and is licensed under the WTFPL.
diff --git a/desktop/wmweather+/README b/desktop/wmweather+/README
index 6bbbada40a..47996afcff 100644
--- a/desktop/wmweather+/README
+++ b/desktop/wmweather+/README
@@ -1,3 +1,5 @@
+wmweather+ (Weather Monitor DockApp)
+
 wmweather+ will download the National Weather Serivce METAR bulletins;
 AVN, ETA, and MRF forecasts; and any weather map for display in a
 WindowMaker dockapp. Think wmweather with a smaller font, forecasts,
@@ -5,5 +7,5 @@ a weather map, and a sky condition display.
 
 Note: This requires a config file, either /etc/wmweather+.conf or
 ~/.wmweather+/conf, which is used to set your geographical location.
-See /usr/doc/wmweather+-2.15/example.conf and read "man wmweather+"
-for details.
+See /usr/doc/wmweather+-$VERSION/example.conf and read "man
+wmweather+" for details.
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild
index df90ced6a5..2b9be99f6e 100644
--- a/desktop/wmweather+/wmweather+.SlackBuild
+++ b/desktop/wmweather+/wmweather+.SlackBuild
@@ -27,6 +27,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20201020 bkw: update for v2.18.
 # 20170324 bkw: update for v2.17.
 
 # 20170121 bkw:
@@ -42,10 +43,13 @@
 # - i486 => i586
 
 PRGNAM=wmweather+
-VERSION=${VERSION:-2.17}
+VERSION=${VERSION:-2.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# URL-escaped form of the name, in case something saved it as that.
+ALTNAM=wmweather%2B
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -79,19 +83,17 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
+  tar xvf $CWD/$ALTNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Default viewer needs to be something that Slack actually has.
 # Note that "xterm -e less" doesn't work: it doesn't read from the
 # xterm's stdin.
-sed -i 's,xless,xmore,g' $PRGNAM.1.in $PRGNAM.c
+sed -i 's,xless,xmore,g' $PRGNAM.1 $PRGNAM.c
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/wmweather+/wmweather+.info b/desktop/wmweather+/wmweather+.info
index c7925f0c54..70baf4b31a 100644
--- a/desktop/wmweather+/wmweather+.info
+++ b/desktop/wmweather+/wmweather+.info
@@ -1,8 +1,8 @@
 PRGNAM="wmweather+"
-VERSION="2.17"
+VERSION="2.18"
 HOMEPAGE="https://sourceforge.net/projects/wmweatherplus/"
-DOWNLOAD="https://sourceforge.net/projects/wmweatherplus/files/wmweather%2B/wmweather%2B-2.17.tar.gz"
-MD5SUM="89da7675017b1ca8c456e5736ff03249"
+DOWNLOAD="https://sourceforge.net/projects/wmweatherplus/files/wmweather%2B/wmweather%2B-2.18.tar.gz"
+MD5SUM="6c825888cd56dce74d1c3c6c959f1f61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/x-tile/x-tile.SlackBuild b/desktop/x-tile/x-tile.SlackBuild
index 9cf32fe088..4c28972261 100644
--- a/desktop/x-tile/x-tile.SlackBuild
+++ b/desktop/x-tile/x-tile.SlackBuild
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=x-tile
-VERSION=${VERSION:-3.2}
+VERSION=${VERSION:-3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/x-tile/x-tile.info b/desktop/x-tile/x-tile.info
index d5560e095d..d1a09ce1f9 100644
--- a/desktop/x-tile/x-tile.info
+++ b/desktop/x-tile/x-tile.info
@@ -1,8 +1,8 @@
 PRGNAM="x-tile"
-VERSION="3.2"
+VERSION="3.3"
 HOMEPAGE="http://www.giuspen.com/x-tile/"
-DOWNLOAD="https://github.com/giuspen/x-tile/archive/3.2/x-tile-3.2.tar.gz"
-MD5SUM="038bd4103959315e3a91088885f851d7"
+DOWNLOAD="https://github.com/giuspen/x-tile/archive/3.3/x-tile-3.3.tar.gz"
+MD5SUM="19d6168ec2572ca49e575d22e8ce5df6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/desktop/x2x/README b/desktop/x2x/README
new file mode 100644
index 0000000000..0d03b4a883
--- /dev/null
+++ b/desktop/x2x/README
@@ -0,0 +1,4 @@
+x2x (share keyboard/mouse between multiple X displays)
+
+x2x allows the keyboard and mouse on one X display to be used to control
+another X display. It also shares X clipboards between the displays.
diff --git a/desktop/x2x/git2tarxz.sh b/desktop/x2x/git2tarxz.sh
new file mode 100644
index 0000000000..a515561416
--- /dev/null
+++ b/desktop/x2x/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=x2x
+CLONE_URL=https://github.com/dottedmag/x2x.git
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=1.30_beta+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/desktop/x2x/slack-desc b/desktop/x2x/slack-desc
new file mode 100644
index 0000000000..1dc8a7d28a
--- /dev/null
+++ b/desktop/x2x/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+x2x: x2x (share keyboard/mouse between multiple X displays)
+x2x:
+x2x: x2x allows the keyboard and mouse on one X display to be used to
+x2x: control another X display. It also shares X clipboards between
+x2x: the displays.
+x2x:
+x2x:
+x2x:
+x2x:
+x2x:
+x2x:
diff --git a/desktop/x2x/x2x.SlackBuild b/desktop/x2x/x2x.SlackBuild
new file mode 100644
index 0000000000..81f4a0b7ca
--- /dev/null
+++ b/desktop/x2x/x2x.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# Slackware build script for x2x
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20200130 bkw: Sorry about the fugly version number. The last "release"
+# was 1.30-beta, which got imported into a github repo by the current
+# upstream, who has made some changes but not yet done a release.
+
+PRGNAM=x2x
+VERSION=${VERSION:-1.30_beta+20200121_ec10215}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+sh bootstrap.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/x2x/x2x.info b/desktop/x2x/x2x.info
new file mode 100644
index 0000000000..86344e9254
--- /dev/null
+++ b/desktop/x2x/x2x.info
@@ -0,0 +1,10 @@
+PRGNAM="x2x"
+VERSION="1.30_beta+20200121_ec10215"
+HOMEPAGE="https://github.com/dottedmag/x2x"
+DOWNLOAD="https://slackware.uk/~urchlay/src/x2x-1.30_beta+20200121_ec10215.tar.xz"
+MD5SUM="4d31a8e54beca199cd05227bfa9a6cc6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
index 60e248afeb..eb22508dad 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
+++ b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
@@ -7,25 +7,19 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
 # for details.
 
+# 20201103 bkw: updated for v1.6.
 # 20180917 bkw: updated for v1.5.
-
-# 20170301 bkw:
-# - Use long-form github URL.
-
+# 20170301 bkw: Use long-form github URL.
 # 20161221 bkw:
 # - Updated for v1.4. Missed 1.2 and 1.3 releases, sorry about that.
 
-# 20161015 bkw:
-# - Updated for v1.1.
-
-# 20160726 bkw:
-# - Updated for v0.9.
-
+# 20161015 bkw: Updated for v1.1.
+# 20160726 bkw: Updated for v0.9.
 # 20150914 bkw: updated 0.5 => 0.8. upstream now uses a Makefile
 # instead of install.sh so this script can't build the old version.
 
 PRGNAM=xdgmenumaker
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/xdgmenumaker/xdgmenumaker.info b/desktop/xdgmenumaker/xdgmenumaker.info
index 530749993e..9832c1fa86 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.info
+++ b/desktop/xdgmenumaker/xdgmenumaker.info
@@ -1,8 +1,8 @@
 PRGNAM="xdgmenumaker"
-VERSION="1.5"
+VERSION="1.6"
 HOMEPAGE="https://github.com/gapan/xdgmenumaker"
-DOWNLOAD="https://github.com/gapan/xdgmenumaker/archive/1.5/xdgmenumaker-1.5.tar.gz"
-MD5SUM="d79547d6c746a54ebe97359e840bcfe4"
+DOWNLOAD="https://github.com/gapan/xdgmenumaker/archive/1.6/xdgmenumaker-1.6.tar.gz"
+MD5SUM="4194aaa4074d938a54d0c9c853c0b4e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyxdg txt2tags"
diff --git a/desktop/xss-lock/README b/desktop/xss-lock/README
new file mode 100644
index 0000000000..5a187fb578
--- /dev/null
+++ b/desktop/xss-lock/README
@@ -0,0 +1,17 @@
+This is xss-lock, a program for using an external locker as the X
+screensaver.
+
+xss-lock can be run at startup with a favorite screensaving or
+screenlocking program:
+
+  xss-lock slock
+
+xset values for screensaver onset are respected. More details can be
+found in the man page.
+
+xss-lock is a good choice for window manager-only graphical setups.
+Desktop environments with native screensaver programs can (and probably
+will) interfere with xss-lock.
+
+Optional dependency: docutils (if not installed, the man page will be
+copied in rather than built)
diff --git a/desktop/xss-lock/slack-desc b/desktop/xss-lock/slack-desc
new file mode 100644
index 0000000000..2ce419405c
--- /dev/null
+++ b/desktop/xss-lock/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+xss-lock: xss-lock (using external locker as X screensaver)
+xss-lock:
+xss-lock: xss-lock hooks up a favorite screen locker to the MIT screen saver
+xss-lock: extension for X and to the login manager.
+xss-lock:
+xss-lock: Although xss-lock conflicts with no Slackware packages, native DE
+xss-lock: screensavers may cause runtime interference.
+xss-lock:
+xss-lock: Author: Raymond Wagenmaker
+xss-lock:
+xss-lock: https://github.com/xdbob/xss-lock
diff --git a/desktop/xss-lock/xss-lock.1 b/desktop/xss-lock/xss-lock.1
new file mode 100644
index 0000000000..6004824c48
--- /dev/null
+++ b/desktop/xss-lock/xss-lock.1
@@ -0,0 +1,200 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "XSS-LOCK" 1 "November 2013" "" ""
+.SH NAME
+xss-lock \- use external locker as X screen saver
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.nf
+xss\-lock [\-n \fInotify_cmd\fP] [\-\-ignore\-sleep] [\-l] [\-v|\-q] [\-\-] \fIlocker\fP [\fIarg\fP] ...
+xss\-lock \-\-help|\-\-version
+.fi
+.sp
+.SH DESCRIPTION
+.sp
+\fBxss\-lock\fP hooks up your favorite locker to the MIT screen saver extension
+for X and also to systemd\(aqs login manager. The locker is executed in response
+to events from these two sources:
+.INDENT 0.0
+.IP \(bu 2
+X signals when screen saver activation is forced or after a period of user
+inactivity (as set with \fBxset s TIMEOUT\fP). In the latter case, the notifier
+command, if specified, is executed first.
+.IP \(bu 2
+The login manager can also request that the session be locked; as a result of
+\fBloginctl lock\-sessions\fP, for example. Additionally, \fBxss\-lock\fP uses the
+inhibition logic to lock the screen before the system goes to sleep.
+.UNINDENT
+.sp
+\fBxss\-lock\fP waits for the locker to exit \-\- or kills it when screen saver
+deactivation or session unlocking is forced \-\- so the command should not fork.
+.sp
+Also, \fBxss\-lock\fP manages the idle hint on the login session. The idle state
+of the session is directly linked to user activity as reported by X (except
+when the notifier runs before locking the screen). When all sessions are idle,
+the login manager can take action (such as suspending the system) after a
+preconfigured delay.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.BI \-n \ cmd\fR,\fB \ \-\-notifier\fB= cmd
+Run \fIcmd\fP when the screen saver activates because of user
+inactivity. Shell\-style quoting is supported. The notifier is
+killed when X signals user activity or when the locker is
+started. The locker is started after the first screen saver
+cycle, as set with \fBxset s TIMEOUT CYCLE\fP\&.
+.sp
+This can be used to run a countdown or (on laptops) dim the
+screen before locking. For an example, see the script
+\fI/usr/share/doc/xss\-lock/dim\-screen.sh\fP\&.
+.TP
+.B  \-l\fP,\fB  \-\-tranfer\-sleep\-lock
+Allow the locker process to inherit the file descriptor that
+represents the delay lock obtained from the login manager. The
+corresponding index will be made available in the environment
+variable \fB$XSS_SLEEP_LOCK_FD\fP; this will only be set if the
+reason for locking is that the system is preparing to go to
+sleep. The locker should close this file descriptor to indicate
+it is ready.
+.sp
+Example scripts that wrap existing lockers are available as
+\fI/usr/share/doc/xss\-lock/transfer\-sleep\-lock\-*.sh\fP\&.
+.TP
+.B  \-\-ignore\-sleep
+Do not lock on suspend/hibernate.
+.TP
+.B  \-q\fP,\fB  \-\-quiet
+Output only fatal errors.
+.TP
+.B  \-v\fP,\fB  \-\-verbose
+Output more messages.
+.TP
+.B  \-h\fP,\fB  \-\-help
+Print help message and exit.
+.TP
+.B  \-\-version
+Print version number and exit.
+.UNINDENT
+.SH SIGNALS
+.INDENT 0.0
+.TP
+.B SIGHUP
+Upon receiving this signal, \fBxss\-lock\fP resets the screen saver, but only
+if the screen is not currently locked (unlike \fBxset s reset\fP).
+.sp
+This can be used in MPlayer\(aqs configuration as a workaround for MPlayer\(aqs
+failure to restart the screen saver timer when playback is paused:
+.INDENT 7.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+heartbeat\-cmd="killall \-HUP xss\-lock"
+stop\-xscreensaver=false
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+\fBNOTE:\fP
+.INDENT 7.0
+.INDENT 3.5
+This is ineffective with mplayer2 (and mpv), because its heart
+keeps beating while playback is paused.
+.UNINDENT
+.UNINDENT
+.TP
+.B SIGINT/SIGTERM
+Upon receiving this signal, \fBxss\-lock\fP exits after killing any running
+notifier or locker.
+.UNINDENT
+.SH NOTES
+.INDENT 0.0
+.IP \(bu 2
+Some applications rely on the \fBxdg\-screensaver\fP script from xdg\-utils,
+which uses \fBxset s off\fP and \fBxset s default\fP to suspend and resume the
+screen saver, respectively. The latter resets the timeout and cycle to the
+server defaults (\fBxset s on\fP uses a hardcoded default instead), so this
+only works if you are happy with (or can control) the server settings.
+.sp
+To fix the resume action in this script (or a copy in \fI~/bin\fP preceding the
+original in \fB$PATH\fP), either replace \fBon\fP by your preferred timeout and
+cycle, or avoid hardcoded time values by patching the script to run a suspend
+loop as it does for other screen savers, using
+\fI/usr/share/doc/xss\-lock/xdg\-screensaver.patch\fP\&.
+.UNINDENT
+.SH EXAMPLES
+.INDENT 0.0
+.IP \(bu 2
+Run \fBxlock\fP after ten minutes of inactivity:
+.INDENT 2.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+xset 600
+xss\-lock xlock +resetsaver
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Without \fB+resetsaver\fP, \fBxlock\fP forces a screen saver reset during
+startup, thereby telling \fBxss\-lock\fP to immediately kill \fBxlock\fP again.
+.IP \(bu 2
+Dim the screen after three minutes of inactivity, lock the screen two minutes
+later using \fBi3lock\fP:
+.INDENT 2.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+xset 180 120
+xss\-lock \-n dim\-screen.sh \-\- i3lock \-n
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+\fBNOTE:\fP
+.INDENT 2.0
+.INDENT 3.5
+A script is provided to use \fBi3lock\fP\(aqs forking mode with the
+\fB\-\-tranfer\-sleep\-lock\fP option (see above).
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fBxset\fP(1),
+\fBsystemd\-logind.service\fP(8)
+.SH AUTHOR
+Raymond Wagenmaker <raymondwagenmaker@gmail.com>
+.\" Generated by docutils manpage writer.
+.
diff --git a/desktop/xss-lock/xss-lock.SlackBuild b/desktop/xss-lock/xss-lock.SlackBuild
new file mode 100644
index 0000000000..ef05210aff
--- /dev/null
+++ b/desktop/xss-lock/xss-lock.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for xss-lock
+
+# Copyright 2021 K. Eugene Carlson  Tsukuba, Japan
+# 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=xss-lock
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# LIBDIRSUFFIX flag not available
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_STRIP=/usr/bin/strip \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# man page will be copied over if docutils is not available.
+if [ -d $PKG/usr/share/man ]; then
+  mv $PKG/usr/share/man $PKG/usr
+  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
+else
+  mkdir -p $PKG/usr/man/man1
+  gzip -9 -c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+fi
+
+# Moving and renaming the documentation directory
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rm -r $PKG/usr/share/doc
+cp -a $CWD/README LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/xss-lock/xss-lock.info b/desktop/xss-lock/xss-lock.info
new file mode 100644
index 0000000000..168d7dfaff
--- /dev/null
+++ b/desktop/xss-lock/xss-lock.info
@@ -0,0 +1,10 @@
+PRGNAM="xss-lock"
+VERSION="0.3.0"
+HOMEPAGE="https://github.com/xdbob/xss-lock"
+DOWNLOAD="https://github.com/xdbob/xss-lock/archive/v0.3.0/xss-lock-0.3.0.tar.gz"
+MD5SUM="ebfa58416117a272c2e534036a0deeb4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/desktop/xtrlock/xtrlock.SlackBuild b/desktop/xtrlock/xtrlock.SlackBuild
index 10b33f0af5..c0122df01e 100644
--- a/desktop/xtrlock/xtrlock.SlackBuild
+++ b/desktop/xtrlock/xtrlock.SlackBuild
@@ -6,8 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210219 bkw: updated for v2.15.
+# 20201208 bkw: updated for v2.14, although the only changes
+# since 2.13 are in the debian packagaing (which we don't/can't
+# use). Basically just updating it to avoid people asking for it to
+# be updated.
+
 PRGNAM=xtrlock
-VERSION=${VERSION:-2.13}
+VERSION=${VERSION:-2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/xtrlock/xtrlock.info b/desktop/xtrlock/xtrlock.info
index 3ad180ab57..9fea679082 100644
--- a/desktop/xtrlock/xtrlock.info
+++ b/desktop/xtrlock/xtrlock.info
@@ -1,8 +1,8 @@
 PRGNAM="xtrlock"
-VERSION="2.13"
+VERSION="2.15"
 HOMEPAGE="https://packages.debian.org/sid/xtrlock"
-DOWNLOAD="https://deb.debian.org/debian/pool/main/x/xtrlock/xtrlock_2.13.tar.xz"
-MD5SUM="8d33e389a24b41bbf03f20830569b22c"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/x/xtrlock/xtrlock_2.15.tar.xz"
+MD5SUM="3b481c63bc3d7b05d3adce388bc79762"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/CImg/CImg.SlackBuild b/development/CImg/CImg.SlackBuild
index a2642d22fd..d557357ee7 100644
--- a/development/CImg/CImg.SlackBuild
+++ b/development/CImg/CImg.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CImg
-VERSION=${VERSION:-2.9.2}
+VERSION=${VERSION:-2.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/CImg/CImg.info b/development/CImg/CImg.info
index 705bb04612..a288a35f0e 100644
--- a/development/CImg/CImg.info
+++ b/development/CImg/CImg.info
@@ -1,8 +1,8 @@
 PRGNAM="CImg"
-VERSION="2.9.2"
+VERSION="2.9.6"
 HOMEPAGE="http://cimg.eu/"
-DOWNLOAD="http://cimg.eu/files/CImg_2.9.2.zip"
-MD5SUM="4d083fe459973ea9c57d23465d13d10a"
+DOWNLOAD="http://cimg.eu/files/CImg_2.9.6.zip"
+MD5SUM="8e383752a2a9b1f42da3aac5c4180cf9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/Fennel/Fennel.SlackBuild b/development/Fennel/Fennel.SlackBuild
index fb8cca12cf..911d36d297 100644
--- a/development/Fennel/Fennel.SlackBuild
+++ b/development/Fennel/Fennel.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for Fennel
-# Copyright 2020 abooksigun <abooksigun09@gmail.com>
+# Copyright 2021 abooksigun <abooksigun09@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Fennel
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,38 +68,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make fennel
+make fennel fennel.lua
 
 LUAVER=${LUAVER:-"5.1 5.2 5.3 5.4 jit"}
 BINARY=${BINARY:-no}
+
 for i in $LUAVER
 do
-  if [ $i == 5.1 ] || [ $i == 5.2 ] || [ $i == 5.3 ] || [ $i == 5.4 ] || [ $i == jit ]
+  if [ $i != 5.1 ]; then ver=$i; fi
+  if [ $i == "jit" ]; then libver=jit-5.1 include=luajit-2.0; else libver=$i include=lua$i; fi
+  if $(lua$ver -v &> /dev/null)
   then
-    if [ $i != 5.1 ]; then ver=$i libver=$i include=lua$i; fi
-    if $(lua$ver -v &> /dev/null)
+    sed -i "1s|lua.*|lua$ver|" fennel
+    if [ $BINARY == "yes" ] && [ $i != 5.1 ]
+    then
+      make \
+        STATIC_LUA_LIB=/usr/lib$LIBDIRSUFFIX/liblua$libver.a \
+        LUA_INCLUDE_DIR=/usr/include/$include \
+        fennel-bin
+      install -D -m 0755 fennel-bin $PKG/usr/bin/fennel$ver
+      rm fennel-bin
+    else
+      install -D -m 0755 fennel $PKG/usr/bin/fennel$ver
+    fi
+    if [ $i != jit ]
     then
-      sed -i "1s|lua.*|lua$ver|" fennel
-      if [ "$BINARY" == "yes" ] && [ $i != 5.1 ]
-      then
-        if [ $i == jit ]; then libver=jit-5.1 include=luajit-2.0; fi
-        make \
-          STATIC_LUA_LIB=/usr/lib$LIBDIRSUFFIX/liblua$libver.a \
-          LUA_INCLUDE_DIR=/usr/include/$include \
-          fennel-bin
-        install -D -m 0755 fennel-bin $PKG/usr/bin/fennel$ver
-        rm fennel-bin
-      else
-        install -D -m 0755 fennel $PKG/usr/bin/fennel$ver
-      fi
-      if [ $i != jit ]
-      then
-        install -D -m 0644 -t $PKG/usr/share/lua/$i fennel.lua fennelview.fnl fennelview.lua
-      fi
+      install -D -m 0644 -t $PKG/usr/share/lua/$i fennel.lua fennelview.lua 
     fi
-  else
-    echo -e 'LUAVER must be one or more of "5.1 5.2 5.3 5.4 jit" separated with space'
-    exit 1
   fi
 done
 
diff --git a/development/Fennel/Fennel.info b/development/Fennel/Fennel.info
index ad3c37eabd..7aa2f32dff 100644
--- a/development/Fennel/Fennel.info
+++ b/development/Fennel/Fennel.info
@@ -1,8 +1,8 @@
 PRGNAM="Fennel"
-VERSION="0.6.0"
+VERSION="0.8.1"
 HOMEPAGE="https://fennel-lang.org/"
-DOWNLOAD="https://github.com/bakpakin/Fennel/archive/0.6.0/Fennel-0.6.0.tar.gz"
-MD5SUM="dac8e51dbc8f86d3bd60356f3cdf086f"
+DOWNLOAD="https://github.com/bakpakin/Fennel/archive/0.8.1/Fennel-0.8.1.tar.gz"
+MD5SUM="3da27b2de69e9e1bfe80a3928cb0453a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/development/FreeBASIC/FreeBASIC.SlackBuild b/development/FreeBASIC/FreeBASIC.SlackBuild
index b851e000e0..87bea6da52 100644
--- a/development/FreeBASIC/FreeBASIC.SlackBuild
+++ b/development/FreeBASIC/FreeBASIC.SlackBuild
@@ -22,9 +22,40 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201224 bkw: BUILD=3, fixed, for real this time. I think. BUILD=2
+# version worked only if fbc was already installed :(
+
+# 20201211 bkw: modified by SlackBuilds.org, to build FreeBASIC from source
+# instead of using prebuilt binary packages. There are various reasons for
+# wanting to do this:
+
+# - The prebuilt binaries were built on an OS where the terminfo fuctions
+#   from ncurses were split into a separate library (libtinfo). Using
+#   the binary package on Slackware 14.2 means creating a libtinfo
+#   symlink in /usr/lib64, which can cause problems later (e.g. if
+#   something else links with it, no harm done... until you removepkg
+#   FreeBASIC). Also, there are reports on the mailing list of fbc
+#   being unable to compile FreeBASIC code that uses curses, even with
+#   the symlink in place. Building it on our OS prevents this issue.
+#   The folks on the mailing list "solved" this problem by reverting to
+#   the FreeBASIC version from the 14.0 repo, which is what prompted
+#   me to fix this build...
+
+# - In the same vein, the prebuilt binaries have /usr/lib/freebasic hardcoded,
+#   so there had to be a symlink to lib64 on Slackware64.
+
+# - General paranoia about trusting prebuilt binaries.
+
+# - If we build it, we get FreeBASIC bindings for various libraries that
+#   are installed, e.g. mysql and libart_lgpl.
+
+# - I was hoping that compiling from source would fix a couple other
+#   problems. The sdl2-hello example segfaults with both the prebuilt
+#   and built-from-source fbc :(
+
 PRGNAM=FreeBASIC
 VERSION=${VERSION:-1.07.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -56,54 +87,69 @@ fi
 
 set -e
 
-if [ "$ARCH" = "x86_64" ]; then
-    SRCVER=$(echo $VERSION-linux-x86_64)
-else
-    SRCVER=$(echo $VERSION-linux-x86)
-fi
+SRCVER=$VERSION-source-bootstrap
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.xz
 cd $PRGNAM-$SRCVER
 chown -R root:root .
-find -L . \
- \( -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 {} \;
-
-mkdir -p $PKG/usr/bin $PKG/usr/include/${PRGNAM,,} $PKG/usr/lib/${PRGNAM,,} \
-    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM,,} $PKG/usr/man/man1
-
-install -D -m0755 bin/fbc $PKG/usr/bin/fbc
-cp -rf include/${PRGNAM,,}/* $PKG/usr/include/${PRGNAM,,}
-cp -rf lib/${PRGNAM,,}/* $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM,,}
-
-# fix linking library for x86_64 arch
-if [ "$ARCH" = "x86_64" ]; then
-  ln -sf \
-  /usr/lib${LIBDIRSUFFIX}/${PRGNAM,,}/linux-x86_64 \
-  $PKG/usr/lib/${PRGNAM,,}
-fi
-
-# fix linking with libtinfo over libncurses
-ln -sf \
-  /usr/lib${LIBDIRSUFFIX}/libncurses.so.5 \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so.5
-ln -sf \
-  /usr/lib${LIBDIRSUFFIX}/libtinfo.so.5 \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so
-
-# gzip man page
-gzip -c doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+[ "$LIBDIRSUFFIX" = "64" ] && extra="ENABLE_LIB64=1"
+
+# This is interesting: we have "precompiled sources", which means
+# FreeBASIC source that was 'compiled' to C source. So to bootstrap
+# fbc, we first build the precompiled C to make a minimal fbc binary,
+# then use that to build the real fbc from the FreeBASIC sources.
+make bootstrap
+
+FBC="$( pwd )/bootstrap/fbc"
+FBFLAGS="-i $( pwd )/inc"
+
+# fbdoc needs its own FBFLAGS. Loosely based on a patch from ponce.
+sed -i -e 's,\<FBFLAGS\>,XFBFLAGS,g' \
+       -e 's,\$(XFBFLAGS),$(FBFLAGS) &,' \
+    doc/fbdoc/makefile
+
+# multiple make commands, with mostly the same args
+run_make() {
+  make \
+    V=1 \
+    FBC="$FBC" \
+    FBFLAGS="$FBFLAGS" \
+    prefix=/usr \
+    ENABLE_STRIPALL=1 \
+    INSTALL_PROGRAM="install -s" \
+    DESTDIR=$PKG \
+    $extra \
+    "$@"
+}
+
+run_make
+run_make install
+
+# Build and install the manual.
+run_make -C doc/libfbdoc
+run_make -C doc/fbdoc
+run_make -C doc/manual html/DocToc.html txt/fbdoc.txt
+
+mkdir -p $PKG/usr/man/man1
+gzip -9c < doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz
+
+# zero length files...
+find examples/ -name deleteme.txt -exec rm {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.txt doc/manual/txt/ doc/manual/html/ examples/ \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+ln -s DocToc.html $PKG/usr/doc/$PRGNAM-$VERSION/html/index.html
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/development/FreeBASIC/FreeBASIC.info b/development/FreeBASIC/FreeBASIC.info
index 820c24f02e..4ca88c2175 100644
--- a/development/FreeBASIC/FreeBASIC.info
+++ b/development/FreeBASIC/FreeBASIC.info
@@ -1,10 +1,10 @@
 PRGNAM="FreeBASIC"
 VERSION="1.07.1"
 HOMEPAGE="http://www.freebasic.net"
-DOWNLOAD="http://downloads.sourceforge.net/fbc/FreeBASIC-1.07.1-linux-x86.tar.gz"
-MD5SUM="a49da627f5605c0ce703adbc7f1d082c"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/fbc/FreeBASIC-1.07.1-linux-x86_64.tar.gz"
-MD5SUM_x86_64="12d32ee7148be69b47d6c1be1df64fb1"
+DOWNLOAD="http://downloads.sourceforge.net/fbc/FreeBASIC-1.07.1-source-bootstrap.tar.xz"
+MD5SUM="be05b0c6e1a3f2547c24ce7dcc16584f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/development/FreeBASIC/README b/development/FreeBASIC/README
index 5163083ae5..731744dd1b 100644
--- a/development/FreeBASIC/README
+++ b/development/FreeBASIC/README
@@ -2,3 +2,8 @@ Open-source, free, multi-platform BASIC compiler, with syntax
 similar MS-QuickBASIC (including the GFX statements), that adds
 new features such as pointers, unsigned data types, inline
 assembly, a pre-processor and many others.
+
+The complete FreeBASIC manual is included with the package. You can
+view it at:
+
+file:///usr/doc/FreeBASIC-1.07.1/html/index.html
diff --git a/development/KKEdit/KKEdit.info b/development/KKEdit/KKEdit.info
index bad539e841..c4c5c1d293 100644
--- a/development/KKEdit/KKEdit.info
+++ b/development/KKEdit/KKEdit.info
@@ -1,7 +1,7 @@
 PRGNAM="KKEdit"
 VERSION="0.1.8"
-HOMEPAGE="http://keithhedger.hostingsiteforfree.com/pages/kkedit/help.html"
-DOWNLOAD="https://dl.dropboxusercontent.com/s/cufjc9wh4qwmond/KKEdit-0.1.8.tar.gz"
+HOMEPAGE="http://web.archive.org/web/20140403205405/http://keithhedger.hostingsiteforfree.com:80/pages/kkedit/help.html"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-md5/b/8/b8f297d8d9b8714addf65dee1a0b9aee/KKEdit-0.1.8.tar.gz"
 MD5SUM="b8f297d8d9b8714addf65dee1a0b9aee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.SlackBuild b/development/QtPy/QtPy.SlackBuild
index 48e4f67053..6cff9f0c73 100644
--- a/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.SlackBuild
+++ b/development/QtPy/QtPy.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for python3-jupyter-ipykernel
+# Slackware build script for QtPy
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=python3-jupyter-ipykernel
-VERSION=${VERSION:-5.2.1}
+PRGNAM=QtPy
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=ipykernel
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -61,9 +59,9 @@ 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.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,7 +69,6 @@ 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 {} \;
 
-sed -i "s/executable='python'/executable='python3'/" setup.py
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -79,7 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CONTRIBUTING.md COPYING.md README.md \
+  AUTHORS.md CHANGELOG.md LICENSE.txt README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/QtPy/QtPy.info b/development/QtPy/QtPy.info
new file mode 100644
index 0000000000..4454ad7be2
--- /dev/null
+++ b/development/QtPy/QtPy.info
@@ -0,0 +1,10 @@
+PRGNAM="QtPy"
+VERSION="1.9.0"
+HOMEPAGE="https://github.com/spyder-ide/QtPy"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/Q/QtPy/QtPy-1.9.0.tar.gz"
+MD5SUM="a7c993a82a1e0a0fbd01ef4aa924ed21"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-PyQt5"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/QtPy/README b/development/QtPy/README
new file mode 100644
index 0000000000..8bdc7dc48c
--- /dev/null
+++ b/development/QtPy/README
@@ -0,0 +1,5 @@
+QtPy is a small abstraction layer that lets you write applications using
+a single API call to either PyQt or PySide.
+
+It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5
+layout (where the QtGui module has been split into QtGui and QtWidgets).
diff --git a/development/QtPy/slack-desc b/development/QtPy/slack-desc
new file mode 100644
index 0000000000..ed92f3ef1e
--- /dev/null
+++ b/development/QtPy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+QtPy: QtPy (Qt abstraction layer for Python)
+QtPy:
+QtPy: QtPy is a small abstraction layer that lets you write applications
+QtPy: using a single API call to either PyQt or PySide.
+QtPy:
+QtPy: It provides support for PyQt5, PyQt4, PySide2 and PySide using the
+QtPy: Qt5 layout (where the QtGui module has been split into QtGui and
+QtPy: QtWidgets).
+QtPy:
+QtPy:
+QtPy:
diff --git a/development/SQLAlchemy/SQLAlchemy.SlackBuild b/development/SQLAlchemy/SQLAlchemy.SlackBuild
index d89e37135f..089e7afa80 100644
--- a/development/SQLAlchemy/SQLAlchemy.SlackBuild
+++ b/development/SQLAlchemy/SQLAlchemy.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SQLAlchemy
-VERSION=${VERSION:-1.3.13}
+VERSION=${VERSION:-1.3.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/SQLAlchemy/SQLAlchemy.info b/development/SQLAlchemy/SQLAlchemy.info
index 5e70410874..eff36c72fc 100644
--- a/development/SQLAlchemy/SQLAlchemy.info
+++ b/development/SQLAlchemy/SQLAlchemy.info
@@ -1,8 +1,8 @@
 PRGNAM="SQLAlchemy"
-VERSION="1.3.13"
+VERSION="1.3.22"
 HOMEPAGE="http://www.sqlalchemy.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/af/47/35edeb0f86c0b44934c05d961c893e223ef27e79e1f53b5e6f14820ff553/SQLAlchemy-1.3.13.tar.gz"
-MD5SUM="7ccf4fd305b2cd647221c4d6be0d7999"
+DOWNLOAD="https://files.pythonhosted.org/packages/b7/10/b6d02efa2cb10dca0671fd62c9091c1e49831b266658fd7a056c577621cb/SQLAlchemy-1.3.22.tar.gz"
+MD5SUM="49513756b0ab589bee014b4c5401581c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/ShellCheck-bin/ShellCheck-bin.SlackBuild b/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
index bafddd7f8e..b6cd1f574c 100644
--- a/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
+++ b/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
@@ -28,23 +28,19 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-    *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 if [ "$ARCH" != "x86_64" ]; then
   echo "$ARCH is not supported."
   exit 1
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 set -e
 
 rm -rf $PKG
diff --git a/development/Sphinx/README b/development/Sphinx/README
index 9a5cd64baf..cfd397e4f1 100644
--- a/development/Sphinx/README
+++ b/development/Sphinx/README
@@ -12,5 +12,4 @@ require special build instructions not captured in REQUIRES:
 - python/python-chardet: install python/python3 first
 - python/imagesize: install python/python3 first
 - python/alabaster: install python/python3 first
-- python/python-requests: install python/python3-certifi first
 - python/pytz: install python/python3 first
diff --git a/development/Sphinx/Sphinx.SlackBuild b/development/Sphinx/Sphinx.SlackBuild
index 5a28c07391..e272e5cb43 100644
--- a/development/Sphinx/Sphinx.SlackBuild
+++ b/development/Sphinx/Sphinx.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Sphinx
 
 # Copyright 2013 Mikko Värri, Finland
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Sphinx
-VERSION=${VERSION:-3.0.3}
+VERSION=${VERSION:-3.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/Sphinx/Sphinx.info b/development/Sphinx/Sphinx.info
index e142a54bd4..9e04dda7b4 100644
--- a/development/Sphinx/Sphinx.info
+++ b/development/Sphinx/Sphinx.info
@@ -1,10 +1,10 @@
 PRGNAM="Sphinx"
-VERSION="3.0.3"
+VERSION="3.5.4"
 HOMEPAGE="http://www.sphinx-doc.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-3.0.3.tar.gz"
-MD5SUM="d5d0f61059c8ddb01b12e80a9e61adcb"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-3.5.4.tar.gz"
+MD5SUM="dd46088ebc01f6f721ee7618df680d68"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="alabaster imagesize python3-babel docutils Jinja2 python3-packaging Pygments python-requests python3-six snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml python3-certifi"
+REQUIRES="alabaster imagesize python3-babel docutils Jinja2 python3-packaging Pygments python-requests python3-six snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml python-certifi"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/adms/adms.SlackBuild b/development/adms/adms.SlackBuild
index 64a7f436a1..6f0e69f444 100644
--- a/development/adms/adms.SlackBuild
+++ b/development/adms/adms.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for adms
 
-# Copyright 2020 Fellype do Nascimento, Campinas - Brazil
+# Copyright 2020 Fellype do Nascimento, Guaratingueta - Brazil
 #
 # All rights reserved.
 #
@@ -27,7 +27,6 @@ PRGNAM=adms
 VERSION=${VERSION:-2.3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-SRCNAME=ADMS-release
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,7 +60,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $SRCNAME-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/apache-log4cxx/apache-log4cxx.SlackBuild b/development/apache-log4cxx/apache-log4cxx.SlackBuild
index 8e1adafefb..3af27f55ac 100644
--- a/development/apache-log4cxx/apache-log4cxx.SlackBuild
+++ b/development/apache-log4cxx/apache-log4cxx.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=apache-log4cxx
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-0.11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ 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 {} \;
 
-zcat $CWD/fixincludes.patch.gz | patch -p1 || exit
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/apache-log4cxx/apache-log4cxx.info b/development/apache-log4cxx/apache-log4cxx.info
index 4f23c19804..44b0e78d66 100644
--- a/development/apache-log4cxx/apache-log4cxx.info
+++ b/development/apache-log4cxx/apache-log4cxx.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-log4cxx"
-VERSION="0.10.0"
+VERSION="0.11.0"
 HOMEPAGE="https://logging.apache.org/log4cxx/latest_stable/index.html"
-DOWNLOAD="http://www-us.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz"
-MD5SUM="b30ffb8da3665178e68940ff7a61084c"
+DOWNLOAD="http://www-us.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz"
+MD5SUM="bf8d5e2a1356ae593c952e45bf96c5d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/apache-log4cxx/fixincludes.patch.gz b/development/apache-log4cxx/fixincludes.patch.gz
deleted file mode 100644
index b2d23c84b2..0000000000
--- a/development/apache-log4cxx/fixincludes.patch.gz
+++ /dev/null
diff --git a/development/apache-maven/apache-maven.SlackBuild b/development/apache-maven/apache-maven.SlackBuild
index 78b8cc6b15..9e1a3821e5 100644
--- a/development/apache-maven/apache-maven.SlackBuild
+++ b/development/apache-maven/apache-maven.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2016 Ciorceri Petru Sorin, Cluj-Napoca, Romania
-# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=apache-maven
-VERSION=${VERSION:-3.6.3}
+VERSION=${VERSION:-3.8.1}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/development/apache-maven/apache-maven.info b/development/apache-maven/apache-maven.info
index 6735b9e69f..1511e797f0 100644
--- a/development/apache-maven/apache-maven.info
+++ b/development/apache-maven/apache-maven.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-maven"
-VERSION="3.6.3"
+VERSION="3.8.1"
 HOMEPAGE="https://maven.apache.org/"
-DOWNLOAD="http://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz"
-MD5SUM="9792c717f5845d952907d5144b8253c3"
+DOWNLOAD="http://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz"
+MD5SUM="90197f18ed9036a1709ff0e09558c083"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/arm-binutils/arm-binutils.SlackBuild b/development/arm-binutils/arm-binutils.SlackBuild
index b6c5cf415d..f8121d17ef 100644
--- a/development/arm-binutils/arm-binutils.SlackBuild
+++ b/development/arm-binutils/arm-binutils.SlackBuild
@@ -28,7 +28,7 @@
 # Claudio Henrique Fortes Felix <felix.claudio [at] gmail [dot] com>.
 
 PRGNAM=arm-binutils
-VERSION=${VERSION:-2.34}
+VERSION=${VERSION:-2.35}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,9 +65,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf binutils-$VERSION
-tar xvf $CWD/binutils-$VERSION.tar.xz
+tar xvf $CWD/binutils-$VERSION.tar.?z
 cd binutils-$VERSION
 chown -R root:root .
+
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
diff --git a/development/arm-binutils/arm-binutils.info b/development/arm-binutils/arm-binutils.info
index e768e4f573..2194fa17a8 100644
--- a/development/arm-binutils/arm-binutils.info
+++ b/development/arm-binutils/arm-binutils.info
@@ -1,8 +1,8 @@
 PRGNAM="arm-binutils"
-VERSION="2.34"
+VERSION="2.35"
 HOMEPAGE="http://www.gnu.org/software/binutils"
-DOWNLOAD="https://ftp.gnu.org/gnu/binutils/binutils-2.34.tar.xz"
-MD5SUM="664ec3a2df7805ed3464639aaae332d6"
+DOWNLOAD="https://ftp.gnu.org/gnu/binutils/binutils-2.35.tar.xz"
+MD5SUM="fc8d55e2f6096de8ff8171173b6f5087"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/arm-gcc/arm-gcc.SlackBuild b/development/arm-gcc/arm-gcc.SlackBuild
index e69cacfb1d..89df04cc53 100644
--- a/development/arm-gcc/arm-gcc.SlackBuild
+++ b/development/arm-gcc/arm-gcc.SlackBuild
@@ -25,7 +25,7 @@
 # Written by Marek Buras <cyfr0n (at) go2 !dot pl>
 
 PRGNAM=arm-gcc
-VERSION=${VERSION:-9.2.0}
+VERSION=${VERSION:-10.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,9 +62,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf gcc-$VERSION arm-gcc-build-$VERSION
-tar xvf $CWD/gcc-$VERSION.tar.xz
+tar xvf $CWD/gcc-$VERSION.tar.?z
 mkdir arm-gcc-build-$VERSION
 cd arm-gcc-build-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/arm-gcc/arm-gcc.info b/development/arm-gcc/arm-gcc.info
index 5c40c50106..4ec85d0b15 100644
--- a/development/arm-gcc/arm-gcc.info
+++ b/development/arm-gcc/arm-gcc.info
@@ -1,8 +1,8 @@
 PRGNAM="arm-gcc"
-VERSION="9.2.0"
+VERSION="10.2.0"
 HOMEPAGE="http://www.gnu.org/software/gcc/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz"
-MD5SUM="3818ad8600447f05349098232c2ddc78"
+DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz"
+MD5SUM="e9fd9b1789155ad09bcf3ae747596b50"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="arm-binutils"
diff --git a/development/arm-gcc/configure_options.txt b/development/arm-gcc/configure_options.txt
new file mode 100644
index 0000000000..e48b91773c
--- /dev/null
+++ b/development/arm-gcc/configure_options.txt
@@ -0,0 +1,252 @@
+`configure' configures this package to adapt to many kinds of systems.
+
+Usage: ./configure [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print `checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for `--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or `..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [/usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, `make install' will install all the files in
+`/usr/local/bin', `/usr/local/lib' etc.  You can specify
+an installation prefix other than `/usr/local' using `--prefix',
+for instance `--prefix=$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-as-accelerator-for=ARG
+                          build as offload target compiler. Specify offload
+                          host triple by ARG
+  --enable-offload-targets=LIST
+                          enable offloading to devices from comma-separated
+                          LIST of TARGET[=DIR]. Use optional path to find
+                          offload target compiler during the build
+  --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+  --enable-ld[=ARG]       build ld [ARG={default,yes,no}]
+  --enable-compressed-debug-sections={all,gas,gold,ld,none}
+                          Enable compressed debug sections for gas, gold or ld
+                          by default
+  --disable-libquadmath   do not build libquadmath directory
+  --disable-libquadmath-support
+                          disable libquadmath support for Fortran
+  --enable-libada         build libada directory
+  --enable-libssp         build libssp directory
+  --disable-libstdcxx     do not build libstdc++-v3 directory
+  --enable-liboffloadmic=ARG
+                          build liboffloadmic [ARG={no,host,target}]
+  --enable-bootstrap      enable bootstrapping [yes if native build]
+  --disable-isl-version-check
+                          disable check for isl version
+  --enable-lto            enable link time optimization support
+  --enable-linker-plugin-configure-flags=FLAGS
+                          additional flags for configuring linker plugins
+                          [none]
+  --enable-linker-plugin-flags=FLAGS
+                          additional flags for configuring and building linker
+                          plugins [none]
+  --enable-host-shared    build host code as shared libraries
+  --enable-stage1-languages[=all]
+                          choose additional languages to build during stage1.
+                          Mostly useful for compiler development
+  --enable-objc-gc        enable use of Boehm's garbage collector with the GNU
+                          Objective-C runtime
+  --enable-vtable-verify  Enable vtable verification feature
+  --enable-serial-[{host,target,build}-]configure
+                          force sequential configuration of sub-packages for
+                          the host, target or build machine, or all
+                          sub-packages
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-stage1-checking[=all]
+                          choose additional checking for stage1 of the
+                          compiler
+  --enable-werror         enable -Werror in bootstrap stage2 and later
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-build-libsubdir=DIR  Directory where to find libraries for build system
+  --with-system-zlib      use installed libz
+  --with-mpc=PATH         specify prefix directory for installed MPC package.
+                          Equivalent to --with-mpc-include=PATH/include plus
+                          --with-mpc-lib=PATH/lib
+  --with-mpc-include=PATH specify directory for installed MPC include files
+  --with-mpc-lib=PATH     specify directory for the installed MPC library
+  --with-mpfr-dir=PATH    this option has been REMOVED
+  --with-mpfr=PATH        specify prefix directory for installed MPFR package.
+                          Equivalent to --with-mpfr-include=PATH/include plus
+                          --with-mpfr-lib=PATH/lib
+  --with-mpfr-include=PATH
+                          specify directory for installed MPFR include files
+  --with-mpfr-lib=PATH    specify directory for the installed MPFR library
+  --with-gmp-dir=PATH     this option has been REMOVED
+  --with-gmp=PATH         specify prefix directory for the installed GMP
+                          package. Equivalent to
+                          --with-gmp-include=PATH/include plus
+                          --with-gmp-lib=PATH/lib
+  --with-gmp-include=PATH specify directory for installed GMP include files
+  --with-gmp-lib=PATH     specify directory for the installed GMP library
+  --with-stage1-libs=LIBS libraries for stage1
+  --with-static-standard-libraries
+                          use -static-libstdc++ and -static-libgcc
+                          (default=auto)
+  --with-stage1-ldflags=FLAGS
+                          linker flags for stage1
+  --with-boot-libs=LIBS   libraries for stage2 and later
+  --with-boot-ldflags=FLAGS
+                          linker flags for stage2 and later
+  --with-isl=PATH         Specify prefix directory for the installed isl
+                          package. Equivalent to
+                          --with-isl-include=PATH/include plus
+                          --with-isl-lib=PATH/lib
+  --with-isl-include=PATH Specify directory for installed isl include files
+  --with-isl-lib=PATH     Specify the directory for the installed isl library
+  --with-target-bdw-gc=PATHLIST
+                          specify prefix directory for installed bdw-gc
+                          package. Equivalent to
+                          --with-target-bdw-gc-include=PATH/include plus
+                          --with-target-bdw-gc-lib=PATH/lib
+  --with-target-bdw-gc-include=PATHLIST
+                          specify directories for installed bdw-gc include
+                          files
+  --with-target-bdw-gc-lib=PATHLIST
+                          specify directories for installed bdw-gc library
+  --with-gcc-major-version-only
+                          use only GCC major number in filesystem paths
+  --with-build-sysroot=SYSROOT
+                          use sysroot as the system root during the build
+  --with-debug-prefix-map='A=B C=D ...'
+                          map A to B, C to D ... in debug information
+  --with-build-config='NAME NAME2...'
+                          use config/NAME.mk build configuration
+  --with-build-time-tools=PATH
+                          use given path to find target tools during the build
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  build_configargs
+              additional configure arguments for build directories
+  host_configargs
+              additional configure arguments for host directories
+  target_configargs
+              additional configure arguments for target directories
+  AR          AR for the host
+  AS          AS for the host
+  DLLTOOL     DLLTOOL for the host
+  LD          LD for the host
+  LIPO        LIPO for the host
+  NM          NM for the host
+  RANLIB      RANLIB for the host
+  STRIP       STRIP for the host
+  WINDRES     WINDRES for the host
+  WINDMC      WINDMC for the host
+  OBJCOPY     OBJCOPY for the host
+  OBJDUMP     OBJDUMP for the host
+  OTOOL       OTOOL for the host
+  READELF     READELF for the host
+  CC_FOR_TARGET
+              CC for the target
+  CXX_FOR_TARGET
+              CXX for the target
+  GCC_FOR_TARGET
+              GCC for the target
+  GFORTRAN_FOR_TARGET
+              GFORTRAN for the target
+  GOC_FOR_TARGET
+              GOC for the target
+  GDC_FOR_TARGET
+              GDC for the target
+  AR_FOR_TARGET
+              AR for the target
+  AS_FOR_TARGET
+              AS for the target
+  DLLTOOL_FOR_TARGET
+              DLLTOOL for the target
+  LD_FOR_TARGET
+              LD for the target
+  LIPO_FOR_TARGET
+              LIPO for the target
+  NM_FOR_TARGET
+              NM for the target
+  OBJCOPY_FOR_TARGET
+              OBJCOPY for the target
+  OBJDUMP_FOR_TARGET
+              OBJDUMP for the target
+  OTOOL_FOR_TARGET
+              OTOOL for the target
+  RANLIB_FOR_TARGET
+              RANLIB for the target
+  READELF_FOR_TARGET
+              READELF for the target
+  STRIP_FOR_TARGET
+              STRIP for the target
+  WINDRES_FOR_TARGET
+              WINDRES for the target
+  WINDMC_FOR_TARGET
+              WINDMC for the target
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
diff --git a/development/arm-gdb/arm-gdb.SlackBuild b/development/arm-gdb/arm-gdb.SlackBuild
index c13359ef3c..717913d004 100644
--- a/development/arm-gdb/arm-gdb.SlackBuild
+++ b/development/arm-gdb/arm-gdb.SlackBuild
@@ -25,7 +25,7 @@
 # Written by thorsten <thorsten (dot) johannvorderbrueggen (at) t-online (dot) de>
 
 PRGNAM=arm-gdb
-VERSION=${VERSION:-8.3}
+VERSION=${VERSION:-10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,9 +62,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf gdb-$VERSION arm-gdb-build-$VERSION
-tar xvf $CWD/gdb-$VERSION.tar.xz
+tar xvf $CWD/gdb-$VERSION.tar.?z
 mkdir arm-gdb-build-$VERSION
 cd arm-gdb-build-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/arm-gdb/arm-gdb.info b/development/arm-gdb/arm-gdb.info
index b3aede5b85..e0ed08f206 100644
--- a/development/arm-gdb/arm-gdb.info
+++ b/development/arm-gdb/arm-gdb.info
@@ -1,8 +1,8 @@
 PRGNAM="arm-gdb"
-VERSION="8.3"
+VERSION="10.1"
 HOMEPAGE="http://www.gnu.org/software/gdb/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gdb/gdb-8.3.tar.xz"
-MD5SUM="bbd95b2f9b34621ad7a19a3965476314"
+DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gdb/gdb-10.1.tar.xz"
+MD5SUM="1822a7dd45e7813f4408407eec1a6af1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="arm-gcc"
diff --git a/development/arm-gdb/configure_options.txt b/development/arm-gdb/configure_options.txt
new file mode 100644
index 0000000000..f6344f4a8b
--- /dev/null
+++ b/development/arm-gdb/configure_options.txt
@@ -0,0 +1,247 @@
+`configure' configures this package to adapt to many kinds of systems.
+
+Usage: ./configure [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print `checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for `--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or `..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [/usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, `make install' will install all the files in
+`/usr/local/bin', `/usr/local/lib' etc.  You can specify
+an installation prefix other than `/usr/local' using `--prefix',
+for instance `--prefix=$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-as-accelerator-for=ARG
+                          build as offload target compiler. Specify offload
+                          host triple by ARG
+  --enable-offload-targets=LIST
+                          enable offloading to devices from comma-separated
+                          LIST of TARGET[=DIR]. Use optional path to find
+                          offload target compiler during the build
+  --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+  --enable-ld[=ARG]       build ld [ARG={default,yes,no}]
+  --enable-compressed-debug-sections={all,gas,gold,ld,none}
+                          Enable compressed debug sections for gas, gold or ld
+                          by default
+  --disable-libquadmath   do not build libquadmath directory
+  --disable-libquadmath-support
+                          disable libquadmath support for Fortran
+  --enable-libada         build libada directory
+  --enable-libssp         build libssp directory
+  --disable-libstdcxx     do not build libstdc++-v3 directory
+  --enable-liboffloadmic=ARG
+                          build liboffloadmic [ARG={no,host,target}]
+  --enable-bootstrap      enable bootstrapping [yes if native build]
+  --disable-isl-version-check
+                          disable check for isl version
+  --enable-lto            enable link time optimization support
+  --enable-linker-plugin-configure-flags=FLAGS
+                          additional flags for configuring linker plugins
+                          [none]
+  --enable-linker-plugin-flags=FLAGS
+                          additional flags for configuring and building linker
+                          plugins [none]
+  --enable-host-shared    build host code as shared libraries
+  --enable-stage1-languages[=all]
+                          choose additional languages to build during stage1.
+                          Mostly useful for compiler development
+  --enable-objc-gc        enable use of Boehm's garbage collector with the GNU
+                          Objective-C runtime
+  --enable-vtable-verify  Enable vtable verification feature
+  --enable-serial-[{host,target,build}-]configure
+                          force sequential configuration of sub-packages for
+                          the host, target or build machine, or all
+                          sub-packages
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-stage1-checking[=all]
+                          choose additional checking for stage1 of the
+                          compiler
+  --enable-werror         enable -Werror in bootstrap stage2 and later
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-build-libsubdir=DIR  Directory where to find libraries for build system
+  --with-system-zlib      use installed libz
+  --with-mpc=PATH         specify prefix directory for installed MPC package.
+                          Equivalent to --with-mpc-include=PATH/include plus
+                          --with-mpc-lib=PATH/lib
+  --with-mpc-include=PATH specify directory for installed MPC include files
+  --with-mpc-lib=PATH     specify directory for the installed MPC library
+  --with-mpfr-dir=PATH    this option has been REMOVED
+  --with-mpfr=PATH        specify prefix directory for installed MPFR package.
+                          Equivalent to --with-mpfr-include=PATH/include plus
+                          --with-mpfr-lib=PATH/lib
+  --with-mpfr-include=PATH
+                          specify directory for installed MPFR include files
+  --with-mpfr-lib=PATH    specify directory for the installed MPFR library
+  --with-gmp-dir=PATH     this option has been REMOVED
+  --with-gmp=PATH         specify prefix directory for the installed GMP
+                          package. Equivalent to
+                          --with-gmp-include=PATH/include plus
+                          --with-gmp-lib=PATH/lib
+  --with-gmp-include=PATH specify directory for installed GMP include files
+  --with-gmp-lib=PATH     specify directory for the installed GMP library
+  --with-stage1-libs=LIBS libraries for stage1
+  --with-static-standard-libraries
+                          use -static-libstdc++ and -static-libgcc
+                          (default=auto)
+  --with-stage1-ldflags=FLAGS
+                          linker flags for stage1
+  --with-boot-libs=LIBS   libraries for stage2 and later
+  --with-boot-ldflags=FLAGS
+                          linker flags for stage2 and later
+  --with-isl=PATH         Specify prefix directory for the installed isl
+                          package. Equivalent to
+                          --with-isl-include=PATH/include plus
+                          --with-isl-lib=PATH/lib
+  --with-isl-include=PATH Specify directory for installed isl include files
+  --with-isl-lib=PATH     Specify the directory for the installed isl library
+  --with-target-bdw-gc=PATHLIST
+                          specify prefix directory for installed bdw-gc
+                          package. Equivalent to
+                          --with-target-bdw-gc-include=PATH/include plus
+                          --with-target-bdw-gc-lib=PATH/lib
+  --with-target-bdw-gc-include=PATHLIST
+                          specify directories for installed bdw-gc include
+                          files
+  --with-target-bdw-gc-lib=PATHLIST
+                          specify directories for installed bdw-gc library
+  --with-gcc-major-version-only
+                          use only GCC major number in filesystem paths
+  --with-build-sysroot=SYSROOT
+                          use sysroot as the system root during the build
+  --with-debug-prefix-map='A=B C=D ...'
+                          map A to B, C to D ... in debug information
+  --with-build-config='NAME NAME2...'
+                          use config/NAME.mk build configuration
+  --with-build-time-tools=PATH
+                          use given path to find target tools during the build
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  build_configargs
+              additional configure arguments for build directories
+  host_configargs
+              additional configure arguments for host directories
+  target_configargs
+              additional configure arguments for target directories
+  AR          AR for the host
+  AS          AS for the host
+  DLLTOOL     DLLTOOL for the host
+  LD          LD for the host
+  LIPO        LIPO for the host
+  NM          NM for the host
+  RANLIB      RANLIB for the host
+  STRIP       STRIP for the host
+  WINDRES     WINDRES for the host
+  WINDMC      WINDMC for the host
+  OBJCOPY     OBJCOPY for the host
+  OBJDUMP     OBJDUMP for the host
+  READELF     READELF for the host
+  CC_FOR_TARGET
+              CC for the target
+  CXX_FOR_TARGET
+              CXX for the target
+  GCC_FOR_TARGET
+              GCC for the target
+  GFORTRAN_FOR_TARGET
+              GFORTRAN for the target
+  GOC_FOR_TARGET
+              GOC for the target
+  AR_FOR_TARGET
+              AR for the target
+  AS_FOR_TARGET
+              AS for the target
+  DLLTOOL_FOR_TARGET
+              DLLTOOL for the target
+  LD_FOR_TARGET
+              LD for the target
+  LIPO_FOR_TARGET
+              LIPO for the target
+  NM_FOR_TARGET
+              NM for the target
+  OBJCOPY_FOR_TARGET
+              OBJCOPY for the target
+  OBJDUMP_FOR_TARGET
+              OBJDUMP for the target
+  RANLIB_FOR_TARGET
+              RANLIB for the target
+  READELF_FOR_TARGET
+              READELF for the target
+  STRIP_FOR_TARGET
+              STRIP for the target
+  WINDRES_FOR_TARGET
+              WINDRES for the target
+  WINDMC_FOR_TARGET
+              WINDMC for the target
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
diff --git a/development/asl/asl.SlackBuild b/development/asl/asl.SlackBuild
index 3a6696be1d..8ccdf75e02 100644
--- a/development/asl/asl.SlackBuild
+++ b/development/asl/asl.SlackBuild
@@ -7,6 +7,7 @@
 # Original version had no license. Modified version released under the
 # WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201106 bkw: update for 142_bld178.
 # 20191202 bkw: update for 142_bld150.
 # 20180911 bkw: update for 142_bld137.
 # 20180615 bkw: update for 142_bld134.
@@ -26,7 +27,7 @@
 
 PRGNAM=asl
 SRCNAM=asl-current
-VERSION=${VERSION:-142_bld150}
+VERSION=${VERSION:-142_bld178}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -83,7 +84,11 @@ UTF8="${UTF8:-no}"
   sed -i 's/CHARSET_ISO8859_1/CHARSET_UTF8/' Makefile.def
 
 # binaries are already stripped, no symlinks in man pages.
-make -j1 binaries install PREFIX=$PKG DOCPATH=""
+# 20201106 bkw: upstream changed PREFIX to INSTROOT, support both
+# in case someone wants to build an old version.
+DESTDIR=PREFIX
+grep -q INSTROOT Makefile && DESTDIR=INSTROOT
+make -j1 binaries install $DESTDIR=$PKG DOCPATH=""
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/asl/asl.info b/development/asl/asl.info
index 55482210cc..eac582d044 100644
--- a/development/asl/asl.info
+++ b/development/asl/asl.info
@@ -1,8 +1,8 @@
 PRGNAM="asl"
-VERSION="142_bld150"
+VERSION="142_bld178"
 HOMEPAGE="http://john.ccac.rwth-aachen.de:8000/as/"
-DOWNLOAD="http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld150.tar.bz2"
-MD5SUM="89b1a389f6c28927cc9c7b65420553db"
+DOWNLOAD="http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld178.tar.bz2"
+MD5SUM="742f3ed7090c71c15dd6d75a08e9f7b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bluefish/README b/development/bluefish/README
index 98716f80a8..52080b7673 100644
--- a/development/bluefish/README
+++ b/development/bluefish/README
@@ -1,6 +1,5 @@
-Bluefish is a powerful editor for experienced web designers and
-programmers.  Bluefish supports many programming and markup languages,
-but it focuses on editing dynamic and interactive websites. See
-features for an extensive overview, take a look at the screenshots, or
-download it right away.  Bluefish is an open source development project
-released under the GPL licence.
+Bluefish is a powerful editor for experienced web designers and programmers. 
+Bluefish supports many programming and markup languages, but it focuses on 
+editing dynamic and interactive websites. See features for an extensive 
+overview, take a look at the screenshots, or download it right away. 
+Bluefish is an open source development project released under the GPL licence.
diff --git a/development/bluefish/bluefish.SlackBuild b/development/bluefish/bluefish.SlackBuild
index 9dd58a49bd..24fa383dbd 100644
--- a/development/bluefish/bluefish.SlackBuild
+++ b/development/bluefish/bluefish.SlackBuild
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bluefish
-VERSION=${VERSION:-2.2.11}
+VERSION=${VERSION:-2.2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/bluefish/bluefish.info b/development/bluefish/bluefish.info
index 282835d074..157954a6ad 100644
--- a/development/bluefish/bluefish.info
+++ b/development/bluefish/bluefish.info
@@ -1,8 +1,8 @@
 PRGNAM="bluefish"
-VERSION="2.2.11"
+VERSION="2.2.12"
 HOMEPAGE="http://bluefish.openoffice.nl/index.html"
-DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.11.tar.bz2"
-MD5SUM="8c08aebcb7eaeccfebcaf467983733eb"
+DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.12.tar.bz2"
+MD5SUM="33dd8262c4d8a564a517f8c98c0cce19"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bmake/bmake.SlackBuild b/development/bmake/bmake.SlackBuild
index 05f140d3e9..8b393206ea 100644
--- a/development/bmake/bmake.SlackBuild
+++ b/development/bmake/bmake.SlackBuild
@@ -24,6 +24,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20201106 bkw: update for 20201010
 # 20200306 bkw: update for 20200212
 # 20191211 bkw: update for 20181221
 # 20170214 bkw:
@@ -34,7 +35,7 @@
 #   portion of the bmake build.
 
 PRGNAM=bmake
-VERSION=${VERSION:-20200212}
+VERSION=${VERSION:-20201010}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -116,8 +117,11 @@ mv $PKG/usr/share/mk $PKG/usr/share/mk-$PRGNAM
 find -L $PKG  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Binary is already stripped. Only have one man page:
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+# Binary is already stripped. Only have one man page.
+# Oh FFS, 20201010 ignores MANTARGET, we get /usr/man/cat1.
+rm -rf $PKG/usr/man/*
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 head -n70 main.c > LICENSE
diff --git a/development/bmake/bmake.info b/development/bmake/bmake.info
index 3430f1db55..e640ec7948 100644
--- a/development/bmake/bmake.info
+++ b/development/bmake/bmake.info
@@ -1,8 +1,8 @@
 PRGNAM="bmake"
-VERSION="20200212"
+VERSION="20201010"
 HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
-DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20200212.tar.gz"
-MD5SUM="20a917552baf266f4434d97a2ddb7daa"
+DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20201010.tar.gz"
+MD5SUM="37b7890e551c8e3916d4b6834afb6b53"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bpython/bpython.SlackBuild b/development/bpython/bpython.SlackBuild
index 45d4595731..fd6df0794a 100644
--- a/development/bpython/bpython.SlackBuild
+++ b/development/bpython/bpython.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bpython
 
-# Copyright 2014-2020  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # Written by vvoody <vvoodywang@gmail.com>
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bpython
-VERSION=${VERSION:-0.19}
+VERSION=${VERSION:-0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,8 +66,7 @@ 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 $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG sample.theme light.theme \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS.rst CHANGELOG.rst README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/bpython/bpython.info b/development/bpython/bpython.info
index 911d718d1a..e5abedf937 100644
--- a/development/bpython/bpython.info
+++ b/development/bpython/bpython.info
@@ -1,10 +1,10 @@
 PRGNAM="bpython"
-VERSION="0.19"
+VERSION="0.21"
 HOMEPAGE="https://bpython-interpreter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/46/15/2d60865176a5f806ab83c1c38a7c9a0da18ee3651fc1e7e9f5f9cf21e0e8/bpython-0.19.tar.gz"
-MD5SUM="8793712cf4aba736f2cedc7f51a798df"
+DOWNLOAD="https://files.pythonhosted.org/packages/8f/34/7bdeba9999d2dfe5c0682291966bfa7edcedf2859885fa0037b8a38d0878/bpython-0.21.tar.gz"
+MD5SUM="ca73d8c605767242aea522ec6bb84d48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-six python-requests Pygments curtsies greenlet"
+REQUIRES="python3-six python-requests Pygments curtsies greenlet pyxdg"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/development/bsdiff/bsdiff.info b/development/bsdiff/bsdiff.info
index 56206c8ab1..d647cd9e44 100644
--- a/development/bsdiff/bsdiff.info
+++ b/development/bsdiff/bsdiff.info
@@ -1,7 +1,7 @@
 PRGNAM="bsdiff"
 VERSION="4.3"
 HOMEPAGE="http://www.daemonology.net/bsdiff/"
-DOWNLOAD="http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz"
+DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/bsdiff-4.3.tar.gz"
 MD5SUM="e6d812394f0e0ecc8d5df255aa1db22a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/bvi/bvi.SlackBuild b/development/bvi/bvi.SlackBuild
index 43f086e72f..924a821459 100644
--- a/development/bvi/bvi.SlackBuild
+++ b/development/bvi/bvi.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bvi
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/bvi/bvi.info b/development/bvi/bvi.info
index db12de12de..899efe8c8b 100644
--- a/development/bvi/bvi.info
+++ b/development/bvi/bvi.info
@@ -1,8 +1,8 @@
 PRGNAM="bvi"
-VERSION="1.4.0"
+VERSION="1.4.1"
 HOMEPAGE="http://bvi.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/bvi/bvi/1.4.0/bvi-1.4.0.src.tar.gz"
-MD5SUM="aa83eb8b2b6b0bb6cdd8e6beef12b775"
+DOWNLOAD="http://downloads.sourceforge.net/project/bvi/bvi/1.4.1/bvi-1.4.1.src.tar.gz"
+MD5SUM="4d83d46e2ee76609a7b7b52e075a5900"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bviplus/README b/development/bviplus/README
new file mode 100644
index 0000000000..664ae4bfa3
--- /dev/null
+++ b/development/bviplus/README
@@ -0,0 +1,16 @@
+bviplus (hex editor with vi-style user interface)
+
+Bviplus is an ncurses based hex editor with a vim-like interface. It
+was originally a fork of Binary VIsual editor (bvi) by Gerhard
+Burgmann, but has now been completely rewritten (since version 0.3).
+
+Additions include:
+  - Quickly open/edit/save very large files
+  - Search highlighting
+  - Multiple undo/redo
+  - Visual select
+  - Cut/paste (works between files as well)
+  - Multiple file tabbed interface
+  - Run external programs on selected data
+  - Blob coloring
+  - And much more to come.
diff --git a/development/bviplus/bviplus.1 b/development/bviplus/bviplus.1
new file mode 100644
index 0000000000..3a91d9574e
--- /dev/null
+++ b/development/bviplus/bviplus.1
@@ -0,0 +1,77 @@
+.\" Man page generated from reStructuredText.
+.
+.TH BVIPLUS 1 "2020-11-16" "1.0" "SlackBuilds.org"
+.SH NAME
+bviplus \- hex editor with vi-style user interface
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for bviplus(1) man page. Convert with:
+.
+.\" rst2man.py bviplus.rst > bviplus.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+bviplus [ [\fIfile\fP] ... ]
+.SH DESCRIPTION
+.sp
+Bviplus is an ncurses based hex editor with a vim\-like interface. It
+was originally a fork of Binary VIsual editor (bvi) by Gerhard
+Burgmann, but has now been completely rewritten (since version 0.3).
+.sp
+There are no command\-line options. For usage instructions, enter
+":help" from within \fBbviplus\fP\&.
+.SH FILES
+.INDENT 0.0
+.TP
+.B \fB~/.bviplusrc\fP
+Startup script for \fBbviplus\fP, as described in the help.
+.UNINDENT
+.SH BUGS
+.sp
+Running \fBbviplus\fP with a nonexistant filename will always create the
+file, even if the :w (write) command is never used. This, combined
+with the fact that there are no options, may result in empty files
+named things like \fI\-\-help\fP or \fI\-h\fP\&.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/bviplus\-1.0/COPYING for license information.
+.SH AUTHORS
+.sp
+bviplus was written by David Kelley.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+bvi(1), hexer(1), vim(1), xxd(1), vi(1)
+.sp
+The bviplus homepage: \fI\%http://bviplus.sourceforge.net/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/development/bviplus/bviplus.SlackBuild b/development/bviplus/bviplus.SlackBuild
new file mode 100644
index 0000000000..9fc8faa0b2
--- /dev/null
+++ b/development/bviplus/bviplus.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for bviplus
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=bviplus
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Fix compile failure:
+sed -i 's,\<inline\>,,' *.c *.h
+
+# Fix warning:
+sed -i '/int *is_bin(c)/s,\<c\>,int c,' key_handler.c
+
+# Quiet debug output at startup:
+sed -i '/printf.*argv\[%d\]/d' main.c
+
+make V=1 EXTRA_CFLAGS="-Wall -Wno-unused $SLKCFLAGS -Wl,-s"
+mkdir -p $PKG/usr/bin
+cp -a $PRGNAM $PKG/usr/bin
+
+# man page by SlackBuild author
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/bviplus/bviplus.info b/development/bviplus/bviplus.info
new file mode 100644
index 0000000000..dc8f0ad6ed
--- /dev/null
+++ b/development/bviplus/bviplus.info
@@ -0,0 +1,10 @@
+PRGNAM="bviplus"
+VERSION="1.0"
+HOMEPAGE="http://bviplus.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/bviplus/bviplus/1.0/bviplus-1.0.tgz"
+MD5SUM="7e9f588679ecd200c64881396c302b8b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/bviplus/bviplus.rst b/development/bviplus/bviplus.rst
new file mode 100644
index 0000000000..94a10041d6
--- /dev/null
+++ b/development/bviplus/bviplus.rst
@@ -0,0 +1,68 @@
+.. RST source for bviplus(1) man page. Convert with:
+..   rst2man.py bviplus.rst > bviplus.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.0
+.. |date| date::
+
+=======
+bviplus
+=======
+
+---------------------------------------
+hex editor with vi-style user interface
+---------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+bviplus [ [*file*] ... ]
+
+DESCRIPTION
+===========
+
+Bviplus is an ncurses based hex editor with a vim-like interface. It
+was originally a fork of Binary VIsual editor (bvi) by Gerhard
+Burgmann, but has now been completely rewritten (since version 0.3).
+
+There are no command-line options. For usage instructions, enter
+":help" from within **bviplus**.
+
+FILES
+=====
+
+**~/.bviplusrc**
+  Startup script for **bviplus**, as described in the help.
+
+BUGS
+====
+
+Running **bviplus** with a nonexistant filename will always create the
+file, even if the :w (write) command is never used. This, combined
+with the fact that there are no options, may result in empty files
+named things like *--help* or *-h*.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/bviplus-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+bviplus was written by David Kelley.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+bvi(1), hexer(1), vim(1), xxd(1), vi(1)
+
+The bviplus homepage: http://bviplus.sourceforge.net/
diff --git a/development/bviplus/slack-desc b/development/bviplus/slack-desc
new file mode 100644
index 0000000000..30b1e0a977
--- /dev/null
+++ b/development/bviplus/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+bviplus: bviplus (hex editor with vi-style user interface)
+bviplus:
+bviplus: Bviplus is an ncurses based hex editor with a vim-like interface. It
+bviplus: was originally a fork of Binary VIsual editor (bvi) by Gerhard
+bviplus: Burgmann, but has now been completely rewritten (since version 0.3).
+bviplus:
+bviplus:
+bviplus:
+bviplus:
+bviplus:
+bviplus:
diff --git a/development/byacc/byacc.SlackBuild b/development/byacc/byacc.SlackBuild
index 614beba51e..2e4493bf3f 100644
--- a/development/byacc/byacc.SlackBuild
+++ b/development/byacc/byacc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for byacc
 
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=byacc
-VERSION=${VERSION:-20200910}
+VERSION=${VERSION:-20210328}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/byacc/byacc.info b/development/byacc/byacc.info
index 12afd52331..2e553f5cd3 100644
--- a/development/byacc/byacc.info
+++ b/development/byacc/byacc.info
@@ -1,8 +1,8 @@
 PRGNAM="byacc"
-VERSION="20200910"
+VERSION="20210328"
 HOMEPAGE="http://invisible-island.net/byacc/"
 DOWNLOAD="http://invisible-island.net/datafiles/release/byacc.tar.gz"
-MD5SUM="5726a5a655c6fd4e8f950552cceeae29"
+MD5SUM="a31940c74254f6b4cc51155322f58651"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cc65/README b/development/cc65/README
index c8b6e17a0d..25ceacb8dd 100644
--- a/development/cc65/README
+++ b/development/cc65/README
@@ -8,6 +8,8 @@ Supported targets include the Atari 400/800/XL/XE computers, the Atari
 Lynx console, the Commodore PET/VIC/64/16/Plus4, the Nintendo NES, the
 Apple II, and others.
 
-The cc65 project rarely does releases. This build is updated once or
-twice a year, to the latest git. If you need a specific version of
-cc65, see README_SBo.txt.
+Full documentation can be found in: /usr/doc/cc65-2.19/index.html
+
+If desired, the docs can also be built as info files. To do this, set
+INFO=yes in the script's environment. The script author makes no
+guarantee as to the usability of the info documentation.
diff --git a/development/cc65/cc65.SlackBuild b/development/cc65/cc65.SlackBuild
index b14c8fd4d1..5eebba6ac2 100644
--- a/development/cc65/cc65.SlackBuild
+++ b/development/cc65/cc65.SlackBuild
@@ -6,6 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210317 bkw:
+# - Update for 2.19 release. Script also tested with 2.18 and
+#   2.17_20180906, in case someone needs one of those versions.
+# - Use 'make html' to build the docs instead of pregenerating (tested
+#   on -current too).
+# - Add optional info docs to package.
+# - Use USER_CFLAGS instead of sed to support SLKCFLAGS.
+# - TODO: look at making good man pages for at least the executables.
+
 # 20180907 bkw:
 # - Update for 2.17_20180906, git commit b6ccd4d.
 # - Rename git2targz.sh => git2tarxz.sh.
@@ -34,7 +43,7 @@
 #   reason. Source is created from a git checkout, see git2targz.sh.
 
 PRGNAM=cc65
-VERSION=${VERSION:-2.17_20180906}
+VERSION=${VERSION:-2.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,21 +76,44 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . -type f -print0 | xargs -0 chmod 644
 find . -type d -print0 | xargs -0 chmod 755
 
-# external CFLAGS not honored
-sed -i "/^CFLAGS/s,-O[^ ]*,$SLKCFLAGS," src/Makefile
+# v2.19 binaries report themselves as v2.18. upstream fixed this in
+# git commit cffcbce60, I'll just sed it.
+[ "$VERSION" = "2.19" ] && sed -i '/#define VER_MINOR/s,18U,19U,' src/common/version.c
 
-PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-make all PREFIX=/usr prefix=/usr LDFLAGS=-Wl,-s
-#make -C doc html # we use pre-generated HTML docs now
-make install PREFIX=$PKG/usr prefix=$PKG/usr htmldir=$PKGDOC samplesdir=$PKGDOC/samples
+# HTML docs are always created and installed. If the user really
+# wants to, the same docs can be installed as .info files. They're not
+# enabled by default because they include .info files with names like
+# "index", "coding", "using-make" and even "lynx". It's not obvious
+# they belong to cc65, when they're sitting in the same /usr/info
+# dir as all the other .info files. Plus, the internal links between
+# the documents don't work when converted to .info, whereas the HTML
+# ones do.
+INFO="${INFO:-no}"
 
-# binaries already stripped, no man pages
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+make all PREFIX=/usr prefix=/usr LDFLAGS=-Wl,-s USER_CFLAGS="$SLKCFLAGS"
+make -C doc html
+[ "$INFO" = "yes" ] && make -C doc html info
+make install \
+  PREFIX=$PKG/usr prefix=$PKG/usr \
+  infodir=$PKG/usr/info htmldir=$PKGDOC \
+  samplesdir=$PKGDOC/samples
+
+# Binaries already stripped, no man pages, but there might be info
+# pages that needs to be gzipped. Note that the the info files can be
+# read with e.g. "info cc65", but won't show up in the info directory:
+# the generated docs lack sections and descriptions, so using
+# install-info in doinst.sh doesn't do anything. I also tried using
+# "linuxdoc -B txt --manpage" on the SGML doc sources, but the results
+# are ugly and have screwed-up formatting. If I want man pages, I'll
+# probably have to make them manually (pun intended).
+[ "$INFO" = "yes" ] && gzip $PKG/usr/info/*
 
 mkdir -p $PKGDOC
 cp -a README* LICENSE $PKGDOC
diff --git a/development/cc65/cc65.info b/development/cc65/cc65.info
index f9fcc41416..1a75591089 100644
--- a/development/cc65/cc65.info
+++ b/development/cc65/cc65.info
@@ -1,8 +1,8 @@
 PRGNAM="cc65"
-VERSION="2.17_20180906"
-HOMEPAGE="https://cc65.github.io/cc65/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/cc65-2.17_20180906.tar.xz"
-MD5SUM="d7dc9291c44251b018b271dd1c653bb5"
+VERSION="2.19"
+HOMEPAGE="https://cc65.github.io/"
+DOWNLOAD="https://github.com/cc65/cc65/archive/V2.19/cc65-2.19.tar.gz"
+MD5SUM="faff7b71a0212bb71faad1a271a83916"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cmake-202x/README_SBo.txt b/development/cmake-202x/README_SBo.txt
index 5dd70eb50d..e1531c1172 100644
--- a/development/cmake-202x/README_SBo.txt
+++ b/development/cmake-202x/README_SBo.txt
@@ -11,7 +11,8 @@ too old, here's how to use this:
 
    mkdir -p build
    cd build
-     /opt/cmake-202x/bin/cmake \
+     export "PATH=/opt/cmake-202x/bin:$PATH"
+     cmake \
        -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
        -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
    ...etc, etc.
diff --git a/development/cmake-202x/cmake-202x.SlackBuild b/development/cmake-202x/cmake-202x.SlackBuild
index a24fff5777..fdc060f793 100644
--- a/development/cmake-202x/cmake-202x.SlackBuild
+++ b/development/cmake-202x/cmake-202x.SlackBuild
@@ -20,9 +20,12 @@
 # it's from -current (therefore subject to change), I mirrored the
 # version I'm using on slackware.uk.
 
+# 20210306 bkw: updated for 3.19.6 (sync with -current).
+# 20201108 bkw: updated for 3.18.4, put version number in manpages URL.
+
 PRGNAM=cmake-202x
 SRCNAM=cmake
-VERSION=${VERSION:-3.18.2}
+VERSION=${VERSION:-3.19.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,7 +98,11 @@ make install/strip DESTDIR=$PKG
 
 # To avoid a dependency on Sphinx (which has *26 dependencies* of its own),
 # use Pat's prebuilt man pages.
-tar xvf $CWD/cmake.manpages.tar.lz
+MAN=$CWD/$SRCNAM.manpages.tar.lz
+MANV=$CWD/$SRCNAM.manpages.$VERSION.tar.lz
+[ -e "$MANV" ] && MAN="$MANV"
+
+tar xvf $MAN
 mv usr/man $PKGPREFIX/man
 gzip -9 $PKGPREFIX/man/man?/*.?
 
diff --git a/development/cmake-202x/cmake-202x.info b/development/cmake-202x/cmake-202x.info
index 0ac15de208..46a74f7389 100644
--- a/development/cmake-202x/cmake-202x.info
+++ b/development/cmake-202x/cmake-202x.info
@@ -1,10 +1,10 @@
 PRGNAM="cmake-202x"
-VERSION="3.18.2"
+VERSION="3.19.6"
 HOMEPAGE="https://cmake.org/"
-DOWNLOAD="https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2.tar.gz \
-          https://slackware.uk/~urchlay/src/cmake.manpages.tar.lz"
-MD5SUM="7a882b3764f42981705286ac9daa29c2 \
-        e8cbd51242f456eaaa48d68993afd723"
+DOWNLOAD="https://github.com/Kitware/CMake/releases/download/v3.19.6/cmake-3.19.6.tar.gz \
+          https://slackware.uk/~urchlay/src/cmake.manpages.3.19.6.tar.lz"
+MD5SUM="aec448bdfb4436c7cde2066baf5fc66c \
+        3ecf5bbb544598bb20e9dca4c7d489e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild
index 8f4e59f6f2..984450a374 100644
--- a/development/codelite/codelite.SlackBuild
+++ b/development/codelite/codelite.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=codelite
-VERSION=${VERSION:-14.0}
+VERSION=${VERSION:-15.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -51,8 +51,6 @@ 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 {} \;
 
-patch -p1 < $CWD/libssh.patch
-
 mkdir build-release
 cd build-release
 CFLAGS="$SLKCFLAGS" \
diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info
index dd2487959c..c01b8a1ba5 100644
--- a/development/codelite/codelite.info
+++ b/development/codelite/codelite.info
@@ -1,8 +1,8 @@
 PRGNAM="codelite"
-VERSION="14.0"
+VERSION="15.0"
 HOMEPAGE="http://www.codelite.org/"
-DOWNLOAD="https://github.com/eranif/codelite/archive/14.0/codelite-14.0.tar.gz"
-MD5SUM="e9d2519fa8077ca9f86b6b8fa9adf332"
+DOWNLOAD="https://github.com/eranif/codelite/archive/15.0/codelite-15.0.tar.gz"
+MD5SUM="1c54744ab0c9b5732087687ab17ab49d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3"
diff --git a/development/codelite/libssh.patch b/development/codelite/libssh.patch
deleted file mode 100644
index c4f5b9aa85..0000000000
--- a/development/codelite/libssh.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d9663b376b66c5754298b21c3592f0a49c030f88 Mon Sep 17 00:00:00 2001
-From: dghart <dghart david@4Pane.co.uk>
-Date: Tue, 3 Mar 2020 13:39:02 +0000
-Subject: [PATCH] Compilation fix for ubuntu xenial (16.04) and similar
-
-The ssh version check was wrong (see https://github.com/eranif/codelite/issues/2443).
-Bump it from 0.6.1 to a (guestimated) 0.6.5.
----
- CodeLite/cl_ssh.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CodeLite/cl_ssh.cpp b/CodeLite/cl_ssh.cpp
-index 824804e30..f5accfde9 100644
---- a/CodeLite/cl_ssh.cpp
-+++ b/CodeLite/cl_ssh.cpp
-@@ -106,7 +106,7 @@ bool clSSH::AuthenticateServer(wxString& message)
- 
-     message.Clear();
- 
--#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 6, 1)
-+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 7)
-     int hlen = 0;
-     hlen = ssh_get_pubkey_hash(m_session, &hash);
-     if(hlen < 0) {
-
diff --git a/development/codespell/README b/development/codespell/README
new file mode 100644
index 0000000000..6c714b66f2
--- /dev/null
+++ b/development/codespell/README
@@ -0,0 +1,9 @@
+codespell (spell checker for source code)
+
+codespell fixes common misspellings in text files. It's designed
+primarily for checking misspelled words in source code, but it can be
+used with other files as well.
+
+Optional dependency: python-chardet. This is required for codespell's
+-e option. Unless you deal with files that are not ASCII, ISO-8859-1,
+or UTF-8, you probably don't need the -e option.
diff --git a/development/codespell/codespell.SlackBuild b/development/codespell/codespell.SlackBuild
new file mode 100644
index 0000000000..4f0d11f112
--- /dev/null
+++ b/development/codespell/codespell.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Slackware build script for codespell
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=codespell
+VERSION=${VERSION:-1.17.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+python setup.py install --root=$PKG
+
+make $PRGNAM.1
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/codespell/codespell.info b/development/codespell/codespell.info
new file mode 100644
index 0000000000..4edb51d153
--- /dev/null
+++ b/development/codespell/codespell.info
@@ -0,0 +1,10 @@
+PRGNAM="codespell"
+VERSION="1.17.1"
+HOMEPAGE="https://github.com/codespell-project/codespell"
+DOWNLOAD="https://github.com/codespell-project/codespell/archive/v1.17.1/codespell-1.17.1.tar.gz"
+MD5SUM="eaa42b26713c571311ba9374046cc12f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/codespell/slack-desc b/development/codespell/slack-desc
new file mode 100644
index 0000000000..bf1da3cc6f
--- /dev/null
+++ b/development/codespell/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+codespell: codespell (spell checker for source code)
+codespell:
+codespell: codespell fixes common misspellings in text files. It's designed
+codespell: primarily for checking misspelled words in source code, but it can be
+codespell: used with other files as well.
+codespell:
+codespell:
+codespell:
+codespell:
+codespell:
+codespell:
diff --git a/development/colordiff/colordiff.info b/development/colordiff/colordiff.info
index 47055371b3..9e1e849744 100644
--- a/development/colordiff/colordiff.info
+++ b/development/colordiff/colordiff.info
@@ -6,5 +6,5 @@ MD5SUM="95788a711e1402c17a5cd8c8ab6f1ed5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
diff --git a/development/composer/composer.SlackBuild b/development/composer/composer.SlackBuild
index 39e4c0043b..6138aa6e66 100644
--- a/development/composer/composer.SlackBuild
+++ b/development/composer/composer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for composer
 
-# Copyright 2015-2018 Eugene Wissner, Dachau, Germany
+# Copyright 2015-2020 Eugene Wissner, Dachau, Germany
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=composer
-VERSION=${VERSION:-1.10.13}
+VERSION=${VERSION:-2.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
diff --git a/development/composer/composer.info b/development/composer/composer.info
index 3c3f4e268f..3cfcf27e2d 100644
--- a/development/composer/composer.info
+++ b/development/composer/composer.info
@@ -1,8 +1,8 @@
 PRGNAM="composer"
-VERSION="1.10.13"
+VERSION="2.0.11"
 HOMEPAGE="https://getcomposer.org/"
-DOWNLOAD="https://getcomposer.org/download/1.10.13/composer.phar"
-MD5SUM="56f13c034e5e0c58de35b77cbd0f1b0b"
+DOWNLOAD="https://getcomposer.org/download/2.0.11/composer.phar"
+MD5SUM="1f62c4a4b3b22762ff4c9adcfd7ca4b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cproto/README b/development/cproto/README
new file mode 100644
index 0000000000..9099489a30
--- /dev/null
+++ b/development/cproto/README
@@ -0,0 +1,10 @@
+cproto (generate function prototypes for C code)
+
+Cproto is a program that generates function prototypes and
+variable declarations from C source code. It can also convert
+function definitions between the old style and the ANSI C style.
+This conversion overwrites the original files, so make a backup copy
+of your files in case something goes wrong.
+
+The program isn't confused by complex function definitions as much as
+other prototype generators because it uses a yacc generated parser.
diff --git a/development/cproto/cproto.SlackBuild b/development/cproto/cproto.SlackBuild
new file mode 100644
index 0000000000..b474e91fda
--- /dev/null
+++ b/development/cproto/cproto.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Slackware build script for cproto
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=cproto
+VERSION=${VERSION:-4.7q}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+CFLAGS="$SLKCFLAGS -Wl,-s" \
+CXXFLAGS="$SLKCFLAGS -Wl,-s" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGES LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/cproto/cproto.info b/development/cproto/cproto.info
new file mode 100644
index 0000000000..8e24ba846a
--- /dev/null
+++ b/development/cproto/cproto.info
@@ -0,0 +1,10 @@
+PRGNAM="cproto"
+VERSION="4.7q"
+HOMEPAGE="https://invisible-island.net/cproto/"
+DOWNLOAD="ftp://ftp.invisible-island.net/cproto/cproto-4.7q.tgz"
+MD5SUM="080c9edd8f68246304831d09e740f9e9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/cproto/slack-desc b/development/cproto/slack-desc
new file mode 100644
index 0000000000..d59bec28ed
--- /dev/null
+++ b/development/cproto/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+cproto: cproto (generate function prototypes for C code)
+cproto:
+cproto: Cproto is a program that generates function prototypes and
+cproto: variable declarations from C source code. It can also convert
+cproto: function definitions between the old style and the ANSI C style.
+cproto: This conversion overwrites the original files, so make a backup copy
+cproto: of your files in case something goes wrong.
+cproto:
+cproto:
+cproto:
+cproto:
diff --git a/development/d-tools/d-tools.SlackBuild b/development/d-tools/d-tools.SlackBuild
index 701e210c2f..5b72f32ab2 100644
--- a/development/d-tools/d-tools.SlackBuild
+++ b/development/d-tools/d-tools.SlackBuild
@@ -23,11 +23,11 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=d-tools
-VERSION=${VERSION:-2.094.0}
+VERSION=${VERSION:-2.096.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DUB_VERSION=${DUB_VERSION:-1.23.0}
+DUB_VERSION=${DUB_VERSION:-1.25.0}
 DSCANNER_VERSION=${DSCANNER_VERSION:-0.11.0}
 DCD_VERSION=${DCD_VERSION:-0.13.1}
 
diff --git a/development/d-tools/d-tools.info b/development/d-tools/d-tools.info
index 22b5b9cdba..3dc632fad4 100644
--- a/development/d-tools/d-tools.info
+++ b/development/d-tools/d-tools.info
@@ -1,12 +1,12 @@
 PRGNAM="d-tools"
-VERSION="2.094.0"
+VERSION="2.096.0"
 HOMEPAGE="https://dlang.org"
-DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.23.0.tar.gz \
-          https://download.dlackware.com/hosted-sources/d-tools/tools-2.094.0.tar.gz \
+DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.25.0.tar.gz \
+          https://download.dlackware.com/hosted-sources/d-tools/tools-2.096.0.tar.gz \
           https://download.dlackware.com/hosted-sources/d-tools/D-Scanner-0.11.0.tar.xz \
           https://download.dlackware.com/hosted-sources/d-tools/DCD-0.13.1.tar.xz"
-MD5SUM="19f30e01948621db807b3317cf507ea8 \
-        babf2ed2979d3d070851ce37d9b52cf5 \
+MD5SUM="60d031ed0e2054d721e44aea33bd0ca4 \
+        00852d0d9aba131b990baeb025fbdf38 \
         59426567074ca0505fd394b599e0879d \
         3eebf17739f25c511c9957ade050bbe9"
 DOWNLOAD_x86_64=""
diff --git a/development/dart-sdk/dart-sdk.SlackBuild b/development/dart-sdk/dart-sdk.SlackBuild
index 3e234361f2..e253c7203b 100644
--- a/development/dart-sdk/dart-sdk.SlackBuild
+++ b/development/dart-sdk/dart-sdk.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dart-sdk
-VERSION=${VERSION:-2.9.3}
+VERSION=${VERSION:-2.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dart-sdk/dart-sdk.info b/development/dart-sdk/dart-sdk.info
index a4aa7d2159..1c3dac93d6 100644
--- a/development/dart-sdk/dart-sdk.info
+++ b/development/dart-sdk/dart-sdk.info
@@ -1,14 +1,14 @@
 PRGNAM="dart-sdk"
-VERSION="2.9.3"
+VERSION="2.10.4"
 HOMEPAGE="https://www.dartlang.org/"
-DOWNLOAD="https://storage.googleapis.com/dart-archive/channels/stable/release/2.9.3/sdk/dartsdk-linux-ia32-release.zip \
-https://storage.googleapis.com/dart-archive/channels/stable/release/2.9.3/api-docs/dartdocs-gen-api.zip"
-MD5SUM="72451d9dece6bdb1fae8217620c363a3 \
-	410f6a6c380ed1df523c3bfd24620211"
-DOWNLOAD_x86_64="https://storage.googleapis.com/dart-archive/channels/stable/release/2.9.3/sdk/dartsdk-linux-x64-release.zip \
-https://storage.googleapis.com/dart-archive/channels/stable/release/2.9.3/api-docs/dartdocs-gen-api.zip"
-MD5SUM_x86_64="45fc68efe946ae5bd3a3520102675d30 \
-	       410f6a6c380ed1df523c3bfd24620211"
+DOWNLOAD="https://storage.googleapis.com/dart-archive/channels/stable/release/2.10.4/sdk/dartsdk-linux-ia32-release.zip \
+https://storage.googleapis.com/dart-archive/channels/stable/release/2.10.4/api-docs/dartdocs-gen-api.zip"
+MD5SUM="2be272e42304aa172a3878d1b57f6957 \
+        74bc6601aafc5ea9588c2ac003d66455"
+DOWNLOAD_x86_64="https://storage.googleapis.com/dart-archive/channels/stable/release/2.10.4/sdk/dartsdk-linux-x64-release.zip \
+https://storage.googleapis.com/dart-archive/channels/stable/release/2.10.4/api-docs/dartdocs-gen-api.zip"
+MD5SUM_x86_64="cb52cb89f5dfb88cddb15b1f2caa23cf \
+        74bc6601aafc5ea9588c2ac003d66455"
 REQUIRES=""
 MAINTAINER="Zhu Qun-Ying"
 EMAIL="zhu.qunying@gmail.com"
diff --git a/development/dbeaver-ce/dbeaver-ce.SlackBuild b/development/dbeaver-ce/dbeaver-ce.SlackBuild
index 251119b645..16d07ec4cc 100644
--- a/development/dbeaver-ce/dbeaver-ce.SlackBuild
+++ b/development/dbeaver-ce/dbeaver-ce.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dbeaver-ce
 
-# Copyright 2020 Joielechong <juansspy@gmail.com>, Jasper Hageraats <spycrowsoft@gmail.com>
+# Copyright 2021 Joielechong <juansspy@gmail.com>, Jasper Hageraats <spycrowsoft@gmail.com>
 # Copyright 2014 Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 ORIGINAL_PRGNAM=dbeaver
 PRGNAM=dbeaver-ce
 
-VERSION=${VERSION:-7.2.2}
+VERSION=${VERSION:-21.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dbeaver-ce/dbeaver-ce.info b/development/dbeaver-ce/dbeaver-ce.info
index 168f05f454..f1e4573e1b 100644
--- a/development/dbeaver-ce/dbeaver-ce.info
+++ b/development/dbeaver-ce/dbeaver-ce.info
@@ -1,10 +1,10 @@
 PRGNAM="dbeaver-ce"
-VERSION="7.2.2"
+VERSION="21.0.0"
 HOMEPAGE="https://dbeaver.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://dbeaver.io/files/7.2.2/dbeaver-ce-7.2.2-linux.gtk.x86_64.tar.gz"
-MD5SUM_x86_64="0a1f365208c9b9aafe5eef69710bdec4"
+DOWNLOAD_x86_64="https://download.dbeaver.com/community/21.0.0/dbeaver-ce-21.0.0-linux.gtk.x86_64.tar.gz"
+MD5SUM_x86_64="12d1dac3af310d1180448e28ebdb362d"
 REQUIRES="jdk"
 MAINTAINER="Joielechong"
 EMAIL="juansspy@gmail.com"
diff --git a/development/decklink-sdk/decklink-sdk.SlackBuild b/development/decklink-sdk/decklink-sdk.SlackBuild
index d91e2c8c98..8703806bdb 100644
--- a/development/decklink-sdk/decklink-sdk.SlackBuild
+++ b/development/decklink-sdk/decklink-sdk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for decklink-sdk
 
-# Copyright 2015-2017 Christoph Willing  Brisbane, Australia
+# Copyright 2015-2021 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=decklink-sdk
 SRCNAM=Blackmagic_DeckLink_SDK
-VERSION=${VERSION:-10.8.6}
+VERSION=${VERSION:-12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ mkdir -p ${PKG}/usr/include/decklink
 cp -p Linux/include/* ${PKG}/usr/include/decklink/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -T Blackmagic\ Decklink\ SDK.pdf $PKG/usr/doc/$PRGNAM-$VERSION/$SRCNAM.pdf
+cp -T Blackmagic\ DeckLink\ SDK.pdf $PKG/usr/doc/$PRGNAM-$VERSION/$SRCNAM.pdf
 cp -a ReadMe.rtf Linux/Samples Examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/decklink-sdk/decklink-sdk.info b/development/decklink-sdk/decklink-sdk.info
index 69c066c964..6c40b71ca5 100644
--- a/development/decklink-sdk/decklink-sdk.info
+++ b/development/decklink-sdk/decklink-sdk.info
@@ -1,8 +1,8 @@
 PRGNAM="decklink-sdk"
-VERSION="10.8.6"
+VERSION="12.0"
 HOMEPAGE="http://www.blackmagic-design.com"
-DOWNLOAD="http://sw.blackmagicdesign.com/DeckLink/v10.8.6/Blackmagic_DeckLink_SDK_10.8.6.zip"
-MD5SUM="afc81036577bebed03d6a4f95b3cb542"
+DOWNLOAD="http://sw.blackmagicdesign.com/DeckLink/v12.0/Blackmagic_DeckLink_SDK_12.0.zip"
+MD5SUM="1898d67834f82e0cb3055f1c03b92682"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/development/dkms/dkms.SlackBuild b/development/dkms/dkms.SlackBuild
index 8b9bf52554..7cc83bc219 100644
--- a/development/dkms/dkms.SlackBuild
+++ b/development/dkms/dkms.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright (c) 2012-2017 LEVAI Daniel
 # All rights reserved.
-# Copyright (c) 2018-2020 Christoph Willing  Brisbane, Australia
+# Copyright (c) 2018-2021 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dkms
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-2.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dkms/dkms.info b/development/dkms/dkms.info
index f98fbaeb79..63007f72d8 100644
--- a/development/dkms/dkms.info
+++ b/development/dkms/dkms.info
@@ -1,8 +1,8 @@
 PRGNAM="dkms"
-VERSION="2.8.3"
+VERSION="2.8.4"
 HOMEPAGE="https://github.com/dell/dkms"
-DOWNLOAD="https://github.com/dell/dkms/archive/v2.8.3/dkms-2.8.3.tar.gz"
-MD5SUM="e607ebd05a6037e1f9fd9bff8b98463b"
+DOWNLOAD="https://github.com/dell/dkms/archive/v2.8.4/dkms-2.8.4.tar.gz"
+MD5SUM="e34ff7b6d104f872a6af92c47c244715"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/dmd/dmd.SlackBuild b/development/dmd/dmd.SlackBuild
index 1e92f39fb1..6238259e52 100644
--- a/development/dmd/dmd.SlackBuild
+++ b/development/dmd/dmd.SlackBuild
@@ -23,7 +23,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dmd
-VERSION=${VERSION:-2.094.0}
+VERSION=${VERSION:-2.096.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dmd/dmd.info b/development/dmd/dmd.info
index 013b590475..17f35a5b09 100644
--- a/development/dmd/dmd.info
+++ b/development/dmd/dmd.info
@@ -1,10 +1,10 @@
 PRGNAM="dmd"
-VERSION="2.094.0"
+VERSION="2.096.0"
 HOMEPAGE="https://dlang.org"
-DOWNLOAD="http://downloads.dlang.org/releases/2.x/2.094.0/dmd.2.094.0.linux.tar.xz"
-MD5SUM="34f42a09cbfc027597859bd2b12bcb2a"
+DOWNLOAD="http://downloads.dlang.org/releases/2.x/2.096.0/dmd.2.096.0.linux.tar.xz"
+MD5SUM="af6687504906f358d7ec2ea824f30866"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="%README%"
 MAINTAINER="Eugene Wissner"
 EMAIL="belka@caraus.de"
diff --git a/development/dotnet-runtime/doinst.sh b/development/dotnet-runtime/doinst.sh
deleted file mode 100644
index ec1d7e5165..0000000000
--- a/development/dotnet-runtime/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/development/dotnet-runtime/dotnet-runtime.SlackBuild b/development/dotnet-runtime/dotnet-runtime.SlackBuild
index 74297ad0fb..3c2f45160e 100644
--- a/development/dotnet-runtime/dotnet-runtime.SlackBuild
+++ b/development/dotnet-runtime/dotnet-runtime.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+
 # Slackware build script for dotnet-runtime.
 #
 # Copyright 2019 Reza Talebi, Shahin Shahr, Iran.
@@ -23,16 +23,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dotnet-runtime
-VERSION=${VERSION:-3.1.8}
+VERSION=${VERSION:-3.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHITECTURE="x64"
+else
+  echo "Package for $ARCH architecture is not available."
+  exit 1
 fi
 
 CWD=$(pwd)
@@ -40,20 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 set -e
 
-if [ "$( uname -m )" = "x86_64" ]; then
-  ARCH="x86_64"
-  ARCHITECTURE="x64"
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,12 +55,14 @@ mkdir -p usr/share/dotnet
 tar -zxf $CWD/$PRGNAM-${VERSION}-linux-${ARCHITECTURE}.tar.gz -C usr/share/dotnet
 chown -R root:root usr/share/dotnet
 
+mkdir -p usr/bin
+ln -s /usr/share/dotnet/dotnet usr/bin/dotnet
+
 mkdir -p usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -c n -l n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/dotnet-runtime/dotnet-runtime.info b/development/dotnet-runtime/dotnet-runtime.info
index fde866f9d6..04afde7a5c 100644
--- a/development/dotnet-runtime/dotnet-runtime.info
+++ b/development/dotnet-runtime/dotnet-runtime.info
@@ -1,10 +1,10 @@
 PRGNAM="dotnet-runtime"
-VERSION="3.1.8"
+VERSION="3.1.13"
 HOMEPAGE="https://dotnet.microsoft.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/e4e47a0a-132e-416a-b8eb-f3373ad189d9/43af4412e27696c3c16e50f496f6c7af/dotnet-runtime-3.1.8-linux-x64.tar.gz"
-MD5SUM_x86_64="c12f3c0964df3a9539d9d4b525b1c371"
+DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/6880db3b-a4fe-4801-8e80-bbbec045f7c0/283b70d5e263c0341f011adf5a2ea5b1/dotnet-runtime-3.1.13-linux-x64.tar.gz"
+MD5SUM_x86_64="f4afc5386a912138b2cb1e78b71c8815"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/development/dotnet-sdk/doinst.sh b/development/dotnet-sdk/doinst.sh
deleted file mode 100644
index ec1d7e5165..0000000000
--- a/development/dotnet-sdk/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/development/dotnet-sdk/dotnet-sdk.SlackBuild b/development/dotnet-sdk/dotnet-sdk.SlackBuild
index 6bb5bd96cb..5154cfcf75 100644
--- a/development/dotnet-sdk/dotnet-sdk.SlackBuild
+++ b/development/dotnet-sdk/dotnet-sdk.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+
 # Slackware build script for dotnet-sdk.
 #
 # Copyright 2019 Reza Talebi, Shahin Shahr, Iran.
@@ -23,16 +23,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dotnet-sdk
-VERSION=${VERSION:-3.1.402}
+VERSION=${VERSION:-3.1.407}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHITECTURE="x64"
+else
+  echo "Package for $ARCH architecture is not available."
+  exit 1
 fi
 
 CWD=$(pwd)
@@ -40,20 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 set -e
 
-if [ "$( uname -m )" = "x86_64" ]; then
-  ARCH="x86_64"
-  ARCHITECTURE="x64"
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,12 +55,14 @@ mkdir -p usr/share/dotnet
 tar -zxf $CWD/$PRGNAM-${VERSION}-linux-${ARCHITECTURE}.tar.gz -C usr/share/dotnet
 chown -R root:root usr/share/dotnet
 
+mkdir -p usr/bin
+ln -s /usr/share/dotnet/dotnet usr/bin/dotnet
+
 mkdir -p usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/dotnet-sdk/dotnet-sdk.info b/development/dotnet-sdk/dotnet-sdk.info
index 5bc625a397..624b42d8cb 100644
--- a/development/dotnet-sdk/dotnet-sdk.info
+++ b/development/dotnet-sdk/dotnet-sdk.info
@@ -1,10 +1,10 @@
 PRGNAM="dotnet-sdk"
-VERSION="3.1.402"
+VERSION="3.1.407"
 HOMEPAGE="https://dotnet.microsoft.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz"
-MD5SUM_x86_64="53f4e617ba3d006fb7249759aefc186f"
+DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/ab82011d-2549-4e23-a8a9-a2b522a31f27/6e615d6177e49c3e874d05ee3566e8bf/dotnet-sdk-3.1.407-linux-x64.tar.gz"
+MD5SUM_x86_64="fd1e8043fdbc96eb7a41cf896d5474b8"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/development/dpkg/dpkg.SlackBuild b/development/dpkg/dpkg.SlackBuild
index 540bc7da93..e32e733821 100644
--- a/development/dpkg/dpkg.SlackBuild
+++ b/development/dpkg/dpkg.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for dpkg.
 #
-# Copyright 2016-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2009 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
diff --git a/development/dpkg/dpkg.info b/development/dpkg/dpkg.info
index 805a9276b3..0a43d65a8b 100644
--- a/development/dpkg/dpkg.info
+++ b/development/dpkg/dpkg.info
@@ -1,7 +1,7 @@
 PRGNAM="dpkg"
 VERSION="1.19.7"
 HOMEPAGE="https://wiki.debian.org/Teams/Dpkg"
-DOWNLOAD="http://snapshot.debian.org/archive/debian/20190608T092728Z/pool/main/d/dpkg/dpkg_1.19.7.tar.xz"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/d/dpkg/dpkg_1.19.7.tar.xz"
 MD5SUM="60f57c5494e6dfa177504d47bfa0e383"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/dwarf/README b/development/dwarf/README
deleted file mode 100644
index 5495eaead6..0000000000
--- a/development/dwarf/README
+++ /dev/null
@@ -1,11 +0,0 @@
-The DWARF Debugging Information Format is of interest to programmers
-working on compilers and debuggers (and anyone interested in reading
-or writing DWARF information). It was developed by a committee (known
-as the PLSIG at the time) starting around 1991. Starting around 1991
-SGI got involved with the committee and then developed the libdwarf and
-dwarfdump tools for SGI-internal use and as part of SGI IRIX developer
-tools. From around 1993 dwarfdump and libdwarf were shipped (as an
-executable and archive respectively, not source) with every release
-of the SGI MIPS/IRIX C compiler. In 1994 (I think the correct year)
-SGI agreed (at my request) to open-source libdwarf (and in 1999 to
-open-source dwarfdump) so anyone could use them.
diff --git a/development/dwarf/dwarf.info b/development/dwarf/dwarf.info
deleted file mode 100644
index 35699f93e0..0000000000
--- a/development/dwarf/dwarf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dwarf"
-VERSION="20190529"
-HOMEPAGE="https://www.prevanders.net/dwarf.html"
-DOWNLOAD="https://www.prevanders.net/libdwarf-20190529.tar.gz"
-MD5SUM="2601496ae97698a7cc9162059341ca7f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Eugene Wissner"
-EMAIL="belka@caraus.de"
diff --git a/development/dwz/dwz.SlackBuild b/development/dwz/dwz.SlackBuild
index 4f456a2533..8a19847c9c 100644
--- a/development/dwz/dwz.SlackBuild
+++ b/development/dwz/dwz.SlackBuild
@@ -24,7 +24,7 @@
 
 #download from mirrors.kernel.org/sourceware/dwx/releases/
 PRGNAM=dwz
-VERSION=${VERSION:-0.13}
+VERSION=${VERSION:-0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dwz/dwz.info b/development/dwz/dwz.info
index e9464ab4ef..f79e5a1950 100644
--- a/development/dwz/dwz.info
+++ b/development/dwz/dwz.info
@@ -1,8 +1,8 @@
 PRGNAM="dwz"
-VERSION="0.13"
+VERSION="0.14"
 HOMEPAGE="https://sourceware.org/git/?p=dwz.git;a=summary"
-DOWNLOAD="http://mirrors.kernel.org/sourceware/dwz/releases/dwz-0.13.tar.xz"
-MD5SUM="6cb10dc92d432a5b86bc3fe36e154698"
+DOWNLOAD="http://mirrors.kernel.org/sourceware/dwz/releases/dwz-0.14.tar.xz"
+MD5SUM="1f1225898bd40d63041d54454fcda5b6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/eclipse-platform/eclipse-platform.SlackBuild b/development/eclipse-platform/eclipse-platform.SlackBuild
index 3d46cff3ed..fa87427857 100644
--- a/development/eclipse-platform/eclipse-platform.SlackBuild
+++ b/development/eclipse-platform/eclipse-platform.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for eclipse-platform
 
-# Copyright 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
+# Copyright 2020, 2021 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eclipse-platform
-VERSION=${VERSION:-4.17}
+VERSION=${VERSION:-4.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,7 +47,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SRCNAM=eclipse
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/development/eclipse-platform/eclipse-platform.info b/development/eclipse-platform/eclipse-platform.info
index c6ba1f4cb0..d1f4913090 100644
--- a/development/eclipse-platform/eclipse-platform.info
+++ b/development/eclipse-platform/eclipse-platform.info
@@ -1,10 +1,10 @@
 PRGNAM="eclipse-platform"
-VERSION="4.17"
-HOMEPAGE="http://www.eclipse.org"
+VERSION="4.19"
+HOMEPAGE="https://www.eclipse.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-4.17-202009021800/eclipse-platform-4.17-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="d3f0e3916b8e551ea57097abfcfe445e"
+DOWNLOAD_x86_64="https://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-4.19-202103031800/eclipse-platform-4.19-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="48253adbb219851359613344d942d934"
 REQUIRES="jdk webkit2gtk"
 MAINTAINER="Igor Alexandrov"
 EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/eovim/07716.patch b/development/eovim/07716.patch
deleted file mode 100644
index a591038ac9..0000000000
--- a/development/eovim/07716.patch
+++ /dev/null
@@ -1,427 +0,0 @@
-From 0771672b18c6645a7fa4de61ac106bdf3b69a04a Mon Sep 17 00:00:00 2001
-From: Jean Guyomarc'h <jean@guyomarch.bzh>
-Date: Sat, 12 Jan 2019 08:43:01 +0100
-Subject: [PATCH] nvim: handle requests initiates by neovim
-
-Neovim is able to initiate requests to the UI client (via the
-'rpcrequest()') API. Eovim is now able to run a user-defined callback
-function when a request is emitted. A request response is sent back to
-neovim. This is one step to solve #38.
----
- CMakeLists.txt               |   1 +
- include/eovim/nvim.h         |  11 +++
- include/eovim/nvim_request.h |  52 ++++++++++++++
- src/main.c                   |   2 +
- src/nvim.c                   |  72 +++++++++++++++++++-
- src/nvim_api.c               |  18 ++---
- src/nvim_request.c           | 127 +++++++++++++++++++++++++++++++++++
- 7 files changed, 272 insertions(+), 11 deletions(-)
- create mode 100644 include/eovim/nvim_request.h
- create mode 100644 src/nvim_request.c
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index adf75dc..cfc6dbf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -115,6 +115,7 @@ add_executable(eovim
-    "${SRC_DIR}/event/cmdline.c"
-    "${SRC_DIR}/nvim_api.c"
-    "${SRC_DIR}/nvim_helper.c"
-+   "${SRC_DIR}/nvim_request.c"
-    "${SRC_DIR}/plugin.c"
-    "${SRC_DIR}/options.c"
-    "${SRC_DIR}/contrib.c"
-diff --git a/include/eovim/nvim.h b/include/eovim/nvim.h
-index 13c77ab..f27e3f4 100644
---- a/include/eovim/nvim.h
-+++ b/include/eovim/nvim.h
-@@ -52,6 +52,8 @@ struct nvim
-    Eina_List *requests;
- 
-    msgpack_unpacker unpacker;
-+
-+   /* The following msgpack structures must be handled on the main loop only */
-    msgpack_sbuffer sbuffer;
-    msgpack_packer packer;
-    uint32_t request_id;
-@@ -76,4 +78,13 @@ void nvim_mouse_enabled_set(s_nvim *nvim, Eina_Bool enable);
- Eina_Bool nvim_mouse_enabled_get(const s_nvim *nvim);
- Eina_Stringshare *nvim_eovimrc_path_get(const s_nvim *nvim);
- 
-+/**
-+ * Flush the msgpack buffer to the neovim instance, by writing to its standard
-+ * input
-+ *
-+ * @param[in] nvim The neovim handle
-+ * @return EINA_TRUE on success, EINA_FALSE on failure.
-+ */
-+Eina_Bool nvim_flush(s_nvim *nvim);
-+
- #endif /* ! __EOVIM_NVIM_H__ */
-diff --git a/include/eovim/nvim_request.h b/include/eovim/nvim_request.h
-new file mode 100644
-index 0000000..68de980
---- /dev/null
-+++ b/include/eovim/nvim_request.h
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright (c) 2019 Jean Guyomarc'h
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef EOVIM_NVIM_REQUEST_H__
-+#define EOVIM_NVIM_REQUEST_H__
-+
-+#include "eovim/types.h"
-+
-+/**
-+ * Callback signature used when replying to a request.
-+ *
-+ * @param[in] nvim The neovim handle
-+ * @param[in] args Array of arguments from the request
-+ * @param[in,out] pk Msgpack packer to be used to write the error and the
-+ *   result of the request. See msgpack-rpc.
-+ * @return EINA_TRUE on success, EINA_FALSE on failure
-+ *
-+ * @note This function should not call nvim_flush(). It is automatically handled.
-+ */
-+typedef Eina_Bool (*f_nvim_request_cb)(s_nvim *nvim, const msgpack_object_array *args,
-+                                       msgpack_packer *pk);
-+
-+Eina_Bool nvim_request_init(void);
-+void nvim_request_shutdown(void);
-+
-+Eina_Bool nvim_request_add(const char *request_name, f_nvim_request_cb func);
-+void nvim_request_del(const char *request_name);
-+
-+Eina_Bool
-+nvim_request_process(s_nvim *nvim, Eina_Stringshare *request,
-+                     const msgpack_object_array *args, uint32_t req_id);
-+
-+#endif /* ! EOVIM_NVIM_REQUEST_H__ */
-diff --git a/src/main.c b/src/main.c
-index 2708186..4beb699 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -24,6 +24,7 @@
- #include "eovim/config.h"
- #include "eovim/nvim.h"
- #include "eovim/nvim_api.h"
-+#include "eovim/nvim_request.h"
- #include "eovim/nvim_event.h"
- #include "eovim/termview.h"
- #include "eovim/main.h"
-@@ -53,6 +54,7 @@ static const s_module _modules[] =
-    MODULE(config),
-    MODULE(keymap),
-    MODULE(nvim_api),
-+   MODULE(nvim_request),
-    MODULE(nvim_event),
-    MODULE(plugin),
-    MODULE(prefs),
-diff --git a/src/nvim.c b/src/nvim.c
-index 6c9d18f..83fdee4 100644
---- a/src/nvim.c
-+++ b/src/nvim.c
-@@ -26,6 +26,7 @@
- #include "eovim/config.h"
- #include "eovim/nvim_api.h"
- #include "eovim/nvim_event.h"
-+#include "eovim/nvim_request.h"
- #include "eovim/nvim_helper.h"
- #include "eovim/log.h"
- #include "eovim/main.h"
-@@ -53,6 +54,51 @@ _nvim_get(void)
-    return _nvim_instance;
- }
- 
-+static Eina_Bool
-+_handle_request(s_nvim *nvim, const msgpack_object_array *args)
-+{
-+   /* Retrieve the request identifier ****************************************/
-+   if (EINA_UNLIKELY(args->ptr[1].type != MSGPACK_OBJECT_POSITIVE_INTEGER))
-+     {
-+        ERR("Second argument in request is expected to be an integer");
-+        return EINA_FALSE;
-+     }
-+   const uint64_t long_req_id = args->ptr[1].via.u64;
-+   if (EINA_UNLIKELY(long_req_id > UINT32_MAX))
-+     {
-+        ERR("Request ID '%" PRIu64 " is too big", long_req_id);
-+        return EINA_FALSE;
-+     }
-+   const uint32_t req_id = (uint32_t)long_req_id;
-+
-+   /* Retrieve the request arguments *****************************************/
-+   if (EINA_UNLIKELY(args->ptr[3].type != MSGPACK_OBJECT_ARRAY))
-+     {
-+        ERR("Fourth argument in request is expected to be an array");
-+        return EINA_FALSE;
-+     }
-+   const msgpack_object_array *const req_args = &(args->ptr[3].via.array);
-+
-+   /* Retrieve the request name **********************************************/
-+   if (EINA_UNLIKELY(args->ptr[2].type != MSGPACK_OBJECT_STR))
-+     {
-+        ERR("Third argument in request is expected to be a string");
-+        return EINA_FALSE;
-+     }
-+   const msgpack_object_str *const str = &(args->ptr[2].via.str);
-+   Eina_Stringshare *const request =
-+     eina_stringshare_add_length(str->ptr, str->size);
-+   if (EINA_UNLIKELY(! request))
-+     {
-+        ERR("Failed to create stringshare");
-+        return EINA_FALSE;
-+     }
-+
-+   const Eina_Bool ok = nvim_request_process(nvim, request, req_args, req_id);
-+   eina_stringshare_del(request);
-+   return ok;
-+}
-+
- static Eina_Bool
- _handle_request_response(s_nvim *nvim,
-                          const msgpack_object_array *args)
-@@ -289,6 +335,7 @@ _nvim_received_data_cb(void *data EINA_UNUSED,
-                        int   type EINA_UNUSED,
-                        void *event)
- {
-+   /* See https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md */
-    const Ecore_Exe_Event_Data *const info = event;
-    s_nvim *const nvim = _nvim_get();
-    msgpack_unpacker *const unpacker = &nvim->unpacker;
-@@ -356,11 +403,15 @@ _nvim_received_data_cb(void *data EINA_UNUSED,
-           }
-         switch (args->ptr[0].via.u64)
-           {
--           case 1:
-+           case 0: /* msgpack-rpc request */
-+              _handle_request(nvim, args);
-+              break;
-+
-+           case 1: /* msgpack-rpc response */
-               _handle_request_response(nvim, args);
-               break;
- 
--           case 2:
-+           case 2: /* msgpack-rpc notification */
-               _handle_notification(nvim, args);
-               break;
- 
-@@ -824,6 +875,23 @@ nvim_free(s_nvim *nvim)
-      }
- }
- 
-+Eina_Bool nvim_flush(s_nvim *nvim)
-+{
-+   /* Send the data present in the msgpack buffer */
-+   const Eina_Bool ok =
-+     ecore_exe_send(nvim->exe, nvim->sbuffer.data, (int)nvim->sbuffer.size);
-+
-+   /* Now that the data is gone (hopefully), clear the buffer */
-+   msgpack_sbuffer_clear(&nvim->sbuffer);
-+   if (EINA_UNLIKELY(! ok))
-+     {
-+        CRI("Failed to send %zu bytes to neovim", nvim->sbuffer.size);
-+        return EINA_FALSE;
-+     }
-+   DBG("Sent %zu bytes to neovim", nvim->sbuffer.size);
-+   return EINA_TRUE;
-+}
-+
- void
- nvim_mouse_enabled_set(s_nvim *nvim,
-                        Eina_Bool enable)
-diff --git a/src/nvim_api.c b/src/nvim_api.c
-index 0b7e6ee..8082352 100644
---- a/src/nvim_api.c
-+++ b/src/nvim_api.c
-@@ -55,8 +55,13 @@ _request_new(s_nvim *nvim,
-    req->uid = nvim_next_uid_get(nvim);
-    DBG("Preparing request '%s' with id %"PRIu32, rpc_name, req->uid);
- 
--   /* Clear the serialization buffer before pushing a new request */
--   msgpack_sbuffer_clear(&nvim->sbuffer);
-+   /* The buffer MUST be empty before preparing another request. If this is not
-+    * the case, something went very wrong! Discard the buffer and keep going */
-+   if (EINA_UNLIKELY(nvim->sbuffer.size != 0u))
-+     {
-+        ERR("The buffer is not empty. I've messed up somewhere");
-+        msgpack_sbuffer_clear(&nvim->sbuffer);
-+     }
- 
-    /* Keep the request around */
-    nvim->requests = eina_list_append(nvim->requests, req);
-@@ -91,19 +96,14 @@ _request_cleanup(s_nvim *nvim,
- }
- 
- static Eina_Bool
--_request_send(s_nvim *nvim,
--              s_request *req)
-+_request_send(s_nvim *nvim, s_request *req)
- {
-    /* Finally, send that to the slave neovim process */
--   const Eina_Bool ok =
--     ecore_exe_send(nvim->exe, nvim->sbuffer.data, (int)nvim->sbuffer.size);
--   if (EINA_UNLIKELY(! ok))
-+   if (EINA_UNLIKELY(! nvim_flush(nvim)))
-      {
--        CRI("Failed to send %zu bytes to neovim", nvim->sbuffer.size);
-         _request_cleanup(nvim, req);
-         return EINA_FALSE;
-      }
--   DBG("Sent %zu bytes to neovim", nvim->sbuffer.size);
-    return EINA_TRUE;
- }
- 
-diff --git a/src/nvim_request.c b/src/nvim_request.c
-new file mode 100644
-index 0000000..7d34602
---- /dev/null
-+++ b/src/nvim_request.c
-@@ -0,0 +1,127 @@
-+/*
-+ * Copyright (c) 2019 Jean Guyomarc'h
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include "eovim/nvim_request.h"
-+#include "eovim/nvim.h"
-+#include "eovim/log.h"
-+
-+static Eina_Hash *_nvim_requests;
-+
-+
-+/*============================================================================*
-+ *                                     API                                    *
-+ *============================================================================*/
-+
-+Eina_Bool
-+nvim_request_add(const char *request_name, f_nvim_request_cb func)
-+{
-+   Eina_Stringshare *const name = eina_stringshare_add(request_name);
-+   const Eina_Bool ok = eina_hash_direct_add(_nvim_requests, name, func);
-+   if (EINA_UNLIKELY(! ok))
-+     {
-+        ERR("Failed to register request \"%s\"", request_name);
-+        return EINA_FALSE;
-+     }
-+   return EINA_TRUE;
-+}
-+
-+void
-+nvim_request_del(const char *request_name)
-+{
-+   Eina_Stringshare *const name = eina_stringshare_add(request_name);
-+   eina_hash_del(_nvim_requests, name, NULL);
-+   eina_stringshare_del(name);
-+}
-+
-+Eina_Bool
-+nvim_request_init(void)
-+{
-+   _nvim_requests = eina_hash_stringshared_new(NULL);
-+   if (EINA_UNLIKELY(! _nvim_requests))
-+     {
-+        CRI("Failed to create hash table");
-+        return EINA_FALSE;
-+     }
-+   return EINA_TRUE;
-+}
-+
-+void
-+nvim_request_shutdown(void)
-+{
-+   assert(_nvim_requests != NULL);
-+   eina_hash_free(_nvim_requests);
-+   _nvim_requests = NULL;
-+}
-+
-+Eina_Bool
-+nvim_request_process(s_nvim *nvim, Eina_Stringshare *request,
-+                     const msgpack_object_array *args, uint32_t req_id)
-+{
-+   /* This function shall only be used on the main loop. Otherwise, we cannot
-+    * use this packer */
-+   msgpack_packer *const pk = &nvim->packer;
-+
-+   /* The buffer MUST be empty before preparing the response. If this is not
-+    * the case, something went very wrong! Discard the buffer and keep going */
-+   if (EINA_UNLIKELY(nvim->sbuffer.size != 0u))
-+     {
-+        ERR("The buffer is not empty. I've messed up somewhere");
-+        msgpack_sbuffer_clear(&nvim->sbuffer);
-+     }
-+
-+   /*
-+    * Pack the message! It is an array of four (4) items:
-+    *  - the rpc type:
-+    *    - 1 is a request response
-+    *  - the unique identifier of the request
-+    *  - the error return
-+    *  - the result return
-+    *
-+    * We start to reply with the two first elements. If we are not prepared to
-+    * handle this request, we will finish the message with an error and no
-+    * result. But if someone handles the request, it is up to the handler to
-+    * finish the message by setting both the error and result.
-+    */
-+   msgpack_pack_array(pk, 4);
-+   msgpack_pack_int(pk, 1);
-+   msgpack_pack_uint32(pk, req_id);
-+
-+   const f_nvim_request_cb func = eina_hash_find(_nvim_requests, request);
-+   if (EINA_UNLIKELY(! func))
-+     {
-+        WRN("No handler for request '%s'", request);
-+        const char error[] = "unknown request";
-+
-+        /* See msgpack-rpc request response. Reply there is an error */
-+        msgpack_pack_str(pk, sizeof(error) - 1u);
-+        msgpack_pack_str_body(pk, error, sizeof(error) - 1u);
-+        msgpack_pack_nil(pk);
-+        nvim_flush(nvim);
-+        return EINA_FALSE;
-+     }
-+   else
-+     {
-+        const Eina_Bool ok = func(nvim, args, pk);
-+        nvim_flush(nvim);
-+        return ok;
-+     }
-+}
diff --git a/development/eovim/7b320.patch b/development/eovim/7b320.patch
deleted file mode 100644
index a2b31e8c7f..0000000000
--- a/development/eovim/7b320.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 7b320c17b1fc8821eac411f6d6afc14e32f7e093 Mon Sep 17 00:00:00 2001
-From: Jean Guyomarc'h <jean@guyomarch.bzh>
-Date: Sat, 12 Jan 2019 08:46:44 +0100
-Subject: [PATCH] nvim: properly handle the vimenter request
-
-Fixes #38
----
- include/eovim/nvim_api.h    |  3 ++-
- include/eovim/nvim_helper.h |  2 +-
- src/nvim.c                  | 47 +++++++++++++++++++++++++++----------
- src/nvim_api.c              |  6 +++--
- src/nvim_helper.c           |  4 ++--
- 5 files changed, 43 insertions(+), 19 deletions(-)
-
-diff --git a/include/eovim/nvim_api.h b/include/eovim/nvim_api.h
-index 9885ee1..ca9baab 100644
---- a/include/eovim/nvim_api.h
-+++ b/include/eovim/nvim_api.h
-@@ -27,7 +27,8 @@
- #include <Eina.h>
- #include <msgpack.h>
- 
--Eina_Bool nvim_api_ui_attach(s_nvim *nvim, unsigned int width, unsigned int height);
-+Eina_Bool nvim_api_ui_attach(s_nvim *nvim, unsigned int width, unsigned int height,
-+                             f_nvim_api_cb func, void *func_data);
- Eina_Bool nvim_api_get_api_info(s_nvim *nvim, f_nvim_api_cb cb, void *data);
- Eina_Bool nvim_api_ui_try_resize(s_nvim *nvim, unsigned int width, unsigned height);
- Eina_Bool nvim_api_ui_ext_cmdline_set(s_nvim *nvim, Eina_Bool externalize);
-diff --git a/include/eovim/nvim_helper.h b/include/eovim/nvim_helper.h
-index b6ce5f4..9f976d5 100644
---- a/include/eovim/nvim_helper.h
-+++ b/include/eovim/nvim_helper.h
-@@ -49,6 +49,6 @@ nvim_helper_highlight_group_decode_noop(s_nvim *nvim,
- 
- 
- void nvim_helper_autocmd_do(s_nvim *nvim, const char *event);
--void nvim_helper_autocmd_vimenter_exec(s_nvim *nvim, f_nvim_api_cb func, void *func_data);
-+void nvim_helper_autocmd_vimenter_exec(s_nvim *nvim);
- 
- #endif /* ! __EOVIM_NVIM_HELPER_H__ */
-diff --git a/src/nvim.c b/src/nvim.c
-index 83fdee4..a003a00 100644
---- a/src/nvim.c
-+++ b/src/nvim.c
-@@ -43,6 +43,8 @@ enum
- static Ecore_Event_Handler *_event_handlers[__HANDLERS_LAST];
- static s_nvim *_nvim_instance = NULL;
- 
-+static void _api_decode_cb(s_nvim *nvim, void *data, const msgpack_object *result);
-+
- /*============================================================================*
-  *                                 Private API                                *
-  *============================================================================*/
-@@ -278,6 +280,15 @@ _handle_notification(s_nvim *nvim,
-    return EINA_FALSE;
- }
- 
-+static Eina_Bool
-+_vimenter_request_cb(s_nvim *nvim EINA_UNUSED,
-+                     const msgpack_object_array *args EINA_UNUSED,
-+                     msgpack_packer *pk)
-+{
-+  msgpack_pack_nil(pk); /* Error */
-+  msgpack_pack_nil(pk); /* Result */
-+  return EINA_TRUE;
-+}
- 
- /*============================================================================*
-  *                       Nvim Processes Events Handlers                       *
-@@ -298,6 +309,21 @@ _nvim_added_cb(void *data EINA_UNUSED,
- 
-    const Ecore_Exe_Event_Add *const info = event;
-    INF("Process with PID %i was created", ecore_exe_pid_get(info->exe));
-+
-+   /* Okay, at this point the neovim process is running! Great! Now, we can
-+    * start to retrieve the API information and trigger the vimenter autocmd.
-+    *
-+    * We can start attaching the UI on the fly.
-+    * See :help ui-startup for details.
-+    */
-+   s_nvim *const nvim = _nvim_get();
-+   nvim_api_get_api_info(nvim, _api_decode_cb, NULL);
-+
-+   nvim_helper_autocmd_vimenter_exec(nvim);
-+   const s_geometry *const geo = &nvim->opts->geometry;
-+   nvim_api_ui_attach(nvim, geo->w, geo->h, _ui_attached_cb, NULL);
-+
-+
-    return ECORE_CALLBACK_PASS_ON;
- }
- 
-@@ -438,6 +464,7 @@ _nvim_received_error_cb(void *data EINA_UNUSED,
-    return ECORE_CALLBACK_PASS_ON;
- }
- 
-+/* FIXME this is soooooo fragile */
- static void
- _nvim_runtime_load(s_nvim *nvim,
-                    const char *filename)
-@@ -653,16 +680,6 @@ _api_decode_cb(s_nvim *nvim, void *data EINA_UNUSED, const msgpack_object *resul
-   _virtual_interface_setup(nvim);
- }
- 
--static void
--_vimenter_cb(s_nvim *nvim,
--             void *data EINA_UNUSED,
--             const msgpack_object *result EINA_UNUSED)
--{
--  _nvim_builtin_runtime_load(nvim);
--  _nvim_eovimrc_load(nvim);
--  nvim_api_var_integer_set(nvim, "eovim_running", 1);
--}
--
- static void
- _nvim_plugins_load(s_nvim *nvim)
- {
-@@ -815,6 +832,9 @@ nvim_new(const s_options *opts,
-    /* Initialize the virtual interface to safe values (non-NULL pointers) */
-    _virtual_interface_init(nvim);
- 
-+   /* Add a callback to the vimenter request */
-+   nvim_request_add("vimenter", _vimenter_request_cb);
-+
-    /* Create the neovim process */
-    nvim->exe = ecore_exe_pipe_run(
-       eina_strbuf_string_get(cmdline),
-@@ -831,9 +851,10 @@ nvim_new(const s_options *opts,
-    DBG("Running %s", eina_strbuf_string_get(cmdline));
-    eina_strbuf_free(cmdline);
- 
--   nvim_api_get_api_info(nvim, _api_decode_cb, NULL);
--   nvim_helper_autocmd_vimenter_exec(nvim, _vimenter_cb, NULL);
--   nvim_api_ui_attach(nvim, opts->geometry.w, opts->geometry.h);
-+   /* FIXME These are sooo fragile. Rework that!!! */
-+   _nvim_builtin_runtime_load(nvim);
-+   _nvim_eovimrc_load(nvim);
-+   nvim_api_var_integer_set(nvim, "eovim_running", 1);
- 
-    /* Create the GUI window */
-    if (EINA_UNLIKELY(! gui_add(&nvim->gui, nvim)))
-diff --git a/src/nvim_api.c b/src/nvim_api.c
-index 8082352..cf93577 100644
---- a/src/nvim_api.c
-+++ b/src/nvim_api.c
-@@ -138,8 +138,8 @@ void nvim_api_request_call(s_nvim *nvim,
- 
- Eina_Bool
- nvim_api_ui_attach(s_nvim *nvim,
--                   unsigned int width,
--                   unsigned int height)
-+                   unsigned int width, unsigned int height,
-+                   f_nvim_api_cb func, void *func_data)
- {
-    const char api[] = "nvim_ui_attach";
-    s_request *const req = _request_new(nvim, api, sizeof(api) - 1);
-@@ -148,6 +148,8 @@ nvim_api_ui_attach(s_nvim *nvim,
-         CRI("Failed to create request");
-         return EINA_FALSE;
-      }
-+   req->cb.func = func;
-+   req->cb.data = func_data;
- 
-    const s_config *const cfg = nvim->config;
- 
-diff --git a/src/nvim_helper.c b/src/nvim_helper.c
-index 7199203..2ec09fb 100644
---- a/src/nvim_helper.c
-+++ b/src/nvim_helper.c
-@@ -134,11 +134,11 @@ nvim_helper_autocmd_do(s_nvim *nvim,
- }
- 
- void
--nvim_helper_autocmd_vimenter_exec(s_nvim *nvim, f_nvim_api_cb func, void *func_data)
-+nvim_helper_autocmd_vimenter_exec(s_nvim *nvim)
- {
-   const char cmd[] = "autocmd VimEnter * call rpcrequest(1, 'vimenter')";
-   const Eina_Bool ok =
--    nvim_api_command(nvim, cmd, sizeof(cmd) - 1u, func, func_data);
-+    nvim_api_command(nvim, cmd, sizeof(cmd) - 1u, NULL, NULL);
-   if (EINA_UNLIKELY(! ok))
-   { ERR("Failed to execute: %s", cmd); }
- }
diff --git a/development/eovim/dd8f0.patch b/development/eovim/dd8f0.patch
deleted file mode 100644
index 9b9722a037..0000000000
--- a/development/eovim/dd8f0.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From dd8f0d3fff4951cd7b7ea294823b8e377024c2ff Mon Sep 17 00:00:00 2001
-From: Jean Guyomarc'h <jean@guyomarch.bzh>
-Date: Sat, 12 Jan 2019 08:47:35 +0100
-Subject: [PATCH] gui: make an overlay fade when the UI is attached to neovim
-
----
- data/themes/default.edc | 29 +++++++++++++++++++++++++++++
- include/eovim/gui.h     |  1 +
- src/gui.c               |  5 +++++
- src/nvim.c              |  9 +++++++--
- 4 files changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/data/themes/default.edc b/data/themes/default.edc
-index 27703fc..7f8d0e3 100644
---- a/data/themes/default.edc
-+++ b/data/themes/default.edc
-@@ -430,6 +430,19 @@ collections {
-                visible: 0;
-             }
-          }
-+
-+         rect { "overlay"; nomouse;
-+            desc { "default";
-+               color: 40 40 40 255;;
-+            }
-+            desc { "fade";
-+               color: 40 40 40 0;
-+            }
-+            desc { "faded";
-+               inherit: "fade";
-+               visible: 0; /* Make sure it is killed */
-+            }
-+         }
-       }
- 
-       programs {
-@@ -437,6 +450,22 @@ collections {
-             action: PLAY_SAMPLE "bell" 1.0 ALERT;
-          }
- 
-+         /* [OVERLAY FADING] **************************************************
-+          * When eovim starts, we push an overlay that covers the whole window.
-+          * When neovim is successfully attached to the UI, we make the overlay
-+          * fade away, so we can begin to use neovim. */
-+         program { signal: "eovim,ready"; source: "eovim";
-+            action: STATE_SET "fade";
-+            target: "overlay";
-+            transition: ACCELERATE 0.2;
-+            after: "eovim_overlay_faded";
-+         }
-+         program { name: "eovim_overlay_faded";
-+            action: STATE_SET "faded";
-+            target: "overlay";
-+         }
-+         /* END OVERLAY FADING ***********************************************/
-+
-          program { signal: "eovim,cmdline,show"; source: "eovim";
-             action: STATE_SET "default";
-             target: "eovim.cmdline";
-diff --git a/include/eovim/gui.h b/include/eovim/gui.h
-index f05fb97..981e957 100644
---- a/include/eovim/gui.h
-+++ b/include/eovim/gui.h
-@@ -192,6 +192,7 @@ void gui_caps_lock_alert(s_gui *gui);
- void gui_caps_lock_dismiss(s_gui *gui);
- Eina_Bool gui_caps_lock_warning_get(const s_gui *gui);
- 
-+void gui_ready_set(s_gui *gui);
- void gui_mode_update(s_gui *gui, const s_mode *mode);
- 
- #endif /* ! __EOVIM_GUI_H__ */
-diff --git a/src/gui.c b/src/gui.c
-index 96dcdcd..efd476b 100644
---- a/src/gui.c
-+++ b/src/gui.c
-@@ -893,6 +893,11 @@ gui_bell_ring(s_gui *gui)
-      elm_layout_signal_emit(gui->layout, "eovim,bell,ring", "eovim");
- }
- 
-+void gui_ready_set(s_gui *gui)
-+{
-+   elm_layout_signal_emit(gui->layout, "eovim,ready", "eovim");
-+}
-+
- static void
- _compl_item_del(void *data,
-                 Evas_Object *obj EINA_UNUSED)
-diff --git a/src/nvim.c b/src/nvim.c
-index a003a00..dcf263d 100644
---- a/src/nvim.c
-+++ b/src/nvim.c
-@@ -49,8 +49,13 @@ static void _api_decode_cb(s_nvim *nvim, void *data, const msgpack_object *resul
-  *                                 Private API                                *
-  *============================================================================*/
- 
--static inline s_nvim *
--_nvim_get(void)
-+static void _ui_attached_cb(s_nvim *nvim, void *data EINA_UNUSED,
-+                            const msgpack_object *result EINA_UNUSED)
-+{
-+  gui_ready_set(&nvim->gui);
-+}
-+
-+static inline s_nvim *_nvim_get(void)
- {
-    /* We handle only one neovim instance */
-    return _nvim_instance;
diff --git a/development/eovim/eovim.SlackBuild b/development/eovim/eovim.SlackBuild
index 3eaaa8b9a6..c14ae7be63 100644
--- a/development/eovim/eovim.SlackBuild
+++ b/development/eovim/eovim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for eovim
 
-# Copyright 2018-2019 Benjamin Trigona-Harany
+# Copyright 2018-2021 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eovim
-VERSION=${VERSION:-0.1.3}
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,9 +69,7 @@ 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 {} \;
 
-patch -p1 < $CWD/7b320.patch
-patch -p1 < $CWD/07716.patch
-patch -p1 < $CWD/dd8f0.patch
+sed -i '25,28d' cmake/Modules/FindEfl.cmake
 
 mkdir -p build
 cd build
@@ -79,7 +77,6 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
     ..
   make install DESTDIR=$PKG
 cd ..
diff --git a/development/eovim/eovim.info b/development/eovim/eovim.info
index cdaa0982bf..ae1dd04d6b 100644
--- a/development/eovim/eovim.info
+++ b/development/eovim/eovim.info
@@ -1,8 +1,8 @@
 PRGNAM="eovim"
-VERSION="0.1.3"
+VERSION="0.2.0"
 HOMEPAGE="https://github.com/jeanguyomarch/eovim"
-DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.1.3/eovim-0.1.3.tar.gz"
-MD5SUM="c4f833fa94c483d20d83eb83b48c4c23"
+DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.2.0/eovim-0.2.0.tar.gz"
+MD5SUM="9386331be9cbf2bf4910ccb794f47bdf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="efl neovim"
diff --git a/development/f2c/README b/development/f2c/README
index ed89051435..5f2431f228 100644
--- a/development/f2c/README
+++ b/development/f2c/README
@@ -1,13 +1,22 @@
+
 f2c is a Fortran-to-C converter.
 
 This package includes libf2c, which must be linked to the resulting C
-code.  Thus the general idea is
+code.
 
-  f2c foo.f
-  gcc foo.c -lf2c
+Thus the general idea is: f2c foo.f; gcc foo.c -lf2c
 
 Or use the fc script provided in the docs directory. Beware, fc is also
 a bash builtin.
 
-If combining with gfortran, you may want to use the gfortran -ff2c
-option. See the gfortran man page.
+f2c used to use two separate libraries, libi77 and libf77. These are
+now rolled together into libf2c.  Beware, libf2c carries a separate
+version number from f2c itself. The version number associated with the
+SlackBuilds package is the f2c version number.
+
+If combining with gfortran, you may want to use gfortran -ff2c. See the
+gfortran man page.
+
+Multiple files must be downloaded because netlib doesn't provide a
+convenient single tarball.
+
diff --git a/development/f2c/f2c.SlackBuild b/development/f2c/f2c.SlackBuild
index 4106279e3f..6256e7075f 100644
--- a/development/f2c/f2c.SlackBuild
+++ b/development/f2c/f2c.SlackBuild
@@ -27,10 +27,12 @@ VERSION=${VERSION:-20160102} # This is the f2c version, not libf2c.
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -66,7 +68,7 @@ cd $PRGNAM-$VERSION/libf2c
 unzip $CWD/libf2c.zip
 
 cd $TMP/$PRGNAM-$VERSION
-tar xvf $CWD/src.tgz
+tar xfvz $CWD/src.tgz
 
 chown -R root:root .
 find -L . \
@@ -75,46 +77,49 @@ 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 {} \;
 
-# libf2c
-
+# make libf2c:
 cd $TMP/$PRGNAM-$VERSION/libf2c
 make CFLAGS="${SLKCFLAGS}" -f makefile.u
 
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-make -f makefile.u LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} install
-strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libf2c.a
-
-# f2c
+# install libf2c:
+mkdir -p $PKG/usr/lib
+make -f makefile.u LIBDIR=$PKG/usr/lib install
 
+# make f2c:
 cd $TMP/$PRGNAM-$VERSION/src
 make CFLAGS="${SLKCFLAGS}" -f makefile.u
 
+# install f2c:
 mkdir -p $PKG/usr/bin
-install -s f2c $PKG/usr/bin
-strip --strip-unneeded $PKG/usr/bin/f2c
-
 mkdir -p $PKG/usr/include
+install -s f2c $PKG/usr/bin
 install f2c.h $PKG/usr/include
 
+# strip binaries:
+strip --strip-unneeded $PKG/usr/lib/libf2c.a
+strip --strip-unneeded $PKG/usr/bin/f2c
+
+# install f2c man page:
+cd $TMP
 mkdir -p $PKG/usr/man/man1
-install f2c.1 $PKG/usr/man/man1/f2c.1
+install $PRGNAM-$VERSION/src/f2c.1 $PKG/usr/man/man1/f2c.1
 gzip -9 $PKG/usr/man/man1/f2c.1
 
-
-cd $TMP/$PRGNAM-$VERSION
-
+# install docs:
+cd $TMP
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a src/Notice src/changes $PKG/usr/doc/$PRGNAM-$VERSION
-
-cp -a src/README $PKG/usr/doc/$PRGNAM-$VERSION/README.f2c
-cp -a libf2c/README $PKG/usr/doc/$PRGNAM-$VERSION/README.libf2c
-
+cp -a $PRGNAM-$VERSION/src/Notice $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM-$VERSION/src/README $PKG/usr/doc/$PRGNAM-$VERSION/README.f2c
+cp -a $PRGNAM-$VERSION/src/changes $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM-$VERSION/libf2c/README $PKG/usr/doc/$PRGNAM-$VERSION/README.libf2c
 cat $CWD/fc > $PKG/usr/doc/$PRGNAM-$VERSION/fc
 cat $CWD/f2c.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/f2c.pdf
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Copy the slack-desc into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# Make the package
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/f2c/f2c.info b/development/f2c/f2c.info
index 69d0ea1d2a..4b157b737c 100644
--- a/development/f2c/f2c.info
+++ b/development/f2c/f2c.info
@@ -6,7 +6,7 @@ DOWNLOAD="http://www.netlib.org/f2c/libf2c.zip \
           http://www.netlib.org/f2c/fc \
           http://www.netlib.org/f2c/f2c.pdf"
 MD5SUM="e80fb30fa3717660db71b1bed65b88b7 \
-        f11ed7992a92ad4b4f86fdf94994473a \
+        28758bfd41de18b0d1fcf716eea05032 \
         dcdf6afbd96204662bf10594b744cb44 \
         2a84d6d2f74412d7a288e721070d62b8"
 DOWNLOAD_x86_64=""
diff --git a/development/f2c/slack-desc b/development/f2c/slack-desc
index 4373cf0645..b1f3476557 100644
--- a/development/f2c/slack-desc
+++ b/development/f2c/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-f2c: f2c (Fortran-to-C converter)
+f2c: f2c (a Fortran-to-C converter)
 f2c:
-f2c: f2c is a Fortran-to-C converter
 f2c: by S. I. Feldman, David M. Gay, Mark W. Maimone, and N. L. Schryer
 f2c:
-f2c: This package includes libf2c, which must be linked to the resulting C
-f2c: code.
-f2c:
+f2c: From netlib. Includes libf2c.
 f2c:
+f2c: The general idea: f2c foo.f; gcc foo.c -lf2c
 f2c:
+f2c: If combining with gfortran, see the -ff2c option in the gfortran man
+f2c: page.
 f2c:
diff --git a/development/facile/facile.info b/development/facile/facile.info
index 6bcc192c8c..14d061ce49 100644
--- a/development/facile/facile.info
+++ b/development/facile/facile.info
@@ -1,7 +1,7 @@
 PRGNAM="facile"
 VERSION="1.1.3"
-HOMEPAGE="http://opti.recherche.enac.fr/facile/"
-DOWNLOAD="http://opti.recherche.enac.fr/facile/distrib/facile-1.1.3.tar.gz"
+HOMEPAGE="http://facile.recherche.enac.fr"
+DOWNLOAD="http://facile.recherche.enac.fr/distrib/facile-1.1.3.tar.gz"
 MD5SUM="172c4fbea636a8fa575b988390639d8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/facile/slack-desc b/development/facile/slack-desc
index 6afc68cbc3..1557c54f6d 100644
--- a/development/facile/slack-desc
+++ b/development/facile/slack-desc
@@ -11,7 +11,7 @@ facile:
 facile: FaCiLe is a Functional Constraint Library implemented in Objective
 facile: Caml.
 facile:
-facile: Homepage: http://opti.recherche.enac.fr/facile/
+facile: Homepage: http://facile.recherche.enac.fr
 facile:
 facile:
 facile:
diff --git a/development/fly/fly.SlackBuild b/development/fly/fly.SlackBuild
index 94db10fa9d..443529cc3c 100644
--- a/development/fly/fly.SlackBuild
+++ b/development/fly/fly.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fly
 
-# Copyright 2020 Dmitrii Sosedov, United States
+# Copyright 2021 Dmitrii Sosedov, United States
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fly
-VERSION=${VERSION:-6.0.0}
+VERSION=${VERSION:-6.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/fly/fly.info b/development/fly/fly.info
index 3a040919d1..d37c259100 100644
--- a/development/fly/fly.info
+++ b/development/fly/fly.info
@@ -1,10 +1,10 @@
 PRGNAM="fly"
-VERSION="6.0.0"
+VERSION="6.7.4"
 HOMEPAGE="https://concourse-ci.org/fly.html"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM="UNSUPPORTED"
-DOWNLOAD_x86_64="https://github.com/concourse/concourse/releases/download/v6.0.0/fly-6.0.0-linux-amd64.tgz"
-MD5SUM_x86_64="c0c66b346164b49be9121a2af4a585a0"
+DOWNLOAD_x86_64="https://github.com/concourse/concourse/releases/download/v6.7.4/fly-6.7.4-linux-amd64.tgz"
+MD5SUM_x86_64="43cecc7ca957a40bf2f0d6e1bac9e872"
 REQUIRES=""
 MAINTAINER="Dmitrii Sosedov"
 EMAIL="d.sosedov@gmail.com"
diff --git a/development/fly/slack-desc b/development/fly/slack-desc
index a6965fbcf1..22ab5e0244 100644
--- a/development/fly/slack-desc
+++ b/development/fly/slack-desc
@@ -15,5 +15,5 @@ fly: used for CI/CD, and is built to scale to any kind of automation
 fly: pipeline, from simple to complex.
 fly:
 fly: Homepage: https://concourse-ci.org/fly.html
-fly: Release date: Mar 25, 2020
+fly: Release date: Jan 26, 2021
 fly:
diff --git a/development/fossil/README b/development/fossil/README
index 9a33b45e31..af0f5691e7 100644
--- a/development/fossil/README
+++ b/development/fossil/README
@@ -3,32 +3,33 @@ created by D. Richard Hipp, the primary author of SQLite.
 
 Features:
 
-- tamper-proof artifact record
-- simple command-line interface
-- customizable web interface with JSON, RSS, CGI, wiki, and forum
-- online project documentation with full-text search capability
-- online activity and ticket reports
-- user accounts with access controls
-- coherent versioning across all files
-- straightforward branching and merging
-- bisect searches to pinpoint behavior changes
+- Tamper-proof artifact record
+- Simple command-line interface
+- Customizable web interface with JSON, RSS, CGI, wiki, chat, and forum
+- Online project documentation with full-text search capability
+- Integrated PIC-like markup language for creating diagrams
+- Online activity and ticket reports
+- User accounts with access controls
+- Coherent versioning across all files
+- Straightforward branching and merging
+- Bisect searches to pinpoint behavior changes
 - SHA3-256 and hardened SHA1 checksums
 - FUSE filesystem makes all historical and branch revisions available
-- synchronization via http, https, ssh, and local/network filesystems
-- automated replication and backup
-- git import/export and Subversion/CVS import
-- nested checkouts to share common subtrees across related projects
-- checkout directory not cluttered with administrative files
-- support for Docker
-- unversioned file area for builds, statistics, other ephemeral content
-- optional PGP signing of commits
-- users can subscribe to email alerts to be notified of event types
-- private branch which are excluded from syncs until published
-- bundles group a change set (e.g. a private branch) into a single file
-- users can make their own repositories, no need for special privileges
-- works in Windows as well as Linux and other Unix-like systems
+- Synchronization via http, https, ssh, and local/network filesystems
+- Automated replication and backup
+- Git import/export and Subversion/CVS import
+- Nested checkouts to share common subtrees across related projects
+- Checkout directory not cluttered with administrative files
+- Support for Docker
+- Unversioned file area for builds, statistics, other ephemeral content
+- Optional PGP signing of commits
+- Users can subscribe to email alerts to be notified of events
+- Private branches which are excluded from syncs until published
+- Bundles group a change set (e.g. a private branch) into a single file
+- Users can make their own repositories, no need for special privileges
+- Works in Windows as well as Linux and other Unix-like systems
 
-Fossil can host the entire project development website, including the
+Fossil can host an entire project development website, including the
 download area, but it also can be used for individual projects with no
 need for a shared server.
 
@@ -48,14 +49,14 @@ See Fossil in action online:
 
 Key technical points:
 
-- unified revision history tree spans the entire repository
-- repository is a collection of artifacts identified by their checksums
-- artifacts are broadly grouped into content and structural artifacts
-- each check-in is tracked as a structural artifact known as a manifest
-- manifests primarily list the full names and checksums of each file
-- manifests can be amended by subsequent control artifacts
-- in most cases, symbolic names refer to the latest matching check-in
-- branches are implemented using propagating symbolic tags
+- Unified revision history tree spans the entire repository
+- Repository is a collection of artifacts identified by their checksums
+- Artifacts are broadly grouped into content and structural artifacts
+- Each check-in is tracked as a structural artifact known as a manifest
+- Manifests primarily list the full names and checksums of each file
+- Manifests can be amended by subsequent control artifacts
+- In most cases, symbolic names refer to the latest matching check-in
+- Branches are implemented using propagating symbolic tags
 
 ------------------------------------------------------------------------
 
diff --git a/development/fossil/fossil.SlackBuild b/development/fossil/fossil.SlackBuild
index a2a80ad651..7e7aac0803 100644
--- a/development/fossil/fossil.SlackBuild
+++ b/development/fossil/fossil.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fossil
 
-# Copyright 2020 Andy Goth <andrew.m.goth@gmail.com> USA
+# Copyright 2021 Andy Goth <andrew.m.goth@gmail.com> USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fossil
-VERSION=${VERSION:-2.12.1}
+VERSION=${VERSION:-2.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,8 +87,7 @@ CFLAGS=${CFLAGS:-$SLKCFLAGS} \
 make
 make install DESTDIR=$PKG
 
-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
+strip --strip-unneeded $PKG/usr/bin/fossil
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c fossil.1 > $PKG/usr/man/man1/fossil.1.gz
diff --git a/development/fossil/fossil.info b/development/fossil/fossil.info
index f423ef7d5c..eaa464d81d 100644
--- a/development/fossil/fossil.info
+++ b/development/fossil/fossil.info
@@ -1,8 +1,8 @@
 PRGNAM="fossil"
-VERSION="2.12.1"
+VERSION="2.14"
 HOMEPAGE="https://fossil-scm.org/"
-DOWNLOAD="https://fossil-scm.org/home/uv/fossil-src-2.12.1.tar.gz"
-MD5SUM="55644270d8494fc5af25128ec56d178b"
+DOWNLOAD="https://fossil-scm.org/home/uv/fossil-src-2.14.tar.gz"
+MD5SUM="da3ce00b0cb234a9a082e5cf4c4596ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/fossil/slack-desc b/development/fossil/slack-desc
index 0eb1aec159..f1576571ae 100644
--- a/development/fossil/slack-desc
+++ b/development/fossil/slack-desc
@@ -10,10 +10,10 @@ fossil: fossil (Distributed Version Control System)
 fossil:
 fossil: Fossil is a distributed version control and ticket tracking system
 fossil: created by D. Richard Hipp, primary author of SQLite.  Features:
-fossil: simple command-line interface, coherent versioning across all files,
-fossil: easy branching and merging, customizable web interface, built-in wiki
-fossil: and forum, SHA3-256 and hardened SHA1 checksums, FUSE filesystem, and
-fossil: automated replication and backup.  Content is stored using SQLite for
-fossil: atomicity, durability, and effortless administration.
+fossil: simple command-line interface; coherent versioning across all files,
+fossil: easy branching and merging; customizable web interface; built-in wiki,
+fossil: chat, and forum; SHA3-256 checksums; FUSE filesystem; and automated
+fossil: replication and backup.  Content is stored using SQLite for atomicity,
+fossil: durability, and effortless administration.
 fossil:
 fossil: Project Site: https://www.fossil-scm.org/
diff --git a/development/gede/gede.SlackBuild b/development/gede/gede.SlackBuild
index 5d657e6b84..04a0304bc5 100644
--- a/development/gede/gede.SlackBuild
+++ b/development/gede/gede.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gede
-VERSION=${VERSION:-2.16.2}
+VERSION=${VERSION:-2.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/gede/gede.info b/development/gede/gede.info
index 190608948c..de179024cf 100644
--- a/development/gede/gede.info
+++ b/development/gede/gede.info
@@ -1,10 +1,10 @@
 PRGNAM="gede"
-VERSION="2.16.2"
-HOMEPAGE="http://acidron.com/gede/"
-DOWNLOAD="http://gede.acidron.com/uploads/source/gede-2.16.2.tar.xz"
-MD5SUM="679e014c88c7502f0ef196a3f31eaa45"
+VERSION="2.17.1"
+HOMEPAGE="http://gede.dexar.se/"
+DOWNLOAD="http://gede.dexar.se/uploads/source/gede-2.17.1.tar.xz"
+MD5SUM="5be528e2d0e28b4cb69c4a71edc92b31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
 MAINTAINER="Wainamoinen"
 EMAIL="wainamoinen@gmail.com"
diff --git a/development/gedit-plugins/gedit-plugins.info b/development/gedit-plugins/gedit-plugins.info
index dcc8ae446c..f5c085174d 100644
--- a/development/gedit-plugins/gedit-plugins.info
+++ b/development/gedit-plugins/gedit-plugins.info
@@ -1,7 +1,7 @@
 PRGNAM="gedit-plugins"
 VERSION="2.32.0"
 HOMEPAGE="http://projects.gnome.org/gedit/"
-DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.32/gedit-plugins-2.32.0.tar.bz2"
+DOWNLOAD="https://download.gnome.org/sources/gedit-plugins/2.32/gedit-plugins-2.32.0.tar.bz2"
 MD5SUM="b5123846fa41f2d94992ae67e96ff79b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/gedit/gedit.info b/development/gedit/gedit.info
index d86a704442..fe8320a785 100644
--- a/development/gedit/gedit.info
+++ b/development/gedit/gedit.info
@@ -1,7 +1,7 @@
 PRGNAM="gedit"
 VERSION="2.30.4"
 HOMEPAGE="http://projects.gnome.org/gedit/"
-DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gedit/2.30/gedit-2.30.4.tar.bz2"
+DOWNLOAD="https://download.gnome.org/sources/gedit/2.30/gedit-2.30.4.tar.bz2"
 MD5SUM="e1eecb0a92a1a363b3d375ec5ac0fb3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/ghi/ghi.SlackBuild b/development/ghi/ghi.SlackBuild
index 3cea5c1fc6..e03573280c 100644
--- a/development/ghi/ghi.SlackBuild
+++ b/development/ghi/ghi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ghi
 
-# Copyright 2017  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/development/ghi/ghi.info b/development/ghi/ghi.info
index a64f777b67..a6104b33e9 100644
--- a/development/ghi/ghi.info
+++ b/development/ghi/ghi.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-pygments"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/development/git-cola/git-cola.info b/development/git-cola/git-cola.info
index f3d1051657..3d760e1fe7 100644
--- a/development/git-cola/git-cola.info
+++ b/development/git-cola/git-cola.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/git-cola/git-cola/archive/v3.6/git-cola-3.6.tar.gz"
 MD5SUM="ba4e64d82a27ee5452afbbc16a28717e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-attrs python3-certifi Sphinx"
+REQUIRES="python3-attrs python-certifi Sphinx"
 MAINTAINER="Ricardo J. Barberis"
 EMAIL="ricardo.barberis@gmail.com"
diff --git a/development/git-crypt/README b/development/git-crypt/README
new file mode 100644
index 0000000000..6363c7b888
--- /dev/null
+++ b/development/git-crypt/README
@@ -0,0 +1,11 @@
+git-crypt - transparent file encryption in git
+
+git-crypt enables transparent encryption and decryption of files in a
+git repository. Files which you choose to protect are encrypted when
+committed, and decrypted when checked out. git-crypt lets you freely
+share a repository containing a mix of public and private content.
+git-crypt gracefully degrades, so developers without the secret key
+can still clone and commit to a repository with encrypted files. This
+lets you store your secret material (such as keys or passwords) in the
+same repository as your code, without requiring you to lock down your
+entire repository.
diff --git a/development/git-crypt/git-crypt.SlackBuild b/development/git-crypt/git-crypt.SlackBuild
new file mode 100644
index 0000000000..d2311f3035
--- /dev/null
+++ b/development/git-crypt/git-crypt.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for git-crypt
+
+# Copyright 2021 Nicolas Piatto <nico@lodpp.net> FRANCE
+# 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.
+
+# 02/Mar/2021 * First version
+
+PRGNAM=git-crypt
+VERSION=${VERSION:-0.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make
+make install ENABLE_MAN=yes DESTDIR=$PKG
+
+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 \
+  doc AUTHORS CONTRIBUTING.md COPYING NEWS README \
+  RELEASE_NOTES-0.4.1.md RELEASE_NOTES-0.4.md THANKS.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/git-crypt/git-crypt.info b/development/git-crypt/git-crypt.info
new file mode 100644
index 0000000000..a6a3260538
--- /dev/null
+++ b/development/git-crypt/git-crypt.info
@@ -0,0 +1,10 @@
+PRGNAM="git-crypt"
+VERSION="0.6.0"
+HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
+DOWNLOAD="https://github.com/AGWA/git-crypt/archive/0.6.0/git-crypt-0.6.0.tar.gz"
+MD5SUM="0667274390a7e90313c443b70df4e5f9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nicolas Piatto"
+EMAIL="nico@lodpp.net"
diff --git a/development/git-crypt/slack-desc b/development/git-crypt/slack-desc
new file mode 100644
index 0000000000..c7b4bd94f6
--- /dev/null
+++ b/development/git-crypt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+git-crypt: git-crypt (transparent file encryption in git)
+git-crypt:
+git-crypt: git-crypt enables transparent encryption and decryption of files in a
+git-crypt: a git repository. Files which you choose to protect are encrypted
+git-crypt: when committed, and decrypted when checked out. git-crypt lets you
+git-crypt: freely share a repository containing a mix of public and private
+git-crypt: content. git-crypt gracefully degrades, so developers without the
+git-crypt: secret key can still clone and commit to a repository with encrypted
+git-crypt: files. This lets you store your secret material (such as keys or
+git-crypt: passwords) in the same repository as your code, without requiring you
+git-crypt: to lock down your entire repository
diff --git a/development/git-extras/README b/development/git-extras/README
new file mode 100644
index 0000000000..6ab459aab1
--- /dev/null
+++ b/development/git-extras/README
@@ -0,0 +1,5 @@
+GIT utilities
+
+Repo summary, repl, changelog population, author commit percentages and more.
+
+For more information go to Commands.md page for basic usage and examples.
diff --git a/development/git-extras/git-extras.SlackBuild b/development/git-extras/git-extras.SlackBuild
new file mode 100644
index 0000000000..f9760e3001
--- /dev/null
+++ b/development/git-extras/git-extras.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Slackware build script for git-extras
+
+# Copyright 2020-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# 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=git-extras
+VERSION=${VERSION:-6.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make install PREFIX=$PKG/usr SYSCONFDIR=$PKG/etc
+
+mv $PKG/usr/share/man $PKG/usr
+rm -rf $PKG/usr/share
+
+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.md CONTRIBUTING.md LICENSE AUTHORS Commands.md History.md Installation.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/git-extras/git-extras.info b/development/git-extras/git-extras.info
new file mode 100644
index 0000000000..7bab5b391f
--- /dev/null
+++ b/development/git-extras/git-extras.info
@@ -0,0 +1,10 @@
+PRGNAM="git-extras"
+VERSION="6.2.0"
+HOMEPAGE="https://github.com/tj/git-extras"
+DOWNLOAD="https://github.com/tj/git-extras/archive/6.2.0/git-extras-6.2.0.tar.gz"
+MD5SUM="aa96e6516b53e0ff63a06f910986f263"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Giuseppe Di Terlizzi"
+EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/multimedia/vokoscreen/slack-desc b/development/git-extras/slack-desc
index fb49a51f85..eb1886f9de 100644
--- a/multimedia/vokoscreen/slack-desc
+++ b/development/git-extras/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-vokoscreen: vokoscreen (screencast creator)
-vokoscreen:
-vokoscreen: vokoscreen is an easy to use screencast creator to record
-vokoscreen: educational videos, live recordings of browser, installation,
-vokoscreen: videoconferences, etc.
-vokoscreen:
-vokoscreen:
-vokoscreen:
-vokoscreen:
-vokoscreen: http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
-vokoscreen:
+git-extras: git-extras (repo summary, repl, changelog population and more )
+git-extras:
+git-extras: GIT utilities -- repo summary, repl, changelog population, author
+git-extras: commit percentages and more 
+git-extras:
+git-extras:
+git-extras:
+git-extras:
+git-extras:
+git-extras: Home-Page : https://github.com/tj/git-extras
+git-extras:
diff --git a/development/git-lfs/git-lfs.SlackBuild b/development/git-lfs/git-lfs.SlackBuild
index 58e25a6789..50ab58906f 100644
--- a/development/git-lfs/git-lfs.SlackBuild
+++ b/development/git-lfs/git-lfs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for git-lfs
 
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=git-lfs
-VERSION=${VERSION:-2.12.0}
+VERSION=${VERSION:-2.13.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/git-lfs/git-lfs.info b/development/git-lfs/git-lfs.info
index 98c82ec938..752b307be1 100644
--- a/development/git-lfs/git-lfs.info
+++ b/development/git-lfs/git-lfs.info
@@ -1,10 +1,10 @@
 PRGNAM="git-lfs"
-VERSION="2.12.0"
+VERSION="2.13.3"
 HOMEPAGE="https://git-lfs.github.com/"
-DOWNLOAD="https://github.com/git-lfs/git-lfs/releases/download/v2.12.0/git-lfs-linux-386-v2.12.0.tar.gz"
-MD5SUM="1a67b17b79a3cb630b684a2286617fe4"
-DOWNLOAD_x86_64="https://github.com/git-lfs/git-lfs/releases/download/v2.12.0/git-lfs-linux-amd64-v2.12.0.tar.gz"
-MD5SUM_x86_64="2d4472e3328f3aed84feb48069060f85"
+DOWNLOAD="https://github.com/git-lfs/git-lfs/releases/download/v2.13.3/git-lfs-linux-386-v2.13.3.tar.gz"
+MD5SUM="58ce3f328b9520feb228e77f057929b7"
+DOWNLOAD_x86_64="https://github.com/git-lfs/git-lfs/releases/download/v2.13.3/git-lfs-linux-amd64-v2.13.3.tar.gz"
+MD5SUM_x86_64="28eafc12b75c29e0416b2cbb34e20758"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/development/github-cli/github-cli.SlackBuild b/development/github-cli/github-cli.SlackBuild
index b3d2fbbab2..23f8f601f6 100644
--- a/development/github-cli/github-cli.SlackBuild
+++ b/development/github-cli/github-cli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for GitHub CLI
 
-# Copyright 2020 Ebben Aries
+# Copyright 2020-2021 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=github-cli
 DEBNAM=gh
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/github-cli/github-cli.info b/development/github-cli/github-cli.info
index 013b756ea6..6d99a6809d 100644
--- a/development/github-cli/github-cli.info
+++ b/development/github-cli/github-cli.info
@@ -1,10 +1,10 @@
 PRGNAM="github-cli"
-VERSION="1.1.0"
+VERSION="1.8.1"
 HOMEPAGE="https://cli.github.com/"
-DOWNLOAD="https://github.com/cli/cli/releases/download/v1.1.0/gh_1.1.0_linux_386.deb"
-MD5SUM="28db3207b74436ca6990d25ebda49042"
-DOWNLOAD_x86_64="https://github.com/cli/cli/releases/download/v1.1.0/gh_1.1.0_linux_amd64.deb"
-MD5SUM_x86_64="b70ee79a03ca29f1a1a7b95341e937bc"
+DOWNLOAD="https://github.com/cli/cli/releases/download/v1.8.1/gh_1.8.1_linux_386.deb"
+MD5SUM="9e793d52f56d37b6359071a0d67187b9"
+DOWNLOAD_x86_64="https://github.com/cli/cli/releases/download/v1.8.1/gh_1.8.1_linux_amd64.deb"
+MD5SUM_x86_64="dc7fff85e9ac3fbd170b49ce8c20326d"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/development/gnulib/gnulib.SlackBuild b/development/gnulib/gnulib.SlackBuild
index a146a480b8..fa218fdaea 100644
--- a/development/gnulib/gnulib.SlackBuild
+++ b/development/gnulib/gnulib.SlackBuild
@@ -58,11 +58,8 @@ rm -rf $PRGNAM-${VERSION/+/-}-stable
 tar xvf $CWD/${PRGNAM}_$VERSION+stable.orig.tar.gz
 cd $PRGNAM-${VERSION/+/-}-stable
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 find . \( -name '.git*' -o -name '.cvs*' \) -print0 | xargs -0 rm -rf
 
diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild
index 53303f2a53..1afff977d9 100644
--- a/development/google-go-lang/google-go-lang.SlackBuild
+++ b/development/google-go-lang/google-go-lang.SlackBuild
@@ -27,7 +27,7 @@
 # SOFTWARE.
 
 PRGNAM=google-go-lang
-VERSION=${VERSION:-1.13.10}
+VERSION=${VERSION:-1.16.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,12 +80,28 @@ find -L . \
 # as of >= go1.5, the cross-compiler does not need to be bootstrap, so the
 # compiler need only be compiled for the host OS, which it detects
 unset GOBIN GOPATH GOOS GOARCH
-unset BASH_ENV # Not sure why, but this causes run.bash to fail --rworkman
 
-export GOROOT_BOOTSTRAP="/usr" # gcc 5+ is go1.4 API, so we'll bootstrap with it
+# Not sure why, but this causes run.bash to fail --rworkman
+unset BASH_ENV
+
+# gcc 5+ is go1.4 API, so we'll bootstrap with it
+export GOROOT_BOOTSTRAP="/usr"
+
+# Default GOROOT is the parent directory of all.bash,
+# which is the current directory we're in.
+# Defining it here means we can use it below when building
+# shared libraries
 export GOROOT="$(pwd)"
+
+# The value of GOROOT once the package is installed
 export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${VERSION}/go"
 
+if [ "$ARCH" = "i586" ]; then
+  export GO386="softfloat"
+elif [ "$ARCH" = "i686" ]; then
+  export GO386="softfloat"
+fi
+
 cd src
 
 if [ "x${RUN_TEST}" = "xtrue" ] ; then
@@ -101,6 +117,14 @@ $GOROOT/bin/go install -buildmode=shared std
 
 cd ..
 
+# remove Go build cache
+rm -rf pkg/obj/go-build/*
+
+# remove the doc Makefile
+rm -f doc/Makefile
+
+mkdir -p $PKG$GOROOT_FINAL
+
 # Put the profile scripts for setting PATH and env variables
 mkdir -p $PKG/etc/profile.d
 cat > $PKG/etc/profile.d/go.csh << EOF
diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info
index 624ace179a..a4943b4624 100644
--- a/development/google-go-lang/google-go-lang.info
+++ b/development/google-go-lang/google-go-lang.info
@@ -1,8 +1,8 @@
 PRGNAM="google-go-lang"
-VERSION="1.13.10"
+VERSION="1.16.3"
 HOMEPAGE="http://golang.org"
-DOWNLOAD="https://storage.googleapis.com/golang/go1.13.10.src.tar.gz"
-MD5SUM="a46b8e0f749dccd262cc5c309eb6eacf"
+DOWNLOAD="https://storage.googleapis.com/golang/go1.16.3.src.tar.gz"
+MD5SUM="48183a40d6522f1ea59b7d63377b7072"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild
index a90c02d5ab..6e94355747 100644
--- a/development/gtest/gtest.SlackBuild
+++ b/development/gtest/gtest.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=gtest
 SRCNAM=googletest
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
@@ -87,13 +87,13 @@ cd ..
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM/internal/custom \
     $PKG/usr/include/gmock/internal/custom
 
-install -m 0644 build/googlemock/*.so $PKG/usr/lib$LIBDIRSUFFIX
+#install -m 0644 build/googlemock/*.so $PKG/usr/lib$LIBDIRSUFFIX
 install -m 0644 googlemock/include/gmock/*.h $PKG/usr/include/gmock
 install -m 0644 googlemock/include/gmock/internal/*.h $PKG/usr/include/gmock/internal/
 install -m 0644 googlemock/include/gmock/internal/custom/*.h \
     $PKG/usr/include/gmock/internal/custom
 
-install -m 0644 build/googlemock/$PRGNAM/*.so $PKG/usr/lib$LIBDIRSUFFIX
+#install -m 0644 build/googlemock/$PRGNAM/*.so $PKG/usr/lib$LIBDIRSUFFIX
 install -m 0644 googletest/include/$PRGNAM/*.h $PKG/usr/include/$PRGNAM/
 install -m 0644 googletest/include/$PRGNAM/internal/*.h $PKG/usr/include/$PRGNAM/internal/
 install -m 0644 googletest/include/$PRGNAM/internal/custom/*.h \
diff --git a/development/gtest/gtest.info b/development/gtest/gtest.info
index 9a2e734260..e67e05ae7d 100644
--- a/development/gtest/gtest.info
+++ b/development/gtest/gtest.info
@@ -1,8 +1,8 @@
 PRGNAM="gtest"
-VERSION="1.8.0"
+VERSION="1.10.0"
 HOMEPAGE="https://github.com/google/googletest"
-DOWNLOAD="https://github.com/google/googletest/archive/release-1.8.0/googletest-release-1.8.0.tar.gz"
-MD5SUM="16877098823401d1bf2ed7891d7dce36"
+DOWNLOAD="https://github.com/google/googletest/archive/release-1.10.0/googletest-release-1.10.0.tar.gz"
+MD5SUM="ecd1fa65e7de707cd5c00bdac56022cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/hexe/README b/development/hexe/README
new file mode 100644
index 0000000000..ab9d77e231
--- /dev/null
+++ b/development/hexe/README
@@ -0,0 +1,4 @@
+hexe (minimalist hex editor)
+
+hexe is a hex editor with emacs-like key bindings. It runs in a
+terminal and allows viewing, editing, and searching in hex or ASCII.
diff --git a/development/hexe/fix-b-option.diff b/development/hexe/fix-b-option.diff
new file mode 100644
index 0000000000..addf4a3773
--- /dev/null
+++ b/development/hexe/fix-b-option.diff
@@ -0,0 +1,12 @@
+diff -Naur hexe-20120305/hexe.c hexe-20120305.patched/hexe.c
+--- hexe-20120305/hexe.c	2012-03-05 19:08:11.000000000 -0500
++++ hexe-20120305.patched/hexe.c	2020-11-16 15:55:21.419107371 -0500
+@@ -63,7 +63,7 @@
+                         break;
+                     }
+                 }
+-                else if(!strcmp(argv[i], "-c"))
++                else if(!strcmp(argv[i], "-b"))
+                 {
+                     sscanf(argv[++i], "%i", &bytegroup);
+                     goto bytegroup_check;
diff --git a/development/hexe/hexe.1 b/development/hexe/hexe.1
new file mode 100644
index 0000000000..1fd9d1af7a
--- /dev/null
+++ b/development/hexe/hexe.1
@@ -0,0 +1,77 @@
+.\" Man page generated from reStructuredText.
+.
+.TH HEXE 1 "2020-11-16" "20120305" "SlackBuilds.org"
+.SH NAME
+hexe \- hex editor with curses UI
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for hexe(1) man page. Convert with:
+.
+.\" rst2man.py hexe.rst > hexe.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+hexe [\fI\-options\fP] [\fBfile\fP]
+.SH DESCRIPTION
+.sp
+hexe is a hex editor with emacs\-like key bindings. It runs in a
+terminal and allows viewing, editing, and searching in hex or ASCII.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-b,\-\-byte\-groups=<count>
+Set the width of byte groups. Valid counts are 1, 2, 4 (default), 8, 16.
+.TP
+.B \-c,\-\-no\-cols=<count>
+Set the number of columns. Default is 4. No checking is done on the
+size of the terminal, so setting this too high means the rightmost
+columns (and ASCII display) will not be visible.
+.TP
+.B \fB+ADDRESS\fP
+Start at ADDRESS (hexadecimal). If the address is greater than the file size,
+starts at the end of the file.
+.TP
+.B \-v,\-\-view
+View mode (read\-only).
+.TP
+.B \-h,\-?,\-\-help
+Show help message and exit.
+.UNINDENT
+.SH AUTHORS
+.sp
+hexe was written by spinout.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The author\(aqs homepage: \fI\%http://spinout182.com\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/development/hexe/hexe.SlackBuild b/development/hexe/hexe.SlackBuild
new file mode 100644
index 0000000000..ba607a4774
--- /dev/null
+++ b/development/hexe/hexe.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackware build script for hexe
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Source is distributed on upstream site as a dir full of individual
+# files rather than a tarball/etc. So I made a tarball containing
+# them all. VERSION is the server timestamp on all the files.
+
+PRGNAM=hexe
+VERSION=${VERSION:-20120305}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# The short -b version of --byte-groups didn't work (typo in source)
+patch -p1 < $CWD/fix-b-option.diff
+
+# Get rid of inline warnings
+sed -i 's,\<inline\>,,' $PRGNAM.h
+
+make CFLAGS="-Wall $SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/bin
+
+# man page by SlackBuild author
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# There's *no* documentation, include our own README.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/hexe/hexe.info b/development/hexe/hexe.info
new file mode 100644
index 0000000000..1a774d4bcb
--- /dev/null
+++ b/development/hexe/hexe.info
@@ -0,0 +1,10 @@
+PRGNAM="hexe"
+VERSION="20120305"
+HOMEPAGE="http://spinout182.com"
+DOWNLOAD="https://slackware.uk/~urchlay/src/hexe-20120305.tar.xz"
+MD5SUM="977603f712970477f835c68e4adee6b7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/hexe/hexe.rst b/development/hexe/hexe.rst
new file mode 100644
index 0000000000..21eec15447
--- /dev/null
+++ b/development/hexe/hexe.rst
@@ -0,0 +1,64 @@
+.. RST source for hexe(1) man page. Convert with:
+..   rst2man.py hexe.rst > hexe.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20120305
+.. |date| date::
+
+====
+hexe
+====
+
+-------------------------
+hex editor with curses UI
+-------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+hexe [*-options*] [**file**]
+
+DESCRIPTION
+===========
+
+hexe is a hex editor with emacs-like key bindings. It runs in a
+terminal and allows viewing, editing, and searching in hex or ASCII.
+
+OPTIONS
+=======
+
+-b,--byte-groups=<count>
+   Set the width of byte groups. Valid counts are 1, 2, 4 (default), 8, 16.
+
+-c,--no-cols=<count>
+   Set the number of columns. Default is 4. No checking is done on the
+   size of the terminal, so setting this too high means the rightmost
+   columns (and ASCII display) will not be visible.
+
+**+ADDRESS**
+   Start at ADDRESS (hexadecimal). If the address is greater than the file size,
+   starts at the end of the file.
+
+-v,--view
+   View mode (read-only).
+
+-h,-?,--help
+   Show help message and exit.
+
+AUTHORS
+=======
+
+hexe was written by spinout.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The author's homepage: http://spinout182.com
diff --git a/development/hexe/slack-desc b/development/hexe/slack-desc
new file mode 100644
index 0000000000..9f76c049a2
--- /dev/null
+++ b/development/hexe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+hexe: hexe (minimalist hex editor)
+hexe:
+hexe: hexe is a hex editor with emacs-like key bindings. It runs in a
+hexe: terminal and allows editing in hex or ASCII.
+hexe:
+hexe:
+hexe:
+hexe:
+hexe:
+hexe:
+hexe:
diff --git a/development/hexer/README b/development/hexer/README
new file mode 100644
index 0000000000..1570516a04
--- /dev/null
+++ b/development/hexer/README
@@ -0,0 +1,11 @@
+hexer (hex editor with vi-like UI)
+
+Hexer is a multi-buffer editor for binary files for Unix-like systems
+that displays its buffer(s) as a hex dump. The user interface is kept
+similar to vi/ex.
+
+If you don't like the default color scheme, copy one of the
+/usr/doc/$VERSION/rc/hexerrc.* files to ~/.hexerrc.
+
+The package also includes myc, a simple textmode calculator that's
+useful for hex <=> decimal conversions and bitwise operations.
diff --git a/development/hexer/hexer.SlackBuild b/development/hexer/hexer.SlackBuild
new file mode 100644
index 0000000000..f54c846b31
--- /dev/null
+++ b/development/hexer/hexer.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Slackware build script for hexer
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=hexer
+VERSION=${VERSION:-1.0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Add some formatting to the man pages and fix a few typos.
+patch -p1 < $CWD/manpages_readability.diff
+
+# Binaries get installed already stripped.
+make all myc PREFIX=/usr CFLAGS="$SLKCFLAGS" LIBTERMCAP=-lncurses
+make install PREFIX=/usr DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man?/*.?
+
+# The *.doc files are plain text versions of the man pages, don't bother.
+# help.txt actually gets built into the binary for the :help command.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/rc
+cp -a CHANGES COPYRIGHT README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# The default color scheme is hard for me to read, so I include a few
+# sample rc files with various color schemes.
+install -m0644 -oroot -groot $CWD/rc/* $PKG/usr/doc/$PRGNAM-$VERSION/rc
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/hexer/hexer.info b/development/hexer/hexer.info
new file mode 100644
index 0000000000..9f0e64b184
--- /dev/null
+++ b/development/hexer/hexer.info
@@ -0,0 +1,10 @@
+PRGNAM="hexer"
+VERSION="1.0.6"
+HOMEPAGE="http://devel.ringlet.net/editors/hexer/"
+DOWNLOAD="https://devel.ringlet.net/files/editors/hexer/hexer-1.0.6.tar.xz"
+MD5SUM="516d37a8f027cd556e98c4b81dfcf79a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/hexer/manpages_readability.diff b/development/hexer/manpages_readability.diff
new file mode 100644
index 0000000000..3afada02c6
--- /dev/null
+++ b/development/hexer/manpages_readability.diff
@@ -0,0 +1,272 @@
+diff -Naur hexer-1.0.6/hexer.1 hexer-1.0.6.patched/hexer.1
+--- hexer-1.0.6/hexer.1	2020-04-24 09:06:48.000000000 -0400
++++ hexer-1.0.6.patched/hexer.1	2020-11-19 15:51:44.118564837 -0500
+@@ -339,7 +339,7 @@
+ .BR "REGULAR EXPRESSIONS" ).
+ .TP
+ .B ?
+-Search reverse using a regular expression.
++Reverse search using a regular expression.
+ .TP
+ .B .
+ Repeat the last change to the buffer
+@@ -427,7 +427,7 @@
+ or
+ .BR BackSpace
+ key deletes the previously inserted byte.  If the hex column is active, the
+-previously inserted nibble (hex digit) is deleted.  It is not possible
++previously inserted nybble (hex digit) is deleted.  It is not possible
+ to delete more bytes than have been inserted in the current insert command.
+ While in
+ .BR "Insert Mode" ,
+@@ -940,7 +940,7 @@
+ .B maxmatch
+ limit by doubling the `*' or `+' operator, e.g. "a.**b" or
+ "foo\\(bar\\)\\+\\+".
+-.br
++.PP
+ Note that the context specifiers `^'/`$' (beginning/end of a line) and
+ `\\<'/`\\>' (beginning/end of a word) are available and actually do
+ what you expect.  If you don't want the atoms `.' and `[^...]' to match
+@@ -948,13 +948,13 @@
+ .B specialnl
+ option using the
+ .BR :set -command.
+-.br
++.PP
+ To enter a special character, you can use the standard C `\\'\(hyescape
+ sequences.  To enter a character using its octal code, use a `\\o'\(hyprefix
+ followed by up to three octal digits.
+ (C-style octal escapes are not supported, because `\\0', ... `\\9' are
+ interpreted as back-references to subexpressions of the RE.)
+-To enter a character using it's hex code, type a `\\x'-prefix followed
++To enter a character using its hex code, type a `\\x'-prefix followed
+ by up to two hex digits; decimal codes can be entered using a `\\d'\(hyprefix
+ followed by up to three decimal digits.  It is possible to enter strings
+ of codes by doubling the base specifier, e.g. "\\xxfe ff 5a 7e" or
+@@ -963,7 +963,7 @@
+ .BR maxmatch )
+ of repetitions of
+ .BR "ff fe" .
+-.br
++.PP
+ It is possible to use all kinds of character `\\'\(hyescapes (escapes
+ representing a single character) within `[]'\(hyranges.  Within a range,
+ the `o' selecting an octal base for the escape may be omitted, since
+@@ -988,55 +988,80 @@
+ .B %
+ (percent) sign and an expression in infix notation.
+ It is possible to use parentheses.
++.PP
+ .B myc
+ understands the following binary infix operators (from highest priority to
+ lowest):
++.TP
+ .B **
+ (power),
++.TP
+ .B *
+ (multiply),
++.TP
+ .B /
+ (divide),
++.TP
+ .B %
+ (modulo),
++.TP
+ .B +
+ (add),
+-.B -
++.TP
++.B \-
+ (subtract),
++.TP
+ .B <<
+ (shift left),
++.TP
+ .B >>
+ (shift right),
++.TP
+ .B <
+ (less),
++.TP
+ .B <=
+ (less or equal),
++.TP
+ .B >
+ (greater),
++.TP
+ .B >=
+ (greater or equal),
++.TP
+ .B ==
+ (equal),
++.TP
+ .B !=
+ (not equal),
++.TP
+ .B &
+ (arithmetical and),
++.TP
+ .B |
+ (arithmetical or),
++.TP
+ .B ^
+ (arithmetical exclusive or),
++.TP
+ .B &&
+ (logical and),
++.TP
+ .B ||
+ (logical or),
++.TP
+ .B =
+ (assign);  and the following unary prefix operators:
+-.B -
++.TP
++.B \-
+ (negate, unary minus),
++.TP
+ .B !
+ (logical not),
++.TP
+ .B ~
+ (bitwise complement).
++.PP
+ .B myc
+ knows three data types:
+ .BR boolean ,
+@@ -1044,8 +1069,10 @@
+ (32 bit),
+ .B float
+ (64 bit, equivalent to C double).
++.PP
+ On some esoteric platforms the precision of integer and float may be
+ different.
++.PP
+ As in C the result of a division depends on the data types of the operands.
+ An integer divided by an integer yields an integer.
+ If you want the result to be a float, make sure one of the operands is a
+@@ -1057,8 +1084,10 @@
+ .I a/(b+0.)
+ instead of
+ .IR a/b .
++.PP
+ The power operation returns a float if the result is too large to fit in an
+ integer.
++.PP
+ The result of a calculation is stored in the special variables
+ .B $$
+ and
+diff -Naur hexer-1.0.6/myc.1 hexer-1.0.6.patched/myc.1
+--- hexer-1.0.6/myc.1	2020-04-24 09:06:48.000000000 -0400
++++ hexer-1.0.6.patched/myc.1	2020-11-19 15:39:33.189631281 -0500
+@@ -64,67 +64,98 @@
+ is specified on the command-line, the result is echoed and
+ .B myc
+ exits immediately.
++.PP
+ If invoked with no arguments,
+ .B myc
+ starts reading commands from standard-in.
++.SH OPERATORS
+ .B myc
+ understands the following binary infix operators (from highest priority to
+ lowest):
++.TP
+ .B **
+ (power),
++.TP
+ .B *
+ (multiply),
++.TP
+ .B /
+ (divide),
++.TP
+ .B %
+ (modulo),
++.TP
+ .B +
+ (add),
+-.B -
++.TP
++.B \-
+ (subtract),
++.TP
+ .B <<
+ (shift left),
++.TP
+ .B >>
+ (shift right),
++.TP
+ .B <
+ (less),
++.TP
+ .B <=
+ (less or equal),
++.TP
+ .B >
+ (greater),
++.TP
+ .B >=
+ (greater or equal),
++.TP
+ .B ==
+ (equal),
++.TP
+ .B !=
+ (not equal),
++.TP
+ .B &
+ (arithmetical and),
++.TP
+ .B |
+ (arithmetical or),
++.TP
+ .B ^
+ (arithmetical exclusive or),
++.TP
+ .B &&
+ (logical and),
++.TP
+ .B ||
+ (logical or),
++.TP
+ .B =
+ (assign);  and the following unary prefix operators:
+-.B -
++.TP
++.B \-
+ (negate, unary minus),
++.TP
+ .B !
+ (logical not),
++.TP
+ .B ~
+ (bitwise complement).
++.SH DATA TYPES
+ .B myc
+ knows three data types:
++.TP
+ .BR boolean ,
++.TP
+ .B integer
+ (32 bit),
++.TP
+ .B float
+ (64 bit, equivalent to C double).
++.SH NOTES
+ On some esoteric platforms the precision of integer and float may be
+ different.
++.PP
+ As in C the result of a division depends on the data types of the operands.
+ An integer divided by an integer yields an integer.
+ If you want the result to be a float, make sure one of the operands is a
+@@ -138,6 +169,7 @@
+ .IR a/b .
+ The power operation returns a float if the result is too large to fit in an
+ integer.
++.PP
+ The result of a calculation is stored in the special variables
+ .B $$
+ and
diff --git a/development/hexer/rc/hexerrc.blackonwhite b/development/hexer/rc/hexerrc.blackonwhite
new file mode 100644
index 0000000000..8914c095dd
--- /dev/null
+++ b/development/hexer/rc/hexerrc.blackonwhite
@@ -0,0 +1,2 @@
+set bg=7
+set fg=0
diff --git a/development/hexer/rc/hexerrc.greenonblack b/development/hexer/rc/hexerrc.greenonblack
new file mode 100644
index 0000000000..49f42de758
--- /dev/null
+++ b/development/hexer/rc/hexerrc.greenonblack
@@ -0,0 +1,2 @@
+set bg=0
+set fg=2
diff --git a/development/hexer/rc/hexerrc.whiteonblack b/development/hexer/rc/hexerrc.whiteonblack
new file mode 100644
index 0000000000..6ba64321e1
--- /dev/null
+++ b/development/hexer/rc/hexerrc.whiteonblack
@@ -0,0 +1,2 @@
+set bg=0
+set fg=7
diff --git a/development/hexer/slack-desc b/development/hexer/slack-desc
new file mode 100644
index 0000000000..c853016ed6
--- /dev/null
+++ b/development/hexer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+hexer: hexer (hex editor with vi-like UI)
+hexer:
+hexer: Hexer is a multi-buffer editor for binary files for Unix-like systems
+hexer: that displays its buffer(s) as a hex dump. The user interface is kept
+hexer: similar to vi/ex.
+hexer:
+hexer:
+hexer:
+hexer:
+hexer:
+hexer:
diff --git a/development/hexnet/README b/development/hexnet/README
new file mode 100644
index 0000000000..71f4c2d4b7
--- /dev/null
+++ b/development/hexnet/README
@@ -0,0 +1,8 @@
+hexnet is minimalistic network terminal for testing of binary communi-
+cations.  It accepts multiple pairs  of  characters  interpreting  each
+pair as a hexadecimal number.  Pairs may optionally be delimited by any
+character, e.g. "2a:45" or "44 4c".  Lower and upper case  letters  are
+both accepted.
+
+Data  is send to a host specified by IP address and port, received data
+can be displayed in different formats.
diff --git a/development/hexnet/hexnet.SlackBuild b/development/hexnet/hexnet.SlackBuild
new file mode 100644
index 0000000000..d7401f7fb5
--- /dev/null
+++ b/development/hexnet/hexnet.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for hexnet
+
+# Copyright (c) 2021, Axel Bergerhoff <the.druid@arcor.de>
+# 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=hexnet
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM'-'$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p $PKG/usr/bin
+gcc $SLCKFLAGS -c cmdline.c hexnet.c hexnetfunctions.c
+gcc $SLCKFLAGS -o $PKG/usr/bin/hexnet cmdline.o hexnet.o hexnetfunctions.o
+
+gzip hexnet.1
+mkdir -p $PKG/usr/man/man1
+cp -a hexnet.1.gz $PKG/usr/man/man1/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/hexnet/hexnet.info b/development/hexnet/hexnet.info
new file mode 100644
index 0000000000..22f85cbffb
--- /dev/null
+++ b/development/hexnet/hexnet.info
@@ -0,0 +1,10 @@
+PRGNAM="hexnet"
+VERSION="1.0.0"
+HOMEPAGE="http://abergerhoff.de/hexnet"
+DOWNLOAD="http://abergerhoff.de/hexnet/hexnet-1.0.0.tar.gz"
+MD5SUM="244781552ad5fd9867fa40a5bb1beabe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Axel Bergerhoff"
+EMAIL="the.druid@arcor.de"
diff --git a/development/hexnet/slack-desc b/development/hexnet/slack-desc
new file mode 100644
index 0000000000..b6af701eb9
--- /dev/null
+++ b/development/hexnet/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+hexnet: hexnet (network terminal)
+hexnet:
+hexnet: Hexnet hexnet is minimalistic network terminal for testing of binary
+hexnet: network IP based communications.
+hexnet: It accepts multiple pairs of characters interpreting each pair as a
+hexnet: hexadecimal number.
+hexnet: Pairs may optionally be delimited by any character.
+hexnet: Data is send to a host specified by IP address and port, received
+hexnet: data can be displayed in different formats.
+hexnet:
+hexnet: Home page: http://abergerhoff.de/hexnet/
diff --git a/development/hhvm/0001-Link-static-libiberty.patch b/development/hhvm/0001-Link-static-libiberty.patch
new file mode 100644
index 0000000000..6ec6406fce
--- /dev/null
+++ b/development/hhvm/0001-Link-static-libiberty.patch
@@ -0,0 +1,25 @@
+From 58528a9e983ae8ba53e4e5c10f0565ac0b12c2b3 Mon Sep 17 00:00:00 2001
+From: Eugen Wissner <belka@caraus.de>
+Date: Sun, 25 Oct 2020 10:18:08 +0100
+Subject: [PATCH] Link static libiberty
+
+---
+ hphp/hhvm/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hphp/hhvm/CMakeLists.txt b/hphp/hhvm/CMakeLists.txt
+index f70bd1f542..ab41ec1e5d 100644
+--- a/hphp/hhvm/CMakeLists.txt
++++ b/hphp/hhvm/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif()
+ 
+ get_object_libraries_objects(additionalObjects ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
+ add_executable(hhvm ${CXX_SOURCES} ${additionalObjects})
+-target_link_libraries(hhvm ${HHVM_LINK_LIBRARIES} ${EZC_LINK_LIBRARIES} ${HRE_LINK_LIBRARIES})
++target_link_libraries(hhvm /usr/lib64/libiberty.a ${HHVM_LINK_LIBRARIES} ${EZC_LINK_LIBRARIES} ${HRE_LINK_LIBRARIES})
+ link_object_libraries(hhvm ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
+ if (GOLD_FOUND AND ENABLE_LD_GOLD)
+   if (CMAKE_CONFIGURATION_TYPES)
+-- 
+2.17.5
+
diff --git a/development/hhvm/README b/development/hhvm/README
index 549f5542b3..2467669770 100644
--- a/development/hhvm/README
+++ b/development/hhvm/README
@@ -45,7 +45,7 @@ See https://docs.hhvm.com/hhvm/advanced-usage/fastCGI.
 
 To start a project you have to configure the type checker as well.
 See the official documentation:
-http://docs.hhvm.com/manual/en/install.hack.bootstrapping.php
+https://docs.hhvm.com/hack/getting-started/getting-started
 
 Basically you create an empty .hhconfig file in the root dir of your
 project:
diff --git a/development/hhvm/hhvm.SlackBuild b/development/hhvm/hhvm.SlackBuild
index d724b34560..0585b2097b 100644
--- a/development/hhvm/hhvm.SlackBuild
+++ b/development/hhvm/hhvm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for HHVM
 
-# Copyright 2015-2018 Eugene Wissner, Dachau, Germany
+# Copyright 2015-2020 Eugene Wissner, Dachau, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hhvm
-VERSION=${VERSION:-4.32.0}
+VERSION=${VERSION:-4.56.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+OPAM_STAMP="6ef290f5"
+CARGO_STAMP="1ecc6299db9ec823"
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -57,6 +60,10 @@ rm -rf $PRGNAM-$VERSION
 tar Jxvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
+mkdir -p hphp/hack/_build/opam hphp/hack/facebook
+tar Jxvf $CWD/hack-switch-$OPAM_STAMP.tar.xz -C hphp/hack/_build/opam
+tar Jxvf $CWD/cargo-home-$CARGO_STAMP.tar.xz -C hphp/hack
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,14 +71,31 @@ 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 {} \;
 
+cp $CWD/opam-full-2.0.3.tar.gz third-party/ocaml/
+install -m 0644 -D $CWD/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz \
+	third-party/rustc/rust-prefix/src/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz
+install -m 0644 -D $CWD/fmt-6.1.2.zip third-party/fmt/fmt-prefix/src/fmt-6.1.2.zip
+install -m 0644 -D $CWD/libzip-1.6.1.tar.gz third-party/libzip/libzipBuild-prefix/src/libzip-1.6.1.tar.gz
+
+cat << EOF > hphp/hack/facebook/fetch_opam2_repo_hack.sh
+#!/bin/sh
+echo $CWD/index-$OPAM_STAMP
+EOF
+chmod 0755 hphp/hack/facebook/fetch_opam2_repo_hack.sh
+
+patch -p1 -i $CWD/0001-Link-static-libiberty.patch
+
 export CMAKE_PREFIX_PATH=`pwd`
 cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lncursesw" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lncursesw -I/usr/kerberos/include" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lncursesw -I/usr/kerberos/include -I/usr/include/libiberty" \
     -DCMAKE_CXX_STANDARD=14 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DENABLE_MCROUTER=true \
+    -DENABLE_MCROUTER=false \
+    -DNON_DISTRIBUTABLE_BUILD=true \
+    -DENABLE_LD_GOLD=true \
+    -DUSE_JEMALLOC=false \
     -DMYSQL_UNIX_SOCK_ADDR=/var/run/mysqld/mysqld.sock \
     -DCMAKE_BUILD_TYPE=Release .
 make
@@ -84,10 +108,11 @@ mkdir -p $PKG/usr/man
 mv hphp/doc/man $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mkdir -p $PKG/etc/{rc.d,hhvm} $PKG/usr/lib64/hhvm/extensions
-install -m 644 $CWD/etc/rc.hhvm $PKG/etc/rc.d/rc.hhvm.new
-install -m 644 $CWD/etc/server.ini $PKG/etc/hhvm/server.ini.new
-install -m 644 $CWD/etc/php.ini $PKG/etc/hhvm/php.ini.new
+install -m 644 -D $CWD/etc/rc.hhvm $PKG/etc/rc.d/rc.hhvm.new
+install -m 644 -D $CWD/etc/server.ini $PKG/etc/hhvm/server.ini.new
+install -m 644 -D $CWD/etc/php.ini $PKG/etc/hhvm/php.ini.new
+
+mkdir -p $PKG/var/log/hhvm $PKG/usr/lib64/hhvm/extensions
 
 # PID
 mkdir -p $PKG/var/run/hhvm
diff --git a/development/hhvm/hhvm.info b/development/hhvm/hhvm.info
index 21167c21c5..7c1f7fc9ff 100644
--- a/development/hhvm/hhvm.info
+++ b/development/hhvm/hhvm.info
@@ -1,10 +1,24 @@
 PRGNAM="hhvm"
-VERSION="4.32.0"
+VERSION="4.56.1"
 HOMEPAGE="https://hhvm.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.dlackware.com/hosted-sources/hhvm/hhvm-4.32.0.tar.xz"
-MD5SUM_x86_64="f41841ae14c4629cec887e453bfcdcef"
-REQUIRES="tbb glog dwarf oniguruma libmemcached krb5 lz4 libsodium"
+DOWNLOAD_x86_64="https://download.dlackware.com/hosted-sources/hhvm/hhvm-4.56.1.tar.xz \
+                 https://static.rust-lang.org/dist/rust-1.43.0-x86_64-unknown-linux-gnu.tar.gz \
+                 https://download.dlackware.com/hosted-sources/hhvm/opam-full-2.0.3.tar.gz \
+                 https://download.dlackware.com/hosted-sources/hhvm/libzip-1.6.1.tar.gz \
+                 https://download.dlackware.com/hosted-sources/hhvm/fmt-6.1.2.zip \
+                 https://download.dlackware.com/hosted-sources/hhvm/cargo-home-1ecc6299db9ec823.tar.xz \
+                 https://download.dlackware.com/hosted-sources/hhvm/index-6ef290f5.tar.gz \
+                 https://download.dlackware.com/hosted-sources/hhvm/hack-switch-6ef290f5.tar.xz"
+MD5SUM_x86_64="edc4cf258e49b2311418f3cc651e6782 \
+               c1cb2b3d0c9edb4b61b01ba6b090d01b \
+               d685758ad289672ee43caa4baa20b849 \
+               43883accb207d977462aed9fed40b30b \
+               5ec643b082a34254ad07136e7cbd4220 \
+               990b311a2863c88e372051291a9f7f02 \
+               1f67209970361d31d2b60812af78b540 \
+               ddff31c5f0baa6b0ebc3b04e67d04306"
+REQUIRES="tbb glog libdwarf oniguruma libmemcached krb5 libsodium"
 MAINTAINER="Eugene Wissner"
 EMAIL="belka@caraus.de"
diff --git a/development/hopper/hopper.SlackBuild b/development/hopper/hopper.SlackBuild
index 65ed21c26e..f903681ea6 100644
--- a/development/hopper/hopper.SlackBuild
+++ b/development/hopper/hopper.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hopper
-VERSION=${VERSION:-4.5.29}
+VERSION=${VERSION:-4.7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/hopper/hopper.info b/development/hopper/hopper.info
index 545ec77e85..3364b501c9 100644
--- a/development/hopper/hopper.info
+++ b/development/hopper/hopper.info
@@ -1,10 +1,10 @@
 PRGNAM="hopper"
-VERSION="4.5.29"
+VERSION="4.7.3"
 HOMEPAGE="https://www.hopperapp.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-4.5.29-Linux.pkg.tar.xz"
-MD5SUM_x86_64="1cd5bb70f99aad55fbca9c57c29f8835"
+DOWNLOAD_x86_64="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-4.7.3-Linux.pkg.tar.xz"
+MD5SUM_x86_64="d54c095f1b3dde88275881d5943b826c"
 REQUIRES="qt5 libbsd"
 MAINTAINER="pyllyukko"
 EMAIL="pyllyukko AT maimed dot org"
diff --git a/development/hugo/hugo.SlackBuild b/development/hugo/hugo.SlackBuild
index 388e30439d..3782959858 100644
--- a/development/hugo/hugo.SlackBuild
+++ b/development/hugo/hugo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for hugo
 
-# Copyright 2020 Andrew Payne
+# Copyright 2020-2021 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2018-2019 Donald Cooley South Haven, IN USA
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hugo
-VERSION=${VERSION:-0.76.5}
+VERSION=${VERSION:-0.82.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/hugo/hugo.info b/development/hugo/hugo.info
index 73ce622d1a..ce0a606a2e 100644
--- a/development/hugo/hugo.info
+++ b/development/hugo/hugo.info
@@ -1,10 +1,10 @@
 PRGNAM="hugo"
-VERSION="0.76.5"
+VERSION="0.82.0"
 HOMEPAGE="https://gohugo.io"
-DOWNLOAD="https://github.com/gohugoio/hugo/releases/download/v0.76.5/hugo_0.76.5_Linux-32bit.tar.gz"
-MD5SUM="2f47aff2fb0010070e5aef4ade01c467"
-DOWNLOAD_x86_64="https://github.com/gohugoio/hugo/releases/download/v0.76.5/hugo_0.76.5_Linux-64bit.tar.gz"
-MD5SUM_x86_64="a80b9e8c831d7bad4374cb979591a44c"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/gohugoio/hugo/releases/download/v0.82.0/hugo_0.82.0_Linux-64bit.tar.gz"
+MD5SUM_x86_64="04c20128b353dc4c329ea0a48cfb20b5"
 REQUIRES=""
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/development/icdiff/README b/development/icdiff/README
new file mode 100644
index 0000000000..4c58cce188
--- /dev/null
+++ b/development/icdiff/README
@@ -0,0 +1,10 @@
+icdiff (improved color diff)
+
+Show differences between files in a colorful two column view. Can be
+used with as a "git diff" replacement, via "git-icdiff" command.
+
+Note: It's highly recommended to use wide terminals with icdiff, for
+instance 160 columns or more.
+
+icdiff is similar in concept to colordiff, but it uses a two column
+"side by side" format.
diff --git a/development/icdiff/fix-pipe-handling-installed.patch b/development/icdiff/fix-pipe-handling-installed.patch
new file mode 100644
index 0000000000..fcc9c84dd9
--- /dev/null
+++ b/development/icdiff/fix-pipe-handling-installed.patch
@@ -0,0 +1,51 @@
+Description: fix closed pipe handling
+Author: Sascha Steinbiss <satta@debian.org>
+Bug: https://github.com/jeffkaufman/icdiff/issues/156
+Forwarded: https://github.com/jeffkaufman/icdiff/pull/165
+Last-Update: 2019-09-25
+--- a/icdiff
++++ b/icdiff
+@@ -594,7 +594,22 @@
+     validate_has_two_arguments(parser, args)
+     if not options.cols:
+         set_cols_option(options)
+-    diff(options, *args)
++    try:
++        diff(options, *args)
++    except KeyboardInterrupt:
++        pass
++    except IOError as e:
++        if e.errno == errno.EPIPE:
++            pass
++        else:
++            raise
++
++    # Close stderr to prevent printing errors when icdiff is piped to
++    # something that closes before icdiff is done writing
++    #
++    # See: https://stackoverflow.com/questions/26692284/...
++    #      ...how-to-prevent-brokenpipeerror-when-doing-a-flush-in-python
++    sys.stderr.close()
+ 
+ 
+ def codec_print(s, options):
+@@ -755,18 +770,4 @@
+ 
+ 
+ if __name__ == "__main__":
+-    try:
+-        start()
+-    except KeyboardInterrupt:
+-        pass
+-    except IOError as e:
+-        if e.errno == errno.EPIPE:
+-            pass
+-        else:
+-            raise
+-    # Close stderr to prevent printing errors when icdiff is piped to
+-    # something that closes before icdiff is done writing
+-    #
+-    # See: https://stackoverflow.com/questions/26692284/
+-    #              how-to-prevent-brokenpipeerror-when-doing-a-flush-in-python
+-    sys.stderr.close()
++    start()
diff --git a/development/icdiff/icdiff.1 b/development/icdiff/icdiff.1
new file mode 100644
index 0000000000..a0d718e92d
--- /dev/null
+++ b/development/icdiff/icdiff.1
@@ -0,0 +1,134 @@
+.\" Man page generated from reStructuredText.
+.
+.TH ICDIFF 1 "2020-11-15" "1.9.5" "SlackBuilds.org"
+.SH NAME
+icdiff \- improved color diff
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for icdiff(1) man page. Convert with:
+.
+.\" rst2man.py icdiff.rst > icdiff.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+icdiff [\fI\-options\fP] left_file right_file
+.sp
+git\-icdiff [\fIgit diff options\fP]
+.SH DESCRIPTION
+.sp
+\fBicdiff\fP show differences between files in a colorful two column view.
+.sp
+\fBgit\-icdiff\fP is a wrapper around \fBgit diff\fP that uses \fBicdiff\fP to show diffs.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-\-version
+show program\(aqs version number and exit
+.TP
+.B \-h\fP,\fB  \-\-help
+show this help message and exit
+.TP
+.BI \-\-cols\fB= COLS
+specify the width of the screen. Autodetection is Unix only
+.TP
+.BI \-\-encoding\fB= ENCODING
+specify the file encoding; defaults to utf8
+.TP
+.BI \-E \ MATCHER\fP,\fB \ \-\-exclude\-lines\fB= MATCHER
+Do not diff lines that match this regex. Not compatible with the \(aqline\-numbers\(aq option
+.TP
+.BI \-\-head\fB= HEAD
+consider only the first N lines of each file
+.TP
+.B \-H\fP,\fB  \-\-highlight
+color by changing the background color instead of the foreground color.  Very fast, ugly, displays all changes
+.TP
+.BI \-L \ LABELS\fP,\fB \ \-\-label\fB= LABELS
+override file labels with arbitrary tags. Use twice, one for each file
+.TP
+.B \-N\fP,\fB  \-\-line\-numbers
+generate output with line numbers. Not compatible with the \(aqexclude\-lines\(aq option.
+.TP
+.B \-\-no\-bold
+use non\-bold colors; recommended for solarized
+.TP
+.B \-\-no\-headers
+don\(aqt label the left and right sides with their file names
+.TP
+.BI \-\-output\-encoding\fB= OUTPUT_ENCODING
+specify the output encoding; defaults to utf8
+.TP
+.B \-r\fP,\fB  \-\-recursive
+recursively compare subdirectories
+.TP
+.B \-\-show\-all\-spaces
+color all non\-matching whitespace including that which is not needed for drawing the eye to changes.  Slow, ugly, displays all changes
+.TP
+.BI \-\-tabsize\fB= TABSIZE
+tab stop spacing
+.TP
+.B \-u\fP,\fB  \-\-patch
+generate patch. This is always true, and only exists for compatibility
+.TP
+.BI \-U \ NUM\fP,\fB \ \-\-unified\fB= NUM\fP,\fB \ \-\-numlines\fB= NUM
+how many lines of context to print; can\(aqt be combined with \-\-whole\-file
+.TP
+.B \-W\fP,\fB  \-\-whole\-file
+show the whole file instead of just changed lines and context
+.TP
+.B \-\-strip\-trailing\-cr
+strip any trailing carriage return at the end of an input line
+.TP
+.BI \-\-color\-map\fB= COLOR_MAP
+choose which colors are used for which items. Default is \-\-color\-map=\(aqadd:green_bold,change:yellow_bold,description:blue,meta:magenta,separator:blue,subtract:red_bold\(aq.  You don\(aqt have to override all of them: \(aq\-\-color\-map=separator:white,description:cyan\(aq
+.UNINDENT
+.SH NOTE
+.sp
+It\(aqs highly recommended to use wide terminals with \fBicdiff\fP, for
+instance 160 columns or more.
+.SH EXAMPLES
+.sp
+See the file /usr/doc/icdiff\-1.9.5/README.md for examples.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/icdiff\-1.9.5/LICENSE for license information.
+.SH AUTHORS
+.sp
+icdiff was written by Jeff Kaufman.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+diff(1), colordiff(1), git\-difftool(1)
+.sp
+The icdiff homepage: \fI\%https://www.jefftk.com/icdiff\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/development/icdiff/icdiff.SlackBuild b/development/icdiff/icdiff.SlackBuild
new file mode 100644
index 0000000000..2be5b2cc21
--- /dev/null
+++ b/development/icdiff/icdiff.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for icdiff
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=icdiff
+VERSION=${VERSION:-1.9.5}
+SRCVER=release-$VERSION
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# patch from upstream git by way of Debian: Close stderr to prevent
+# printing errors when icdiff is piped to something that closes before
+# icdiff is done writing.
+patch -p1 < $CWD/fix-pipe-handling-installed.patch
+
+# 20201115 bkw: at some point, Slackware's /usr/bin/python will be python3.
+# This stuff can go away then.
+case "${PYVER:-auto}" in
+  2|3)  ;; # use as-is
+  auto) PYVER=2; python3 -c 'import sys' 2>/dev/null && PYVER=3 ;;
+esac
+
+python$PYVER setup.py install --root=$PKG
+
+# man page made from README.md by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/git-$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/icdiff/icdiff.info b/development/icdiff/icdiff.info
new file mode 100644
index 0000000000..39d246098e
--- /dev/null
+++ b/development/icdiff/icdiff.info
@@ -0,0 +1,10 @@
+PRGNAM="icdiff"
+VERSION="1.9.5"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+DOWNLOAD="https://github.com/jeffkaufman/icdiff/archive/release-1.9.5/icdiff-release-1.9.5.tar.gz"
+MD5SUM="c896202f930336dfa461a0295019f887"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/icdiff/icdiff.rst b/development/icdiff/icdiff.rst
new file mode 100644
index 0000000000..d6b9cdca42
--- /dev/null
+++ b/development/icdiff/icdiff.rst
@@ -0,0 +1,93 @@
+.. RST source for icdiff(1) man page. Convert with:
+..   rst2man.py icdiff.rst > icdiff.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.9.5
+.. |date| date::
+
+======
+icdiff
+======
+
+-------------------
+improved color diff
+-------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+icdiff [*-options*] left_file right_file
+
+git-icdiff [*git diff options*]
+
+DESCRIPTION
+===========
+
+**icdiff** show differences between files in a colorful two column view.
+
+**git-icdiff** is a wrapper around **git diff** that uses **icdiff** to show diffs.
+
+OPTIONS
+=======
+
+--version             show program's version number and exit
+-h, --help            show this help message and exit
+--cols=COLS           specify the width of the screen. Autodetection is Unix only
+--encoding=ENCODING   specify the file encoding; defaults to utf8
+-E MATCHER, --exclude-lines=MATCHER
+                      Do not diff lines that match this regex. Not compatible with the 'line-numbers' option
+--head=HEAD           consider only the first N lines of each file
+-H, --highlight       color by changing the background color instead of the foreground color.  Very fast, ugly, displays all changes
+-L LABELS, --label=LABELS
+                      override file labels with arbitrary tags. Use twice, one for each file
+-N, --line-numbers    generate output with line numbers. Not compatible with the 'exclude-lines' option.
+--no-bold             use non-bold colors; recommended for solarized
+--no-headers          don't label the left and right sides with their file names
+--output-encoding=OUTPUT_ENCODING
+                      specify the output encoding; defaults to utf8
+-r, --recursive       recursively compare subdirectories
+--show-all-spaces     color all non-matching whitespace including that which is not needed for drawing the eye to changes.  Slow, ugly, displays all changes
+--tabsize=TABSIZE     tab stop spacing
+-u, --patch           generate patch. This is always true, and only exists for compatibility
+-U NUM, --unified=NUM, --numlines=NUM
+                      how many lines of context to print; can't be combined with --whole-file
+-W, --whole-file      show the whole file instead of just changed lines and context
+--strip-trailing-cr   strip any trailing carriage return at the end of an input line
+--color-map=COLOR_MAP
+                      choose which colors are used for which items. Default is --color-map='add:green_bold,change:yellow_bold,description:blue,meta:magenta,separator:blue,subtract:red_bold'.  You don't have to override all of them: '--color-map=separator:white,description:cyan'
+
+NOTE
+====
+
+It's highly recommended to use wide terminals with **icdiff**, for
+instance 160 columns or more.
+
+EXAMPLES
+========
+
+See the file /usr/doc/icdiff-|version|/README.md for examples.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/icdiff-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+icdiff was written by Jeff Kaufman.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+diff(1), colordiff(1), git-difftool(1)
+
+The icdiff homepage: https://www.jefftk.com/icdiff
diff --git a/network/weboob/slack-desc b/development/icdiff/slack-desc
index 2985003e0f..30f23d20c0 100644
--- a/network/weboob/slack-desc
+++ b/development/icdiff/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-weboob: weboob (applications to interact with websites)
-weboob:
-weboob: weboob (Web Out Of Browsers) provides several applications to
-weboob: interact with a lot of websites.
-weboob:
-weboob: Homepage: http://symlink.me/projects/weboob
-weboob:
-weboob:
-weboob:
-weboob:
-weboob:
+icdiff: icdiff (improved color diff)
+icdiff:
+icdiff: Show differences between files in a colorful two column view. Can be
+icdiff: used with as a "git diff" replacement, via "git-icdiff" command.
+icdiff:
+icdiff:
+icdiff:
+icdiff:
+icdiff:
+icdiff:
+icdiff:
diff --git a/development/icon/icon.SlackBuild b/development/icon/icon.SlackBuild
index c444ae2fbe..6867d68aa9 100644
--- a/development/icon/icon.SlackBuild
+++ b/development/icon/icon.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icon
 
-# Copyright 2010-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2010-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icon
-VERSION=${VERSION:-9.5.1}
-SRCVER=v$(echo $VERSION | tr -d .)src
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-9.5.20i}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,19 +67,19 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tgz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# Cherry-picked bugfix and ftbfs patches from upstream
-# https://github.com/gtownsend/icon
-patch -p1 < $CWD/patches/display.patch
-patch -p1 < $CWD/patches/maxtype.patch
-patch -p1 < $CWD/patches/lexer.patch
-patch -p1 < $CWD/patches/implicit-defs.patch
-patch -p1 < $CWD/patches/glibc.patch
+# Use the system XPM.  https://github.com/gtownsend/icon/pull/2
+sed -i -e 's|"../xpm/xpm.h"|<X11/xpm.h>|' src/common/xwindow.c src/h/sys.h
+# Neuter the $XL variable, replace with $XLIBS which includes -lXpm.
+# Set $XLIBS to empty if building without graphics (make Configure).
+sed -i -e 's|-lX11|-lXpm -lX11|' config/linux/Makedefs
+sed -i -e 's|XL=.*|XL= ;;|' config/setup.sh
+sed -i -e 's|XL|XLIBS|' src/runtime/Makefile
 
 # Installation creates bin, lib, man, and doc dirs inside the "dest" dir.
 # Edit the Install rule to avoid having to manually rearrange files.
@@ -112,7 +111,7 @@ find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} +
 
 mv $PKG/README $PKG/usr/doc/$PRGNAM-$VERSION
-rm $PKG/usr/doc/$PRGNAM-$VERSION/clnroff.sed
+rm $PKG/usr/doc/$PRGNAM-$VERSION/*.sed
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/icon/icon.info b/development/icon/icon.info
index 0df2ab5bd9..828871c284 100644
--- a/development/icon/icon.info
+++ b/development/icon/icon.info
@@ -1,8 +1,8 @@
 PRGNAM="icon"
-VERSION="9.5.1"
+VERSION="9.5.20i"
 HOMEPAGE="https://www2.cs.arizona.edu/icon/"
-DOWNLOAD="https://www2.cs.arizona.edu/icon/ftp/packages/unix/icon-v951src.tgz"
-MD5SUM="8fdeb7c5408d9d9bf06bc5e7f4f54498"
+DOWNLOAD="https://github.com/gtownsend/icon/archive/v9.5.20i/icon-9.5.20i.tar.gz"
+MD5SUM="2c8803b42ae0512981855e9147738efd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/icon/patches/display.patch b/development/icon/patches/display.patch
deleted file mode 100644
index 05eab35d2c..0000000000
--- a/development/icon/patches/display.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit d0cd013653360f6f11e3b5dbdbbf3788a5c08b02
-Author: Gregg Townsend <gmt@cs.arizona.edu>
-Date:   Thu Dec 4 15:37:39 2014 -0700
-
-    Handle $DISPLAY longer than 63 characters.
-    First seen as a problem on Macintosh OS X 10.10 ("Yosemite").
-    Side effects revealed other bugs in cross-display CopyArea and
-    gamma correction.
-
-diff --git a/src/h/graphics.h b/src/h/graphics.h
---- a/src/h/graphics.h
-+++ b/src/h/graphics.h
-@@ -201,7 +201,7 @@
- typedef struct _wdisplay {
-    int		refcount;
-    int		serial;			/* serial # */
--   char		name[MAXDISPLAYNAME];
-+   char		*name;
-    Display *	display;
-    Visual *	visual;
-    GC		icongc;
-diff --git a/src/h/xwin.h b/src/h/xwin.h
---- a/src/h/xwin.h
-+++ b/src/h/xwin.h
-@@ -73,7 +73,6 @@
-  */
- #define WMAXCOLORS	256
- #define MAXCOLORNAME	40
--#define MAXDISPLAYNAME	64
- #define CSHARED         0
- #define CMUTABLE        1
- #define NUMCURSORSYMS	78
-diff --git a/src/runtime/rxrsc.ri b/src/runtime/rxrsc.ri
---- a/src/runtime/rxrsc.ri
-+++ b/src/runtime/rxrsc.ri
-@@ -376,7 +376,7 @@
- 
-    GRFX_ALLOC(wd, _wdisplay);
- 
--   strcpy(wd->name,s);
-+   wd->name = salloc(s);
-    wd->display = XOpenDisplay((*s=='\0') ? NULL : s);
- 
-    if (wd->display == NULL) {
diff --git a/development/icon/patches/glibc.patch b/development/icon/patches/glibc.patch
deleted file mode 100644
index b0629d0cc8..0000000000
--- a/development/icon/patches/glibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit bfc4a6004d0d3984c8066289b8d8e563640c4ddd
-Author: Gregg Townsend <gmt@cs.arizona.edu>
-Date:   Mon Oct 29 10:07:31 2018 -0700
-
-    Adapt to change in GLIBC v2.28 internals (thx Cheyenne Wills).
-
-diff --git a/ipl/cfuncs/fpoll.c b/ipl/cfuncs/fpoll.c
---- a/ipl/cfuncs/fpoll.c
-+++ b/ipl/cfuncs/fpoll.c
-@@ -60,12 +64,9 @@
- 
-    /* check for data already in buffer */
-    /* there's no legal way to do this in C; we cheat */
--#if defined(__GLIBC__) && defined(_STDIO_USES_IOSTREAM)	/* new GCC library */
-+#if defined(__GLIBC__) 					/* new GCC library */
-    if (f->_IO_read_ptr < f->_IO_read_end)
-       RetArg(1);
--#elif defined(__GLIBC__)				/* old GCC library */
--   if (f->__bufp < f->__get_limit)
--      RetArg(1);
- #elif defined(_FSTDIO)					/* new BSD library */
-    if (f->_r > 0)
-       RetArg(1);
diff --git a/development/icon/patches/implicit-defs.patch b/development/icon/patches/implicit-defs.patch
deleted file mode 100644
index 9e015c7ad7..0000000000
--- a/development/icon/patches/implicit-defs.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-commit 8cb4887b886ad0c9caf0be595e236d2a74a41a8d
-Author: Gregg Townsend <gmt@cs.arizona.edu>
-Date:   Mon Aug 28 09:10:00 2017 -0700
-
-    Fix compilation warnings in xpm code (thx Sean Jensen).
-
-diff --git a/src/xpm/create.c b/src/xpm/create.c
---- a/src/xpm/create.c
-+++ b/src/xpm/create.c
-@@ -344,6 +344,7 @@
- 
- #endif
- 
-+int
- xpmCreateImage(display, attrib, image_return, shapeimage_return, attributes)
-     Display *display;
-     xpmInternAttrib *attrib;
-diff --git a/src/xpm/data.c b/src/xpm/data.c
---- a/src/xpm/data.c
-+++ b/src/xpm/data.c
-@@ -110,6 +110,7 @@
- /*
-  * skip to the end of the current string and the beginning of the next one
-  */
-+void
- xpmNextString(mdata)
-     xpmData *mdata;
- {
-@@ -277,6 +278,7 @@
- /*
-  * get the current comment line
-  */
-+void
- xpmGetCmt(mdata, cmt)
-     xpmData *mdata;
-     char **cmt;
-@@ -403,6 +405,7 @@
- /*
-  * close the file related to the xpmData if any
-  */
-+void
- XpmDataClose(mdata)
-     xpmData *mdata;
- {
-diff --git a/src/xpm/misc.c b/src/xpm/misc.c
---- a/src/xpm/misc.c
-+++ b/src/xpm/misc.c
-@@ -14,6 +14,7 @@
-  * Free the computed color table
-  */
- 
-+void
- xpmFreeColorTable(colorTable, ncolors)
-     char ***colorTable;
-     int ncolors;
-@@ -39,6 +40,7 @@
-  * which ones must be freed later on.
-  */
- 
-+void
- xpmInitInternAttrib(attrib)
-     xpmInternAttrib *attrib;
- {
-@@ -55,6 +57,7 @@
-  * Free the xpmInternAttrib pointers which have been allocated
-  */
- 
-+void
- xpmFreeInternAttrib(attrib)
-     xpmInternAttrib *attrib;
- {
-@@ -80,6 +83,7 @@
- /*
-  * Free array of extensions
-  */
-+void
- XpmFreeExtensions(extensions, nextensions)
-     XpmExtension *extensions;
-     int          nextensions;
-@@ -108,6 +112,7 @@
-  * Return the XpmAttributes structure size
-  */
- 
-+int
- XpmAttributesSize()
- {
-     return sizeof(XpmAttributes);
-@@ -119,6 +124,7 @@
-  * but the structure itself
-  */
- 
-+void
- XpmFreeAttributes(attributes)
-     XpmAttributes *attributes;
- {
-@@ -167,6 +173,7 @@
-  * the xpmInternAttrib structure.
-  */
- 
-+void
- xpmSetAttributes(attrib, attributes)
-     xpmInternAttrib *attrib;
-     XpmAttributes *attributes;
-diff --git a/src/xpm/xpm.h b/src/xpm/xpm.h
---- a/src/xpm/xpm.h
-+++ b/src/xpm/xpm.h
-@@ -191,8 +191,8 @@
- 				      XpmAttributes * attributes));
- 
-     FUNC(XpmAttributesSize, int, ());
--    FUNC(XpmFreeAttributes, int, (XpmAttributes * attributes));
--    FUNC(XpmFreeExtensions, int, (XpmExtension * extensions, int nextensions));
-+    FUNC(XpmFreeAttributes, void, (XpmAttributes * attributes));
-+    FUNC(XpmFreeExtensions, void, (XpmExtension * extensions, int nextensions));
- 
- #ifdef __cplusplus
- }					/* for C++ V2.0 */
-diff --git a/src/xpm/xpmP.h b/src/xpm/xpmP.h
---- a/src/xpm/xpmP.h
-+++ b/src/xpm/xpmP.h
-@@ -159,13 +159,13 @@
- 			 XpmAttributes * attributes,
- 			 xpmInternAttrib * attrib));
- 
--FUNC(xpmFreeColorTable, int, (char ***colorTable, int ncolors));
-+FUNC(xpmFreeColorTable, void, (char ***colorTable, int ncolors));
- 
--FUNC(xpmInitInternAttrib, int, (xpmInternAttrib * xmpdata));
-+FUNC(xpmInitInternAttrib, void, (xpmInternAttrib * xmpdata));
- 
--FUNC(xpmFreeInternAttrib, int, (xpmInternAttrib * xmpdata));
-+FUNC(xpmFreeInternAttrib, void, (xpmInternAttrib * xmpdata));
- 
--FUNC(xpmSetAttributes, int, (xpmInternAttrib * attrib,
-+FUNC(xpmSetAttributes, void, (xpmInternAttrib * attrib,
- 			     XpmAttributes * attributes));
- 
- FUNC(xpmGetAttributes, int, (XpmAttributes * attributes,
-@@ -173,18 +173,20 @@
- 
- /* I/O utility */
- 
--FUNC(xpmNextString, int, (xpmData * mdata));
-+FUNC(atoui, unsigned int, (char *p, unsigned int l, unsigned int *ui_return));
-+FUNC(xpmGetString, int, (xpmData *mdata, char **sptr, unsigned int *l));
-+FUNC(xpmNextString, void, (xpmData * mdata));
- FUNC(xpmNextUI, int, (xpmData * mdata, unsigned int *ui_return));
- 
- #define xpmGetC(mdata) \
- 	(mdata->type ? (getc(mdata->stream.file)) : (*mdata->cptr++))
- 
- FUNC(xpmNextWord, unsigned int, (xpmData * mdata, char *buf));
--FUNC(xpmGetCmt, int, (xpmData * mdata, char **cmt));
-+FUNC(xpmGetCmt, void, (xpmData * mdata, char **cmt));
- FUNC(xpmReadFile, int, (char *filename, xpmData * mdata));
- FUNC(xpmWriteFile, int, (char *filename, xpmData * mdata));
- FUNC(xpmOpenArray, void, (char **data, xpmData * mdata));
--FUNC(XpmDataClose, int, (xpmData * mdata));
-+FUNC(XpmDataClose, void, (xpmData * mdata));
- 
- /* RGB utility */
- 
diff --git a/development/icon/patches/lexer.patch b/development/icon/patches/lexer.patch
deleted file mode 100644
index 290ed67364..0000000000
--- a/development/icon/patches/lexer.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit bb7c6b5232d8cf0ad98e5ab8e8e3afd3a249751f
-Author: Gregg Townsend <gmt@cs.arizona.edu>
-Date:   Mon Aug 28 08:08:32 2017 -0700
-
-    Fix ancient potential lexer bug (thx Sean Jensen).
-
-diff --git a/src/common/yylex.h b/src/common/yylex.h
---- a/src/common/yylex.h
-+++ b/src/common/yylex.h
-@@ -263,7 +263,7 @@
-    {
-    register char *s1;
-    s1 = lex_sbuf.strtimage;
--   while (s != '\0' && s1 < lex_sbuf.endimage && *s == *s1) {
-+   while (*s != '\0' && s1 < lex_sbuf.endimage && *s == *s1) {
-       ++s;
-       ++s1;
-       }
diff --git a/development/icon/patches/maxtype.patch b/development/icon/patches/maxtype.patch
deleted file mode 100644
index 4e4651cc96..0000000000
--- a/development/icon/patches/maxtype.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit e91f59f3affe69043586cb171ad1f8027e31d930
-Author: Gregg Townsend <gmt@cs.arizona.edu>
-Date:   Sat Mar 11 08:41:26 2017 -0700
-
-    Fix innocuous MaxType definition bug (thx Don Ward).
-
-diff --git a/src/h/rmacros.h b/src/h/rmacros.h
---- a/src/h/rmacros.h
-+++ b/src/h/rmacros.h
-@@ -301,7 +301,7 @@
- #define T_Kywdstr	24	/* string keyword */
- #define T_Kywdevent	25	/* keyword &eventsource, etc. */
- 
--#define MaxType		26	/* maximum type number */
-+#define MaxType		25	/* maximum type number */
- 
- /*
-  * Definitions for keywords.
diff --git a/development/inform/README b/development/inform/README
index 269cb5a5ac..8eaa8177c2 100644
--- a/development/inform/README
+++ b/development/inform/README
@@ -13,11 +13,11 @@ This is a command-line compiler for the Inform 6 language. For a
 graphical Inform 7 compiler, see gnome-inform7. Inform 6 and 7 are
 completely different languages, so it's not redundant to install both.
 
-To get started writing interactive fiction with Inform, everything you
-need is installed in /usr/doc/inform-$VERSION:
+To get started writing interactive fiction with Inform, all the
+documentation you need is installed in /usr/doc/inform-$VERSION:
 
-inform_beginners_guide.pdf - Read this first.
-manual/index.html - The Designer's Manual. Everything you need to know.
+inform_beginners_guide.pdf - aka IBG. Read this first.
+manual/index.html - Inform Designer's Manual, aka DM4.
 tutor/*.inf - Tutorials in Inform source code format.
 demos/*.inf - Source to sample games.
 
diff --git a/development/inform/inform.SlackBuild b/development/inform/inform.SlackBuild
index 7879eddc00..912dc6da68 100644
--- a/development/inform/inform.SlackBuild
+++ b/development/inform/inform.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201104 bkw: updated for 6.34_6.12.4. In case anyone's wondering
+# why I use a self-hosted URL for the source, it's because upstream
+# moves the old source immediately when a new release is made. Also
+# moved the binary to /usr/games and the man page to section 6.
+
 # 20191216 bkw: updated for 6.34_6.12.2. The secondary version number
 # is the inform6 library version. This script can no longer build the
 # old 6.32.1 version, but it should be fine for future releases.
@@ -17,7 +22,7 @@
 # demand, I'll dig up the old includes and re-add them to the package.
 
 PRGNAM=inform
-VERSION=${VERSION:-6.34_6.12.2}
+VERSION=${VERSION:-6.34_6.12.4_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,8 +57,9 @@ set -e
 
 MANVER="${MANVER:-4}"
 MANUAL=designers_manual_${MANVER}.zip
-TARVER="${VERSION/_/-}"
-DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+TARVER="${VERSION//_/-}"
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOCDIR
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -65,37 +71,74 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Upstream got rid of autotools, which I consider a step in the right
-# direction... but they also got rid of DESTDIR support.
+# 20201104 bkw: Since inform is for game purposes, install the binary
+# to /usr/games, and its man page to section 6.
+sed '1s/"1"/"6"/' $PRGNAM.1 > $PRGNAM.6
 
-make OPTS="$SLKCFLAGS" \
-     PREFIX=/usr \
+# 20201105 bkw: Minor fixes to Makefile so parallel builds work.
+patch -p1 < $CWD/parallel_make.diff
 
+# 20201104 bkw: Don't write to real $PREFIX! Just disable the CASETEST
+# stuff, since we're including our own set of symlinks.
+sed -i '/touch.*PREFIX/,+2d' Makefile
+
+# 20201104 bkw: upstream now supports DESTDIR again.
 make install-strip \
-     PREFIX=$PKG/usr \
+     OPTS="$SLKCFLAGS" \
+     BINDIR=/usr/games \
+     MANDIR=/usr/man/man6 \
+     MANPAGE=$PRGNAM.6 \
+     PREFIX=/usr \
      TUTORDIR=$DOCDIR/tutor \
-     DEMODIR=$DOCDIR/demos
+     DEMODIR=$DOCDIR/demos \
+     DESTDIR=$PKG
+
+gzip $PKG/usr/man/man?/*.?
+
+# 20201104 bkw: the binary got moved, be kind and provide a symlink
+mkdir -p $PKG/usr/bin
+ln -s ../games/$PRGNAM $PKG/usr/bin/$PRGNAM
+
+# Inform started life (and is still used primarily) on OSes
+# with case-insensitive filenames, meaning that a lot of inform
+# source refers to e.g. VerbLib or even VERBLIB (with or without
+# the .h at the end, which could also be capitalized as .H). The
+# Makefile can create a few symlinks to support this, but let's
+# be more all-inclusive. We got 8 .h files, and end up with 70+
+# symlinks. There's no kill like overkill!
+( cd $PKG/usr/share/$PRGNAM/lib
+  for file in *.h; do
+    name=${file%%.*}
+    #           Name.h     NAME.h
+    for link in ${name^}.h ${name^^}.h; do
+      ln -s $file $link
+    done
+  done
 
-gzip $PKG/usr/man/man1/*.1
+  # MixedCase isn't standardized, these are guesses. Some are pretty
+  # unlikely, but they don't cost much. Better to have and not need,
+  # than to need and not have.
+  for link in VerbLib VerbLIB verbLib verbLIB \
+              InFix InFIX inFix inFIX \
+              InfGlk InfGLK infGlk infGLK \
+              LinkLpa LinkLPA linkLpa linkLPA
+  do
+    ln -s ${link,,}.h $link.h
+  done
 
-# Inform started life (and is still used primarily) on OSes with
-# case-insensitive filenames. The library include files are
-# duplicated here, with e.g. 3 identical files called verblib.h,
-# Verblib.h, VerbLib.h. Clean up the mess.
-( cd $PKG/usr/share/$PRGNAM/lib
-  for upper in [A-Z]*.h; do
-    lower="$( echo $upper | tr A-Z a-z )"
-    if [ -e "$lower" ]; then
-      rm -f "$upper"
-      ln -s "$lower" "$upper"
-    fi
+  # Any of the above might appear with .H. Use readlink so all the
+  # variant names link to the real file (no symlinks to symlinks).
+  # This might be overcautious: the example code all just says
+  # e.g. 'Include "Parser"', without the .h.
+  for file in *.h; do
+    ln -s $( readlink $file ) ${file%%.*}.H
   done
 )
 
 # Upstream removed the manual for licensing reasons. It belongs in the
 # binary package IMO.
-mkdir -p $DOCDIR/manual
-( cd $DOCDIR/manual
+mkdir -p $PKGDOC/manual
+( cd $PKGDOC/manual
   unzip $CWD/$MANUAL
   # manual has no subdirs
   chmod 644 *
@@ -103,17 +146,17 @@ mkdir -p $DOCDIR/manual
 )
 
 # Inform Beginners' Guide, required reading.
-cat $CWD/IBG.pdf > $DOCDIR/inform_beginners_guide.pdf
+cat $CWD/IBG.pdf > $PKGDOC/inform_beginners_guide.pdf
 
-mkdir -p $DOCDIR/lib
+mkdir -p $PKGDOC/lib
 for i in ChangeLog README.txt voices_and_tenses.txt; do
-  ln -s ../../../share/$PRGNAM/lib/$i $DOCDIR/lib
+  ln -s ../../../share/$PRGNAM/lib/$i $PKGDOC/lib
 done
 
 # ARTISTIC and COPYING are redundant: src/licence.txt includes the
 # full text of both.
-cp -a AUTHORS NEWS README* src/*.txt src/*.html docs/* $DOCDIR
-cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
+cp -a AUTHORS NEWS README* src/*.txt src/*.html docs/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/inform/inform.info b/development/inform/inform.info
index ec5a3905b7..b4130e35fc 100644
--- a/development/inform/inform.info
+++ b/development/inform/inform.info
@@ -1,10 +1,10 @@
 PRGNAM="inform"
-VERSION="6.34_6.12.2"
+VERSION="6.34_6.12.4_1"
 HOMEPAGE="http://www.inform-fiction.org/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/inform-6.34-6.12.2.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/inform-6.34-6.12.4-1.tar.gz \
           http://www.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/designers_manual_4.zip \
           http://www.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/IBG.pdf"
-MD5SUM="c5ef293adb9d245975ca5aa3af2bdef8 \
+MD5SUM="b128a7aff7ed2b1086d020febae20746 \
         0063968c3378636add1a0697b6d1fc16 \
         b2635d3d61313bed286409500fc55bed"
 DOWNLOAD_x86_64=""
diff --git a/development/inform/parallel_make.diff b/development/inform/parallel_make.diff
new file mode 100644
index 0000000000..f2c13267ce
--- /dev/null
+++ b/development/inform/parallel_make.diff
@@ -0,0 +1,20 @@
+diff -Naur inform-6.34-6.12.4-1/Makefile inform-6.34-6.12.4-1.patched/Makefile
+--- inform-6.34-6.12.4-1/Makefile	2020-08-02 20:37:10.000000000 -0400
++++ inform-6.34-6.12.4-1.patched/Makefile	2020-11-05 00:32:19.772575474 -0500
+@@ -67,7 +67,7 @@
+ 	$(CC) -o $(BINNAME) $(OBJECTS)
+ 	@echo "** Done building compiler."
+ 
+-%.z5: %.inf
++%.z5: %.inf $(BINNAME)
+ 	$(PWD)/$(BINNAME) +lib $< $@
+ 
+ demos:	$(BINNAME) $(DEMO_Z5)
+@@ -115,6 +115,7 @@
+ 	install -c -m 644 $(wildcard ${TUTOR}/*) $(DESTDIR)$(TUTORDIR)
+ 
+ install-contrib:
++	install -d -m 755 $(DESTDIR)$(BINDIR)
+ 	install -c -m 755 contrib/pblorb.pl $(DESTDIR)$(BINDIR)
+ 	install -c -m 755 contrib/scanblorb.pl $(DESTDIR)$(BINDIR)
+ 	cd $(DESTDIR)$(BINDIR) ; ln -s pblorb.pl pblorb
diff --git a/development/jdk15/jdk15.SlackBuild b/development/jdk15/jdk15.SlackBuild
index 9e13943b24..a0ad846bce 100644
--- a/development/jdk15/jdk15.SlackBuild
+++ b/development/jdk15/jdk15.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jdk15
 
-# Copyright 2019, 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
+# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jdk15
-VERSION=${VERSION:-15}
+VERSION=${VERSION:-15.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jdk15/jdk15.info b/development/jdk15/jdk15.info
index 770caa0ff9..f3c330c0bd 100644
--- a/development/jdk15/jdk15.info
+++ b/development/jdk15/jdk15.info
@@ -1,10 +1,10 @@
 PRGNAM="jdk15"
-VERSION="15"
+VERSION="15.0.2"
 HOMEPAGE="https://www.oracle.com/technetwork/java/javase/downloads/index.html"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.oracle.com/otn-pub/java/jdk/15+36/779bf45e88a44cbd9ea6621d33e33db1/jdk-15_linux-x64_bin.tar.gz"
-MD5SUM_x86_64="10a6bba79c5841da2be8643eb9496683"
+DOWNLOAD_x86_64="https://download.oracle.com/otn-pub/java/jdk/15.0.2%2B7/0d1cfde4252546c6931946de8db48ee2/jdk-15.0.2_linux-x64_bin.tar.gz"
+MD5SUM_x86_64="8c870cf74262d1a2778706995010b563"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
 EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jdk16/README b/development/jdk16/README
new file mode 100644
index 0000000000..b22f907cec
--- /dev/null
+++ b/development/jdk16/README
@@ -0,0 +1,21 @@
+jdk16 (Java Platform Standard Edition Development Kit)
+
+The Java Platform Standard Edition Development Kit (JDK) includes
+both the runtime environment (Java virtual machine,
+the Java platform classes and supporting files) and development tools
+(compilers, debuggers, tool libraries and other tools).
+The JDK is a development environment for building applications,
+applets and components that can be deployed with the
+Java Platform Standard Edition Runtime Environment.
+
+More details:
+https://developer.oracle.com/java/
+
+This SlackBuild will repackage official Oracle JDK archive.
+You must accept the Oracle Technology Network License Agreement
+for Oracle Java SE to download this software
+
+https://www.oracle.com/java/technologies/javase-jdk16-downloads.html
+
+After installation you will need to log out from the system and log in back
+for environment variables get updated.
diff --git a/development/jdk16/jdk16.SlackBuild b/development/jdk16/jdk16.SlackBuild
new file mode 100644
index 0000000000..4003df7cd8
--- /dev/null
+++ b/development/jdk16/jdk16.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for jdk16
+
+# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.com>
+# 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=jdk16
+VERSION=${VERSION:-16.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$(uname -m) ;;
+  esac
+fi
+
+set -eu
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported for $PRGNAM-$VERSION"
+  exit 1
+fi
+LIBDIRSUFFIX=64
+
+rm -rf $PKG
+mkdir -p $TMP $OUTPUT \
+         $PKG/{install,etc/profile.d,usr/{bin,lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION,man/man1}}
+
+cd $PKG/usr/lib${LIBDIRSUFFIX}
+tar -xvf $CWD/jdk-${VERSION%%.*}_linux*.tar.gz
+mv $(tar -tf $CWD/jdk-${VERSION%%.*}_linux*.tar.gz | head -1 | cut -d/ -f1) $PRGNAM-$VERSION
+
+chown -R root:root $PRGNAM-$VERSION
+find -L $PRGNAM-$VERSION \
+  \( -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 {} \;
+
+find $PRGNAM-$VERSION -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PRGNAM-$VERSION/man -type f -exec gzip -9q {} \; 2> /dev/null || true
+for i in $(find $PRGNAM-$VERSION/man -type l 2> /dev/null); do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+(cd ../man/man1; find ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/man/man1 -type f -exec ln -s {} \;)
+
+(cd ../bin; find ../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/bin -type f -exec ln -s {} \;)
+
+ln -sf $PRGNAM-$VERSION/lib/libjawt.so
+ln -sf $PRGNAM-$VERSION/lib/server/libjvm.so
+ln -sf $PRGNAM-$VERSION/lib/libjava.so
+ln -sf $PRGNAM-$VERSION/lib/libawt.so
+ln -sf $PRGNAM-$VERSION/lib/libawt_xawt.so
+ln -sf $PRGNAM-$VERSION/lib/libjli.so
+
+cd ../doc/$PRGNAM-$VERSION
+ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/legal
+ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/release
+cat $CWD/$PRGNAM.SlackBuild > $PRGNAM.SlackBuild
+
+cd $PKG
+cat > etc/profile.d/$PRGNAM.sh << EOF
+#!/bin/sh
+export JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION
+EOF
+
+cat > etc/profile.d/$PRGNAM.csh << EOF
+#!/bin/csh
+setenv JAVA_HOME /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION
+EOF
+
+chmod 755 etc/profile.d/*
+cat $CWD/slack-desc > install/slack-desc
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/jdk16/jdk16.info b/development/jdk16/jdk16.info
new file mode 100644
index 0000000000..c2ce3af7fb
--- /dev/null
+++ b/development/jdk16/jdk16.info
@@ -0,0 +1,10 @@
+PRGNAM="jdk16"
+VERSION="16.0.0"
+HOMEPAGE="https://www.oracle.com/technetwork/java/javase/downloads/index.html"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.oracle.com/otn-pub/java/jdk/16+36/7863447f0ab643c585b9bdebf67c69db/jdk-16_linux-x64_bin.tar.gz"
+MD5SUM_x86_64="c4432d1ace6a4af84b6b44e41dfd6879"
+REQUIRES=""
+MAINTAINER="Igor Alexandrov"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jdk16/slack-desc b/development/jdk16/slack-desc
new file mode 100644
index 0000000000..e9358b3bc3
--- /dev/null
+++ b/development/jdk16/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+jdk16: jdk16 (Java Platform Standard Edition Development Kit)
+jdk16:
+jdk16: The Java Platform Standard Edition Development Kit (JDK) includes
+jdk16: both the runtime environment (Java virtual machine,
+jdk16: the Java platform classes and supporting files) and development tools
+jdk16: (compilers, debuggers, tool libraries and other tools).
+jdk16: The JDK is a development environment for building applications,
+jdk16: applets and components that can be deployed with the
+jdk16: Java Platform Standard Edition Runtime Environment.
+jdk16:
+jdk16: https://developer.oracle.com/java/
diff --git a/development/jenv/README b/development/jenv/README
new file mode 100644
index 0000000000..b3b29d3f7f
--- /dev/null
+++ b/development/jenv/README
@@ -0,0 +1,2 @@
+jEnv is a command line tool to help you forget how to set the JAVA_HOME
+environment variable.
diff --git a/development/jenv/jenv.SlackBuild b/development/jenv/jenv.SlackBuild
new file mode 100644
index 0000000000..bdff16aa7b
--- /dev/null
+++ b/development/jenv/jenv.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for jenv
+
+# Copyright 2021 Dmitrii Sosedov, United States
+# 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=jenv
+VERSION=${VERSION:-0.5.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+
+tar xvf "$CWD/$VERSION.tar.gz"
+
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+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/lib$LIBDIRSUFFIX/jenv
+mv available-plugins completions fish libexec $PKG/usr/lib$LIBDIRSUFFIX/jenv
+
+mkdir -p $PKG/usr/bin
+ln -s /usr/lib$LIBDIRSUFFIX/jenv/libexec/jenv $PKG/usr/bin/
+
+mkdir -p $PKG/etc/profile.d/
+
+cat << "EOF" > $PKG/etc/profile.d/jenv.sh
+#!/bin/sh
+export PATH="$HOME/.jenv/bin:$PATH"
+eval "$(jenv init -)"
+EOF
+
+chmod 0755 $PKG/etc/profile.d/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/jenv/jenv.info b/development/jenv/jenv.info
new file mode 100644
index 0000000000..2fee91dc08
--- /dev/null
+++ b/development/jenv/jenv.info
@@ -0,0 +1,10 @@
+PRGNAM="jenv"
+VERSION="0.5.4"
+HOMEPAGE="https://www.jenv.be"
+DOWNLOAD="https://github.com/jenv/jenv/archive/0.5.4.tar.gz"
+MD5SUM="ee0a8849535582f2759b8ab36f7d63ce"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dmitrii Sosedov"
+EMAIL="d.sosedov@gmail.com"
diff --git a/development/jenv/slack-desc b/development/jenv/slack-desc
new file mode 100644
index 0000000000..6dbb60cd29
--- /dev/null
+++ b/development/jenv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+jenv: jenv (Java environment management tool)
+jenv:
+jenv: jEnv is a command line tool to help you forget how to set
+jenv: the JAVA_HOME environment variable.
+jenv:
+jenv:
+jenv:
+jenv:
+jenv: Homepage: https://www.jenv.be
+jenv: Release date: Aug 22, 2020
+jenv:
diff --git a/development/jupyter-ipykernel/README b/development/jupyter-ipykernel/README
index f0974bc59f..696b0972d7 100644
--- a/development/jupyter-ipykernel/README
+++ b/development/jupyter-ipykernel/README
@@ -1 +1 @@
-IPython Kernel for Jupyter.
+Python 3 kernel for Jupyter.
diff --git a/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild b/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild
index e806879f4c..cb7927ea7c 100644
--- a/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild
+++ b/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-ipykernel
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-ipykernel
-VERSION=${VERSION:-4.10.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.5.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=ipykernel
@@ -71,8 +71,7 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
-sed -i "s| \"python\",| \"/usr/bin/python2\",|" $PKG/usr/share/jupyter/kernels/python2/kernel.json
+python3 setup.py install --root=$PKG
 
 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
diff --git a/development/jupyter-ipykernel/jupyter-ipykernel.info b/development/jupyter-ipykernel/jupyter-ipykernel.info
index 34e73eda40..913391ab0d 100644
--- a/development/jupyter-ipykernel/jupyter-ipykernel.info
+++ b/development/jupyter-ipykernel/jupyter-ipykernel.info
@@ -1,10 +1,10 @@
 PRGNAM="jupyter-ipykernel"
-VERSION="4.10.0"
+VERSION="5.5.3"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-4.10.0.tar.gz"
-MD5SUM="e4ee1bf2d025a6016fdf03a8f748aa01"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-5.5.3.tar.gz"
+MD5SUM="db9a39b42df83771c168771d95e362b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ipython jupyter_client tornado"
+REQUIRES="python3-ipython jupyter_client tornado"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter-ipykernel/slack-desc b/development/jupyter-ipykernel/slack-desc
index df185b168e..79655ba2fb 100644
--- a/development/jupyter-ipykernel/slack-desc
+++ b/development/jupyter-ipykernel/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                  |-----handy-ruler------------------------------------------------------|
-jupyter-ipykernel: jupyter-ipykernel (IPython Kernel for Jupyter)
+jupyter-ipykernel: jupyter-ipykernel (Python 3 kernel for Jupyter)
 jupyter-ipykernel:
-jupyter-ipykernel: IPython Kernel for Jupyter.
+jupyter-ipykernel: Python 3 kernel for Jupyter.
 jupyter-ipykernel:
 jupyter-ipykernel:
 jupyter-ipykernel:
diff --git a/development/jupyter-ipywidgets/jupyter-ipywidgets.SlackBuild b/development/jupyter-ipywidgets/jupyter-ipywidgets.SlackBuild
index 8db798c478..90ec5de21a 100644
--- a/development/jupyter-ipywidgets/jupyter-ipywidgets.SlackBuild
+++ b/development/jupyter-ipywidgets/jupyter-ipywidgets.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-ipywidgets
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-ipywidgets
-VERSION=${VERSION:-7.5.1}
+VERSION=${VERSION:-7.6.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jupyter-ipywidgets/jupyter-ipywidgets.info b/development/jupyter-ipywidgets/jupyter-ipywidgets.info
index 9b45771d67..1a7519cc76 100644
--- a/development/jupyter-ipywidgets/jupyter-ipywidgets.info
+++ b/development/jupyter-ipywidgets/jupyter-ipywidgets.info
@@ -1,8 +1,8 @@
 PRGNAM="jupyter-ipywidgets"
-VERSION="7.5.1"
+VERSION="7.6.3"
 HOMEPAGE="https://ipywidgets.readthedocs.io/en/latest/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipywidgets/ipywidgets-7.5.1.tar.gz"
-MD5SUM="090f5ad1294b084f075af8f684d8981f"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipywidgets/ipywidgets-7.6.3.tar.gz"
+MD5SUM="19c4ddc4cebfdc82bacacf98513fb672"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-ipython jupyter-widgetsnbextension"
diff --git a/development/jupyter-nbclient/README b/development/jupyter-nbclient/README
new file mode 100644
index 0000000000..9fe2e424cc
--- /dev/null
+++ b/development/jupyter-nbclient/README
@@ -0,0 +1,2 @@
+nbclient is a tool for running Jupyter Notebooks in different execution
+contexts.
diff --git a/python/python3-certifi/python3-certifi.SlackBuild b/development/jupyter-nbclient/jupyter-nbclient.SlackBuild
index 15d16d51cc..f4cbda1cb4 100644
--- a/python/python3-certifi/python3-certifi.SlackBuild
+++ b/development/jupyter-nbclient/jupyter-nbclient.SlackBuild
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for python3-certifi
+# Slackware build script for jupyter-nbclient
 
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# Based on python-certifi by Dimitris Zlatanidis
+# Copyright 2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +22,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=python3-certifi
-VERSION=${VERSION:-2019.6.16}
+PRGNAM=jupyter-nbclient
+VERSION=${VERSION:-0.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=certifi
+SRCNAM=nbclient
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -79,7 +78,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE README.rst \
+  CHANGELOG.md CONTRIBUTING.md README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/jupyter-nbclient/jupyter-nbclient.info b/development/jupyter-nbclient/jupyter-nbclient.info
new file mode 100644
index 0000000000..15cad61b57
--- /dev/null
+++ b/development/jupyter-nbclient/jupyter-nbclient.info
@@ -0,0 +1,10 @@
+PRGNAM="jupyter-nbclient"
+VERSION="0.5.3"
+HOMEPAGE="https://jupyter.org/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbclient/nbclient-0.5.3.tar.gz"
+MD5SUM="fa28a952fe19d2335000ecfb6acadb6e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="async_generator jupyter_client jupyter-nbformat nest_asyncio"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter-nbclient/slack-desc b/development/jupyter-nbclient/slack-desc
new file mode 100644
index 0000000000..514ec6b5ab
--- /dev/null
+++ b/development/jupyter-nbclient/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+jupyter-nbclient: jupyter-nbclient (execution contexts for Jupyter notebooks)
+jupyter-nbclient:
+jupyter-nbclient: jupyter-nbclient is a tool for running Jupyter Notebooks in different
+jupyter-nbclient: execution contexts. 
+jupyter-nbclient:
+jupyter-nbclient:
+jupyter-nbclient:
+jupyter-nbclient:
+jupyter-nbclient:
+jupyter-nbclient:
diff --git a/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild b/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild
index 5ebdf8ae59..989b6473bf 100644
--- a/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild
+++ b/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-nbconvert
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-nbconvert
-VERSION=${VERSION:-5.6.1}
+VERSION=${VERSION:-6.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jupyter-nbconvert/jupyter-nbconvert.info b/development/jupyter-nbconvert/jupyter-nbconvert.info
index b60ab37be8..d4839b2e5a 100644
--- a/development/jupyter-nbconvert/jupyter-nbconvert.info
+++ b/development/jupyter-nbconvert/jupyter-nbconvert.info
@@ -1,10 +1,10 @@
 PRGNAM="jupyter-nbconvert"
-VERSION="5.6.1"
+VERSION="6.0.7"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-5.6.1.tar.gz"
-MD5SUM="cc766e4f109f97651c005e7fee524c98"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-6.0.7.tar.gz"
+MD5SUM="70f69644c21093260ce79ff3ddb8a140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="bleach decorator python3-defusedxml entrypoints Jinja2 jupyter_core jupyter-nbformat mistune pandocfilters Pygments testpath"
+REQUIRES="bleach decorator python3-defusedxml entrypoints Jinja2 jupyter_core jupyter-nbclient jupyterlab_pygments mistune pandocfilters testpath"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter-nbdime/jupyter-nbdime.SlackBuild b/development/jupyter-nbdime/jupyter-nbdime.SlackBuild
index 249d0450e3..32a62fa977 100644
--- a/development/jupyter-nbdime/jupyter-nbdime.SlackBuild
+++ b/development/jupyter-nbdime/jupyter-nbdime.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-nbdime
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-nbdime
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jupyter-nbdime/jupyter-nbdime.info b/development/jupyter-nbdime/jupyter-nbdime.info
index 3e7e2a793f..0c484aca11 100644
--- a/development/jupyter-nbdime/jupyter-nbdime.info
+++ b/development/jupyter-nbdime/jupyter-nbdime.info
@@ -1,8 +1,8 @@
 PRGNAM="jupyter-nbdime"
-VERSION="1.1.0"
+VERSION="2.1.0"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-1.1.0.tar.gz"
-MD5SUM="ec2ac3f2ac53768730569d4cd8706539"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-2.1.0.tar.gz"
+MD5SUM="780c6d17abe4048dea1774a378fa2db7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="colorama GitPython jupyter-notebook python-requests python3-gitdb2"
diff --git a/development/jupyter-nbformat/jupyter-nbformat.SlackBuild b/development/jupyter-nbformat/jupyter-nbformat.SlackBuild
index 42bff6e643..23ca2f2dc4 100644
--- a/development/jupyter-nbformat/jupyter-nbformat.SlackBuild
+++ b/development/jupyter-nbformat/jupyter-nbformat.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-nbformat
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-nbformat
-VERSION=${VERSION:-4.4.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=nbformat
diff --git a/development/jupyter-nbformat/jupyter-nbformat.info b/development/jupyter-nbformat/jupyter-nbformat.info
index ef3a5d8a73..a401f73b97 100644
--- a/development/jupyter-nbformat/jupyter-nbformat.info
+++ b/development/jupyter-nbformat/jupyter-nbformat.info
@@ -1,8 +1,8 @@
 PRGNAM="jupyter-nbformat"
-VERSION="4.4.0"
+VERSION="5.1.3"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbformat/nbformat-4.4.0.tar.gz"
-MD5SUM="2d5f873138d9fbc2a3f9eaaebca3b8a1"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbformat/nbformat-5.1.3.tar.gz"
+MD5SUM="70eb6150c6ea49aae042e2ecafb45378"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-jsonschema traitlets"
diff --git a/development/jupyter-notebook/jupyter-notebook.SlackBuild b/development/jupyter-notebook/jupyter-notebook.SlackBuild
index 074d9dbcba..8bcc9f8a95 100644
--- a/development/jupyter-notebook/jupyter-notebook.SlackBuild
+++ b/development/jupyter-notebook/jupyter-notebook.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-notebook
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-notebook
-VERSION=${VERSION:-6.0.3}
+VERSION=${VERSION:-6.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jupyter-notebook/jupyter-notebook.info b/development/jupyter-notebook/jupyter-notebook.info
index adf4dde2b5..781344920b 100644
--- a/development/jupyter-notebook/jupyter-notebook.info
+++ b/development/jupyter-notebook/jupyter-notebook.info
@@ -1,10 +1,10 @@
 PRGNAM="jupyter-notebook"
-VERSION="6.0.3"
+VERSION="6.3.0"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/n/notebook/notebook-6.0.3.tar.gz"
-MD5SUM="9714add6d588c5327c4f5029d7c94f7b"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/notebook/notebook-6.3.0.tar.gz"
+MD5SUM="1914eddf7d68b3902335e9248c537935"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Jinja2 ipaddress python3-jupyter-ipykernel jupyter-nbconvert python-prometheus_client singledispatch send2trash terminado"
+REQUIRES="Jinja2 argon2-cffi ipaddress jupyter-ipykernel jupyter-nbconvert python-prometheus_client singledispatch send2trash terminado"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter-qtconsole/jupyter-qtconsole.SlackBuild b/development/jupyter-qtconsole/jupyter-qtconsole.SlackBuild
index 9fe405d69e..c5a06b24a0 100644
--- a/development/jupyter-qtconsole/jupyter-qtconsole.SlackBuild
+++ b/development/jupyter-qtconsole/jupyter-qtconsole.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter-qtconsole
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter-qtconsole
-VERSION=${VERSION:-4.6.0}
+VERSION=${VERSION:-5.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jupyter-qtconsole/jupyter-qtconsole.info b/development/jupyter-qtconsole/jupyter-qtconsole.info
index 2b30ec6752..68245ef99e 100644
--- a/development/jupyter-qtconsole/jupyter-qtconsole.info
+++ b/development/jupyter-qtconsole/jupyter-qtconsole.info
@@ -1,10 +1,10 @@
 PRGNAM="jupyter-qtconsole"
-VERSION="4.6.0"
+VERSION="5.0.1"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://github.com/jupyter/qtconsole/archive/4.6.0/qtconsole-4.6.0.tar.gz"
-MD5SUM="dc92e6d4ad29cfd1726d75f26e9e8f5f"
+DOWNLOAD="https://github.com/jupyter/qtconsole/archive/5.0.1/qtconsole-5.0.1.tar.gz"
+MD5SUM="34056a772ab327f8233776e3bb398ac9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-jupyter-ipykernel python3-PyQt5"
+REQUIRES="jupyter-ipykernel QtPy"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter_client/jupyter_client.SlackBuild b/development/jupyter_client/jupyter_client.SlackBuild
index 03d7ad8452..99034cb8a0 100644
--- a/development/jupyter_client/jupyter_client.SlackBuild
+++ b/development/jupyter_client/jupyter_client.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter_client
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter_client
-VERSION=${VERSION:-5.3.4}
+VERSION=${VERSION:-6.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/jupyter_client/jupyter_client.info b/development/jupyter_client/jupyter_client.info
index 6829a9f2ad..b385fc478a 100644
--- a/development/jupyter_client/jupyter_client.info
+++ b/development/jupyter_client/jupyter_client.info
@@ -1,10 +1,10 @@
 PRGNAM="jupyter_client"
-VERSION="5.3.4"
+VERSION="6.1.13"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://github.com/jupyter/jupyter_client/archive/5.3.4/jupyter_client-5.3.4.tar.gz"
-MD5SUM="973df8f9aa47a15d3cd7f9cc9fa4aa82"
+DOWNLOAD="https://github.com/jupyter/jupyter_client/archive/6.1.13/jupyter_client-6.1.13.tar.gz"
+MD5SUM="78fa92c3bce92db2c650453172e665c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="decorator jupyter_core python-dateutil python3-dateutil pyzmq python3-pyzmq traitlets"
+REQUIRES="decorator jupyter_core python3-dateutil python3-pyzmq traitlets"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter_console/jupyter_console.SlackBuild b/development/jupyter_console/jupyter_console.SlackBuild
index 3d51924b98..14f72273eb 100644
--- a/development/jupyter_console/jupyter_console.SlackBuild
+++ b/development/jupyter_console/jupyter_console.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter_console
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter_console
-VERSION=${VERSION:-6.1.0}
+VERSION=${VERSION:-6.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jupyter_console/jupyter_console.info b/development/jupyter_console/jupyter_console.info
index 4514ab6862..901a686c56 100644
--- a/development/jupyter_console/jupyter_console.info
+++ b/development/jupyter_console/jupyter_console.info
@@ -1,10 +1,10 @@
 PRGNAM="jupyter_console"
-VERSION="6.1.0"
+VERSION="6.4.0"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-6.1.0.tar.gz"
-MD5SUM="b4f162292cbeee24c0d1551f21c8de3a"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-6.4.0.tar.gz"
+MD5SUM="400cdf73675aff2456172cb9d424d10d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jupyter_client python3-jupyter-ipykernel"
+REQUIRES="jupyter_client jupyter-ipykernel"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyter_core/jupyter_core.SlackBuild b/development/jupyter_core/jupyter_core.SlackBuild
index c46f4d1a48..551c5293ad 100644
--- a/development/jupyter_core/jupyter_core.SlackBuild
+++ b/development/jupyter_core/jupyter_core.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jupyter_core
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jupyter_core
-VERSION=${VERSION:-4.6.3}
+VERSION=${VERSION:-4.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/jupyter_core/jupyter_core.info b/development/jupyter_core/jupyter_core.info
index 99f513687f..91b2d9c429 100644
--- a/development/jupyter_core/jupyter_core.info
+++ b/development/jupyter_core/jupyter_core.info
@@ -1,8 +1,8 @@
 PRGNAM="jupyter_core"
-VERSION="4.6.3"
+VERSION="4.7.1"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://github.com/jupyter/jupyter_core/archive/4.6.3/jupyter_core-4.6.3.tar.gz"
-MD5SUM="29a4969de5c6a79d35d4ad2857489268"
+DOWNLOAD="https://github.com/jupyter/jupyter_core/archive/4.7.1/jupyter_core-4.7.1.tar.gz"
+MD5SUM="5e3cb162ae51f2057031961329300839"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/development/jupyterlab_pygments/README b/development/jupyterlab_pygments/README
new file mode 100644
index 0000000000..9590c78367
--- /dev/null
+++ b/development/jupyterlab_pygments/README
@@ -0,0 +1,2 @@
+jupyterlab_pygments is a syntax coloring theme for pygments making use of the
+JupyterLab CSS variables.
diff --git a/development/jupyterlab_pygments/jupyterlab_pygments.SlackBuild b/development/jupyterlab_pygments/jupyterlab_pygments.SlackBuild
new file mode 100644
index 0000000000..264bc541e7
--- /dev/null
+++ b/development/jupyterlab_pygments/jupyterlab_pygments.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for jupyterlab_pygments
+
+# Copyright 2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# 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=jupyterlab_pygments
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python3 setup.py install --root=$PKG
+
+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 README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/jupyterlab_pygments/jupyterlab_pygments.info b/development/jupyterlab_pygments/jupyterlab_pygments.info
new file mode 100644
index 0000000000..dbf545efc0
--- /dev/null
+++ b/development/jupyterlab_pygments/jupyterlab_pygments.info
@@ -0,0 +1,10 @@
+PRGNAM="jupyterlab_pygments"
+VERSION="0.1.2"
+HOMEPAGE="https://jupyter.org/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jupyterlab_pygments/jupyterlab_pygments-0.1.2.tar.gz"
+MD5SUM="beb54b1cf0bd25b53549efc4824f7fea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="Pygments"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/jupyterlab_pygments/slack-desc b/development/jupyterlab_pygments/slack-desc
new file mode 100644
index 0000000000..efd3139bf0
--- /dev/null
+++ b/development/jupyterlab_pygments/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+jupyterlab_pygments: jupyterlab_pygments (theme for Pygments)
+jupyterlab_pygments:
+jupyterlab_pygments: jupyterlab_pygments is a syntax coloring theme for pygments making
+jupyterlab_pygments: use of the JupyterLab CSS variables.
+jupyterlab_pygments:
+jupyterlab_pygments:
+jupyterlab_pygments:
+jupyterlab_pygments:
+jupyterlab_pygments:
+jupyterlab_pygments:
diff --git a/development/komodo-edit/komodo-edit.SlackBuild b/development/komodo-edit/komodo-edit.SlackBuild
index 036258ba7c..e7dd276b33 100644
--- a/development/komodo-edit/komodo-edit.SlackBuild
+++ b/development/komodo-edit/komodo-edit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Komodo Edit
 
-# Copyright 2014-2016 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2014-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=komodo-edit
-VERSION=${VERSION:-11.1.0}
+VERSION=${VERSION:-12.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/komodo-edit/komodo-edit.info b/development/komodo-edit/komodo-edit.info
index c8ab209181..145c858848 100644
--- a/development/komodo-edit/komodo-edit.info
+++ b/development/komodo-edit/komodo-edit.info
@@ -1,10 +1,10 @@
 PRGNAM="komodo-edit"
-VERSION="11.1.0"
+VERSION="12.0.1"
 HOMEPAGE="http://komodoide.com/komodo-edit/"
-DOWNLOAD="http://downloads.activestate.com/Komodo/releases/11.1.0/Komodo-Edit-11.1.0-18196-linux-x86.tar.gz"
-MD5SUM="77922e0db68d328a5ef721505b1ae306"
-DOWNLOAD_x86_64="http://downloads.activestate.com/Komodo/releases/11.1.0/Komodo-Edit-11.1.0-18196-linux-x86_64.tar.gz"
-MD5SUM_x86_64="08daadcdae9c49e7b31847e719b0da89"
+DOWNLOAD="https://downloads.activestate.com/Komodo/releases/12.0.1/Komodo-Edit-12.0.1-18441-linux-x86.tar.gz"
+MD5SUM="db12d929ca92c5b9fdc5463688a90a03"
+DOWNLOAD_x86_64="https://downloads.activestate.com/Komodo/releases/12.0.1/Komodo-Edit-12.0.1-18441-linux-x86_64.tar.gz"
+MD5SUM_x86_64="95822bb59e0114e2cd5a873fb5856092"
 REQUIRES=""
 MAINTAINER="Giuseppe Di Terlizzi"
 EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/development/komodo-ide/komodo-ide.SlackBuild b/development/komodo-ide/komodo-ide.SlackBuild
index 98f8627080..0348a4e6ed 100644
--- a/development/komodo-ide/komodo-ide.SlackBuild
+++ b/development/komodo-ide/komodo-ide.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Komodo IDE
 
-# Copyright 2014-2016 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2014-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=komodo-ide
-VERSION=${VERSION:-11.1.0}
+VERSION=${VERSION:-12.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/komodo-ide/komodo-ide.info b/development/komodo-ide/komodo-ide.info
index 529031d2ee..c8c5654498 100644
--- a/development/komodo-ide/komodo-ide.info
+++ b/development/komodo-ide/komodo-ide.info
@@ -1,10 +1,10 @@
 PRGNAM="komodo-ide"
-VERSION="11.1.0"
+VERSION="12.0.1"
 HOMEPAGE="http://komodoide.com/"
-DOWNLOAD="http://downloads.activestate.com/Komodo/releases/11.1.0/Komodo-IDE-11.1.0-91033-linux-x86.tar.gz"
-MD5SUM="0da608bdace7f4f7d9843bfc03fd4e39"
-DOWNLOAD_x86_64="http://downloads.activestate.com/Komodo/releases/11.1.0/Komodo-IDE-11.1.0-91033-linux-x86_64.tar.gz"
-MD5SUM_x86_64="848c4c666b34c5fb1d6ef36f04cd9e98"
+DOWNLOAD="https://downloads.activestate.com/Komodo/releases/12.0.1/Komodo-IDE-12.0.1-91869-linux-x86.tar.gz"
+MD5SUM="181ec22fc2691abc88c4c4327c95fe8a"
+DOWNLOAD_x86_64="https://downloads.activestate.com/Komodo/releases/12.0.1/Komodo-IDE-12.0.1-91869-linux-x86_64.tar.gz"
+MD5SUM_x86_64="d66e3d445fbff6873f5f7b93bada68af"
 REQUIRES=""
 MAINTAINER="Giuseppe Di Terlizzi"
 EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/development/kotlin/kotlin.SlackBuild b/development/kotlin/kotlin.SlackBuild
index eb9b3cec2f..cbb1fbde88 100644
--- a/development/kotlin/kotlin.SlackBuild
+++ b/development/kotlin/kotlin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kotlin
 
-# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=kotlin
 SRCNAM=kotlin-compiler
-VERSION=${VERSION:-1.4.10}
+VERSION=${VERSION:-1.4.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/kotlin/kotlin.info b/development/kotlin/kotlin.info
index dde6a7a261..847ab7b8ec 100644
--- a/development/kotlin/kotlin.info
+++ b/development/kotlin/kotlin.info
@@ -1,8 +1,8 @@
 PRGNAM="kotlin"
-VERSION="1.4.10"
+VERSION="1.4.32"
 HOMEPAGE="https://kotlinlang.org/"
-DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.4.10/kotlin-compiler-1.4.10.zip"
-MD5SUM="2c05c656026308160cd7d8ca84967609"
+DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.4.32/kotlin-compiler-1.4.32.zip"
+MD5SUM="f5037fef6ed667cdf88dffef74fee7a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk setconf"
diff --git a/development/lepton-eda/lepton-eda.SlackBuild b/development/lepton-eda/lepton-eda.SlackBuild
index 6a96c0885b..55d389a823 100644
--- a/development/lepton-eda/lepton-eda.SlackBuild
+++ b/development/lepton-eda/lepton-eda.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lepton-eda
 
-# Copyright 2019-2020 dmn <graahnul.grom@gmail.com>, Russia
+# Copyright 2019-2021 dmn <graahnul.grom@gmail.com>, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lepton-eda
-VERSION=${VERSION:-1.9.11}
+VERSION=${VERSION:-1.9.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/lepton-eda/lepton-eda.info b/development/lepton-eda/lepton-eda.info
index 68ace3dc5d..4a9831f914 100644
--- a/development/lepton-eda/lepton-eda.info
+++ b/development/lepton-eda/lepton-eda.info
@@ -1,10 +1,10 @@
 PRGNAM="lepton-eda"
-VERSION="1.9.11"
+VERSION="1.9.14"
 HOMEPAGE="https://github.com/lepton-eda/lepton-eda"
-DOWNLOAD="https://github.com/lepton-eda/lepton-eda/releases/download/1.9.11-20200604/lepton-eda-1.9.11.tar.gz"
-MD5SUM="3b8c1f70a5b88904be2fd1487295b256"
+DOWNLOAD="https://github.com/lepton-eda/lepton-eda/releases/download/1.9.14-20210407/lepton-eda-1.9.14.tar.gz"
+MD5SUM="a65d71d06dc829c634701c0eaa03dbb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="gtkextra"
 MAINTAINER="dmn"
 EMAIL="graahnul.grom@gmail.com"
diff --git a/development/meson/meson.SlackBuild b/development/meson/meson.SlackBuild
index e1ef883991..b1dcde3e1b 100644
--- a/development/meson/meson.SlackBuild
+++ b/development/meson/meson.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for meson
 
-# Copyright 2017-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2021  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=meson
-VERSION=${VERSION:-0.55.3}
+VERSION=${VERSION:-0.57.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/meson/meson.info b/development/meson/meson.info
index 7f656aa8af..3e5dddd794 100644
--- a/development/meson/meson.info
+++ b/development/meson/meson.info
@@ -1,8 +1,8 @@
 PRGNAM="meson"
-VERSION="0.55.3"
+VERSION="0.57.1"
 HOMEPAGE="http://mesonbuild.com"
-DOWNLOAD="https://github.com/mesonbuild/meson/releases/download/0.55.3/meson-0.55.3.tar.gz"
-MD5SUM="99777acd77838c8669e1421fda8e31c5"
+DOWNLOAD="https://github.com/mesonbuild/meson/releases/download/0.57.1/meson-0.57.1.tar.gz"
+MD5SUM="fbd744560351491892478a36a1586815"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 ninja"
diff --git a/development/mongodb-compass/mongodb-compass.SlackBuild b/development/mongodb-compass/mongodb-compass.SlackBuild
index 2ba631ad54..82bebb3939 100644
--- a/development/mongodb-compass/mongodb-compass.SlackBuild
+++ b/development/mongodb-compass/mongodb-compass.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mongodb-compass
 
 # Copyright 2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
-# Copyright 2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2020-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mongodb-compass
-VERSION=${VERSION:-1.22.1}
+VERSION=${VERSION:-1.26.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,6 +58,12 @@ find -L . \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mv $PKG/usr/lib $PKG/usr/lib64
+rm $PKG/usr/bin/mongodb-compass
+(
+  cd $PKG/usr/bin
+  ln -s /usr/lib64/mongodb-compass/MongoDB\ Compass mongodb-compass
+)
 mv $PKG/usr/share/doc/mongodb-compass/* $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
 
diff --git a/development/mongodb-compass/mongodb-compass.info b/development/mongodb-compass/mongodb-compass.info
index 5fda8caea3..37cf3497c6 100644
--- a/development/mongodb-compass/mongodb-compass.info
+++ b/development/mongodb-compass/mongodb-compass.info
@@ -1,10 +1,10 @@
 PRGNAM="mongodb-compass"
-VERSION="1.22.1"
+VERSION="1.26.1"
 HOMEPAGE="https://www.mongodb.com/products/compass"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.22.1.x86_64.rpm"
-MD5SUM_x86_64="f5e49fb7289c85732cc2d128fc1cce99"
+DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.26.1.x86_64.rpm"
+MD5SUM_x86_64="c7f6b0f5c516e2442718ec55d82e4d07"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/development/mrustc/README b/development/mrustc/README
index eff3416e6e..d539994b67 100644
--- a/development/mrustc/README
+++ b/development/mrustc/README
@@ -2,13 +2,3 @@ mrustc - alternative rust compiler
 
 This project is an attempt at creating a simple rust compiler in C++,
 with the ultimate goal of being a separate re-implementation.
-
-This slackbuild will build and package mrustc and additionally build
-the official rust 1.19.0 with stdlib.
-
-This script may take a while to complete (around one hour on a 10
-core machine) and will require about 19GB (!) of disk space for its
-temporary directory. It defaults to "/tmp/SBo" and you may redefine it
-like this:
-
-TMP=/your/temporary/dir ./mrustc.SlackBuild
diff --git a/development/mrustc/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/development/mrustc/mrustc-0.8.0-fix-variable-length-integer-receiving.patch
deleted file mode 100644
index 9e76653a07..0000000000
--- a/development/mrustc/mrustc-0.8.0-fix-variable-length-integer-receiving.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/thepowersgang/mrustc/issues/109
-From: Danny Milosavljevic <dannym@scratchpost.org>
-Date: Fri, 3 Jan 2019 13:00:00 +0100
-
---- mrustc/src/expand/proc_macro.cpp.orig	2019-02-01 14:16:54.208486062 +0100
-+++ mrustc/src/expand/proc_macro.cpp	2019-02-01 14:17:14.350925705 +0100
-@@ -977,7 +977,7 @@
-     for(;;)
-     {
-         auto b = recv_u8();
--        v |= static_cast<uint64_t>(b) << ofs;
-+        v |= static_cast<uint64_t>(b & 0x7F) << ofs;
-         if( (b & 0x80) == 0 )
-             break;
-         ofs += 7;
diff --git a/development/mrustc/mrustc.SlackBuild b/development/mrustc/mrustc.SlackBuild
index 909bcb38ae..75ace16a32 100644
--- a/development/mrustc/mrustc.SlackBuild
+++ b/development/mrustc/mrustc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mrustc
 
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mrustc
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.9}
 RUSTCVERSION=${RUSTCVERSION:-1.19.0}
+MRUSTCTARGETVERSION=${MRUSTCTARGETVERSION:-1.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,11 +80,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-patch -p1 < "$CWD/mrustc-0.8.0-fix-variable-length-integer-receiving.patch"
-sed -i '/curl -sS https:/d' Makefile
-sed -i 's/-src.tar.gz/-src.tar.xz/' Makefile
+tar -xf "$CWD/rustc-$RUSTCVERSION-src.tar.xz"
 
-cp "$CWD/rustc-$RUSTCVERSION-src.tar.xz" .
+(
+  cd "rustc-$RUSTCVERSION-src"
+  patch -p0 < ../"rustc-$RUSTCVERSION-src.patch"
+  echo "$RUSTCVERSION" > dl-version
+)
+
+sed -i 's/\(TargetVersion.*TargetVersion.*=.*\)TargetVersion::Rustc1_29/\1TargetVersion::Rustc1_19/' src/main.cpp
 
 chown -R root:root .
 find -L . \
@@ -92,45 +97,71 @@ 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 {} \;
 
-make RUSTCSRC
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+RUSTC_VERSION="$RUSTCVERSION" \
+MRUSTC_TARGET_VER="$MRUSTCTARGETVERSION" \
+OUTDIR_SUF="" \
+CC=gcc \
+CXX=g++ \
+make RUSTC_TARGET="$RUSTC_TARGET"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-RUSTC_TARGET="$RUSTC_TARGET" \
+RUSTC_VERSION="$RUSTCVERSION" \
+MRUSTC_TARGET_VER="$MRUSTCTARGETVERSION" \
+OUTDIR_SUF="" \
 CC=gcc \
-make -f minicargo.mk
+CXX=g++ \
+make -f minicargo.mk LIBS RUSTC_TARGET="$RUSTC_TARGET"
 
-WITH_RUSTC=${WITH_RUSTC:-yes}
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+RUSTC_VERSION="$RUSTCVERSION" \
+MRUSTC_TARGET_VER="$MRUSTCTARGETVERSION" \
+OUTDIR_SUF="" \
+CC=gcc \
+CXX=g++ \
+make -C tools/minicargo RUSTC_TARGET="$RUSTC_TARGET"
 
-if [ "$WITH_RUSTC" = "yes" ] ; then
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  RUSTC_TARGET="$RUSTC_TARGET" \
-  CC=gcc \
-  make -j1 -C run_rustc
-fi
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+RUSTC_VERSION="$RUSTCVERSION" \
+MRUSTC_TARGET_VER="$MRUSTCTARGETVERSION" \
+OUTDIR_SUF="" \
+CC=gcc \
+CXX=g++ \
+make test RUSTC_TARGET="$RUSTC_TARGET"
 
 mkdir -p $PKG/usr/bin
 install -m 0755 bin/mrustc $PKG/usr/bin/mrustc
 install -m 0755 tools/bin/minicargo $PKG/usr/bin/minicargo
 
-mkdir -p $PKG/usr/share/mrustc
-find output -name '*.hir' -maxdepth 1 -exec install -m 0644 {} $PKG/usr/share/mrustc/ \;
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/
+cp -a output $PKG/usr/lib$LIBDIRSUFFIX/mrust
 
-if [ "$WITH_RUSTC" = "yes" ] ; then
-  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/rustlib/$ARCH-unknown-linux-gnu/lib/
-  cp -a run_rustc/prefix/lib/rustlib/$ARCH-unknown-linux-gnu/lib/* $PKG/usr/lib$LIBDIRSUFFIX/rustlib/$ARCH-unknown-linux-gnu/lib/
+find $PKG/usr/lib$LIBDIRSUFFIX -name '*.txt' -print0 | xargs -0 rm
 
-  find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \;
+mkdir -p $PKG/usr/share/mrustc/run_rustc
 
-  install -m 0755 output/rustc $PKG/usr/bin/rustc
-  install -m 0755 output/cargo $PKG/usr/bin/cargo
-  install -m 0755 output/rustc-build/rustdoc $PKG/usr/bin/rustdoc
-fi
+install -m 0644 run_rustc/Makefile $PKG/usr/share/mrustc/run_rustc/Makefile
 
 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/etc/profile.d
+cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
+#!/bin/csh
+setenv MRUSTC_PATH=/usr/bin/mrustc
+EOF
+
+cat << EOF > $PKG/etc/profile.d/$PRGNAM.sh
+#!/bin/sh
+export MRUSTC_PATH=/usr/bin/mrustc
+EOF
+
+chmod 0755 $PKG/etc/profile.d/*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   LICENCE-MIT README.md \
diff --git a/development/mrustc/mrustc.info b/development/mrustc/mrustc.info
index 48936cbb7d..09931e4e42 100644
--- a/development/mrustc/mrustc.info
+++ b/development/mrustc/mrustc.info
@@ -1,9 +1,9 @@
 PRGNAM="mrustc"
-VERSION="0.8.0"
+VERSION="0.9"
 HOMEPAGE="https://github.com/thepowersgang/mrustc"
-DOWNLOAD="https://github.com/thepowersgang/mrustc/archive/v0.8.0/mrustc-0.8.0.tar.gz \
+DOWNLOAD="https://github.com/thepowersgang/mrustc/archive/v0.9/mrustc-0.9.tar.gz \
           https://static.rust-lang.org/dist/rustc-1.19.0-src.tar.xz"
-MD5SUM="c082e1e2d2258c1481d4bf492bf435ae \
+MD5SUM="4195695805ddfaf7cb2f4088760b26d0 \
         e9af5bb321c0cad44ea0e3e2c644ab2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info
index 68d72ac878..cea4790883 100644
--- a/development/neovim/neovim.info
+++ b/development/neovim/neovim.info
@@ -1,6 +1,6 @@
 PRGNAM="neovim"
 VERSION="0.4.4"
-HOMEPAGE="http://neovim.org/"
+HOMEPAGE="https://neovim.io"
 DOWNLOAD="https://github.com/neovim/neovim/archive/v0.4.4/neovim-0.4.4.tar.gz"
 MD5SUM="526e6a9194d6d65fd5e7faa4b506e7c8"
 DOWNLOAD_x86_64=""
diff --git a/development/netbeans/netbeans.SlackBuild b/development/netbeans/netbeans.SlackBuild
index bc1c19244b..351b4edd99 100644
--- a/development/netbeans/netbeans.SlackBuild
+++ b/development/netbeans/netbeans.SlackBuild
@@ -81,4 +81,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:-tgz}
diff --git a/development/netbeans/netbeans.info b/development/netbeans/netbeans.info
index 780e5d5f6d..52cbea89e4 100644
--- a/development/netbeans/netbeans.info
+++ b/development/netbeans/netbeans.info
@@ -1,10 +1,10 @@
 PRGNAM="netbeans"
 VERSION="11.3"
 HOMEPAGE="https://netbeans.apache.org/"
-DOWNLOAD="https://www-eu.apache.org/dist/netbeans/netbeans/11.3/netbeans-11.3-bin.zip"
+DOWNLOAD="https://archive.apache.org/dist/netbeans/netbeans/11.3/netbeans-11.3-bin.zip"
 MD5SUM="50f9a3424d85f730ca817a5ccb19e23f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Sukma Wardana"
-EMAIL="sukma.wardana@mail.com"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/development/nim/nim.SlackBuild b/development/nim/nim.SlackBuild
index 86bcd5d59e..edaf238c7b 100644
--- a/development/nim/nim.SlackBuild
+++ b/development/nim/nim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nim
 
-# Maintained 2020 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Maintained 2020-2021 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nim
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/nim/nim.info b/development/nim/nim.info
index 81514d4388..1ef0efeef1 100644
--- a/development/nim/nim.info
+++ b/development/nim/nim.info
@@ -1,8 +1,8 @@
 PRGNAM="nim"
-VERSION="1.2.4"
+VERSION="1.4.6"
 HOMEPAGE="https://nim-lang.org"
-DOWNLOAD="https://nim-lang.org/download/nim-1.2.4.tar.xz"
-MD5SUM="0a0e4d1826dd4e493c022750360ee89a"
+DOWNLOAD="https://nim-lang.org/download/nim-1.4.6.tar.xz"
+MD5SUM="5bbafd6a3ebd17497886add4e967b028"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/ninja/ninja.SlackBuild b/development/ninja/ninja.SlackBuild
index aca4714cc4..c86f4064e3 100644
--- a/development/ninja/ninja.SlackBuild
+++ b/development/ninja/ninja.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ninja
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/ninja/ninja.info b/development/ninja/ninja.info
index 62989ad3f3..dcc1d0d2aa 100644
--- a/development/ninja/ninja.info
+++ b/development/ninja/ninja.info
@@ -1,8 +1,8 @@
 PRGNAM="ninja"
-VERSION="1.10.1"
+VERSION="1.10.2"
 HOMEPAGE="https://ninja-build.org/"
-DOWNLOAD="https://github.com/ninja-build/ninja/archive/v1.10.1/ninja-1.10.1.tar.gz"
-MD5SUM="05c1bb5ef41c85057fa6abdffa243dcd"
+DOWNLOAD="https://github.com/ninja-build/ninja/archive/v1.10.2/ninja-1.10.2.tar.gz"
+MD5SUM="639f75bc2e3b19ab893eaf2c810d4eb4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/nodejs-bin/nodejs-bin.SlackBuild b/development/nodejs-bin/nodejs-bin.SlackBuild
index 56bf4e9abd..90ad6007e1 100644
--- a/development/nodejs-bin/nodejs-bin.SlackBuild
+++ b/development/nodejs-bin/nodejs-bin.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=nodejs-bin
 SRCNAM=node
-VERSION=${VERSION:-10.16.0}
+VERSION=${VERSION:-14.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/nodejs-bin/nodejs-bin.info b/development/nodejs-bin/nodejs-bin.info
index e6ba87e892..8cff3a6d47 100644
--- a/development/nodejs-bin/nodejs-bin.info
+++ b/development/nodejs-bin/nodejs-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="nodejs-bin"
-VERSION="10.16.0"
+VERSION="14.16.1"
 HOMEPAGE="https://nodejs.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://nodejs.org/dist/v10.16.0/node-v10.16.0-linux-x64.tar.xz"
-MD5SUM_x86_64="c8222839f80ea586aa24d1ee792e1d93"
+DOWNLOAD_x86_64="http://nodejs.org/dist/v14.16.1/node-v14.16.1-linux-x64.tar.xz"
+MD5SUM_x86_64="98ce7e4e5f53c53fdbbc30331fc0e229"
 REQUIRES=""
 MAINTAINER="Marcin Szychowski"
 EMAIL="szycha@gmail.com"
diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild
index a74f249860..25f6b8c67d 100644
--- a/development/nodejs/nodejs.SlackBuild
+++ b/development/nodejs/nodejs.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=nodejs
 SRCNAM=node
-VERSION=${VERSION:-12.16.3}
+VERSION=${VERSION:-12.22.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info
index afe36a9f52..99a8d8f722 100644
--- a/development/nodejs/nodejs.info
+++ b/development/nodejs/nodejs.info
@@ -1,8 +1,8 @@
 PRGNAM="nodejs"
-VERSION="12.16.3"
+VERSION="12.22.1"
 HOMEPAGE="https://nodejs.org/"
-DOWNLOAD="https://nodejs.org/dist/v12.16.3/node-v12.16.3.tar.xz"
-MD5SUM="3f23ba05c01f6f03170059057a7bd727"
+DOWNLOAD="https://nodejs.org/dist/v12.22.1/node-v12.22.1.tar.xz"
+MD5SUM="6c8fd17343bebfdf659d990b21453bc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/obcpl/obcpl.SlackBuild b/development/obcpl/obcpl.SlackBuild
index cd9a4f7bb8..3a09d26134 100644
--- a/development/obcpl/obcpl.SlackBuild
+++ b/development/obcpl/obcpl.SlackBuild
@@ -47,11 +47,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 cd src
 ln -s sys_linux.s sys.s
diff --git a/development/obcpl/obcpl.info b/development/obcpl/obcpl.info
index f27fd4eadd..102d5cc185 100644
--- a/development/obcpl/obcpl.info
+++ b/development/obcpl/obcpl.info
@@ -1,7 +1,7 @@
 PRGNAM="obcpl"
 VERSION="0.9.8"
-HOMEPAGE="http://www.nordier.com/software/obcpl.html"
-DOWNLOAD="http://www.nordier.com/software/distfiles/obcpl-0.9.8.tar.xz"
+HOMEPAGE="https://www.nordier.com/"
+DOWNLOAD="https://www.nordier.com/software/distfiles/obcpl-0.9.8.tar.xz"
 MD5SUM="170223f85130c9b7f54082481a492045"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/octant/README b/development/octant/README
index d4ffefe836..4e502db653 100644
--- a/development/octant/README
+++ b/development/octant/README
@@ -10,3 +10,5 @@ for gaining insight and approaching complexity found in Kubernetes.
 Octant offers a combination of introspective tooling, cluster
 navigation, and object management along with a plugin system to
 further extend its capabilities.
+
+This is a repackaged binary.
diff --git a/development/octant/octant.SlackBuild b/development/octant/octant.SlackBuild
index e30ff68869..ea576b1111 100644
--- a/development/octant/octant.SlackBuild
+++ b/development/octant/octant.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for octant
 
-# Copyright 2020 Dmitrii Sosedov, United States
+# Copyright 2021 Dmitrii Sosedov, United States
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 PRGNAM=octant
-VERSION=${VERSION:-0.15.0}
+VERSION=${VERSION:-0.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    x86_64) ARCH=x86_64 ;;
-         *) ARCH=i686 ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -40,7 +42,6 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   echo "Not supported"
diff --git a/development/octant/octant.info b/development/octant/octant.info
index db08e09691..1ef5586441 100644
--- a/development/octant/octant.info
+++ b/development/octant/octant.info
@@ -1,10 +1,10 @@
 PRGNAM="octant"
-VERSION="0.15.0"
+VERSION="0.17.0"
 HOMEPAGE="https://octant.dev"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM="UNSUPPORTED"
-DOWNLOAD_x86_64="https://github.com/vmware-tanzu/octant/releases/download/v0.15.0/octant_0.15.0_Linux-64bit.tar.gz"
-MD5SUM_x86_64="a30f2dda3dc0f41908d8220477945527"
+DOWNLOAD_x86_64="https://github.com/vmware-tanzu/octant/releases/download/v0.17.0/octant_0.17.0_Linux-64bit.tar.gz"
+MD5SUM_x86_64="302857f3692d3b0b9bc9e7ec5d272df5"
 REQUIRES=""
 MAINTAINER="Dmitrii Sosedov"
 EMAIL="d.sosedov@gmail.com"
diff --git a/development/octant/slack-desc b/development/octant/slack-desc
index a7f1c511c5..31e9bb74fe 100644
--- a/development/octant/slack-desc
+++ b/development/octant/slack-desc
@@ -15,5 +15,5 @@ octant:
 octant:
 octant:
 octant: Homepage: https://octant.dev
-octant: Release date: Aug 12, 2020
+octant: Release date: Feb 16, 2021
 octant:
diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild
index f968de4e94..b10729d6a7 100644
--- a/development/openjdk7/openjdk7.SlackBuild
+++ b/development/openjdk7/openjdk7.SlackBuild
@@ -22,13 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=openjdk7
-VERSION=${VERSION:-7u251}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+function createPatchedJdkArchive() {
 
-function createSBoPatch() {
-	cat << EOF > ${ICEDTEA}/patches/boot/optional.patch
+	mkdir -p ${SBO_PATCH_DIR} && cd ${SBO_PATCH_DIR}
+	tar xvf "${CWD}/jdk.tar.bz2"
+	cd jdk-*
+
+	cat << EOF | patch -d ./src/share/classes/sun/security/util Optional.java
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java
 --- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java	2019-10-20 11:57:14.258731932 +0300
 +++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java	2019-10-20 11:59:48.600721516 +0300
@@ -42,47 +42,23 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.jav
      }
  
 EOF
+
+	cd ..
+	tar -cvjSf jdk.tar.bz2 jdk-*
 }
 
-function activateSBoPatch() {
-	cat << EOF | patch -d ${ICEDTEA} Makefile.in
---- Makefile.in.orig	2019-10-20 12:55:58.715494084 +0300
-+++ Makefile.in.new	2019-10-20 13:05:27.236455717 +0300
-@@ -154,7 +154,8 @@
- @USE_NON_NSS_CURVES_FALSE@am__append_14 = patches/rh1022017.patch
- @DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_15 = \\
- @DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/bootstrap-tools.patch \\
--@DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/ant-javac.patch
-+@DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/ant-javac.patch \\
-+@DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/optional.patch
- 
- @LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR_TRUE@am__append_16 = \\
- @LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR_TRUE@	patches/boot/jaxws-langtools-dependency.patch
-EOF
+function fixJdkArchiveChecksum() {
+	local newChecksum=$(sha256sum "${SBO_PATCH_DIR}/jdk.tar.bz2" | awk '{print $1}')
 
-	cat << EOF | patch -d ${ICEDTEA} Makefile.am
---- Makefile.am.orig	2019-10-20 12:56:24.622492335 +0300
-+++ Makefile.am	2019-10-20 13:18:31.666402780 +0300
-@@ -453,7 +453,8 @@
- if !DISABLE_BOOTSTRAP_TOOLS
- ICEDTEA_BOOT_PATCHES += \\
- 	patches/boot/bootstrap-tools.patch \\
--	patches/boot/ant-javac.patch
-+	patches/boot/ant-javac.patch \\
-+	patches/boot/optional.patch
- endif
- 
- if LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR
-EOF
-
-	(
-		cd ${ICEDTEA}
-		aclocal
-	)
+	sed -r -i "s/^(\s*JDK_SHA256SUM\s*=\s*).*$/\1${newChecksum}/" Makefile
 }
 
+PRGNAM=openjdk7
+VERSION=${VERSION:-7u271}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.6.21
+ICEDTEA=icedtea-2.6.23
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -95,6 +71,7 @@ fi
 CWD="$(pwd)"
 TMP=${TMP:-/tmp/SBo}
 BUILD_DIR=$TMP/$PRGNAM
+SBO_PATCH_DIR="${BUILD_DIR}/jdk-archive-patch"
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -112,13 +89,13 @@ set -e
 
 rm -rf $BUILD_DIR $PKG
 mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT
+
+(createPatchedJdkArchive)
+
 cd $BUILD_DIR
 
 tar -xvf $CWD/${ICEDTEA}.tar.xz
 
-createSBoPatch
-activateSBoPatch
-
 mkdir icedtea-build
 cd icedtea-build
 
@@ -144,10 +121,12 @@ $(
     --with-corba-src-zip="$CWD/corba.tar.bz2" \
     --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
     --with-jaxws-src-zip="$CWD/jaxws.tar.bz2" \
-    --with-jdk-src-zip="$CWD/jdk.tar.bz2" \
+    --with-jdk-src-zip="${SBO_PATCH_DIR}/jdk.tar.bz2" \
     --with-langtools-src-zip="$CWD/langtools.tar.bz2" \
     --with-hotspot-src-zip="$CWD/hotspot.tar.bz2"
 
+fixJdkArchiveChecksum
+
 JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make
 
 cd $PKG
diff --git a/development/openjdk7/openjdk7.info b/development/openjdk7/openjdk7.info
index df6c8a90c9..70b49e855d 100644
--- a/development/openjdk7/openjdk7.info
+++ b/development/openjdk7/openjdk7.info
@@ -1,22 +1,22 @@
 PRGNAM="openjdk7"
-VERSION="7u251"
+VERSION="7u271"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.21.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/openjdk.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/corba.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/jaxp.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/jaxws.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/jdk.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/langtools.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/hotspot.tar.bz2"
-MD5SUM="5daabd69cce803fb8c464feac38086cc \
-  403342ef777c579cc1451e235e6fb028 \
-  f7b5466277edd1a0ed4944c47a966cea \
-  f65ae3ddd00ab6bfc54a7d7b002f5f01 \
-  63c05316146d1de745129f196c203b11 \
-  3b65b3a9fcbd14f692c7d5cf8b5b47e3 \
-  5536ea0fcdac7522e8a61632109e0f3e \
-  88a439cd650821b217f17f0df452c00b"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.23.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/openjdk.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/corba.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jaxp.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jaxws.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jdk.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/langtools.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/hotspot.tar.bz2"
+MD5SUM="b18cc58b81bdd59f91b961b9430952a6 \
+  69969330d95c9ba4f0088b645958ed1c \
+  bb1270b47c365d2a5757868d43fb30e7 \
+  a8e3b94c09a0a873101322bcf2723507 \
+  9c50dc5e69395dccda60a549c2fac06f \
+  cf1fe157b63e83dc5b8e6f7b134dd5a6 \
+  43166317dfb730ee074d7c42d0181649 \
+  4d77e2dfa55e15eb5602b53ba8ab49ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"
diff --git a/development/openjdk8/README b/development/openjdk8/README
index 154612d127..8258e18166 100644
--- a/development/openjdk8/README
+++ b/development/openjdk8/README
@@ -7,11 +7,11 @@ that you have already installed as they may cause conflicts with the
 PATH, JAVA_HOME and MANPATH variables (this includes the 'openjdk7'
 dependency package -- you may wish to remove it after you're done.)
 
-If you already have 'openjdk8' on your system (and are compiling a
-newer version, for example) you don't need the 'openjdk7' dependency.
+If you already have 'openjdk8' on your system (and are compiling a newer
+version, for example) you don't need the 'openjdk7' dependency.
 
-After installing the package you will need to logout/reboot your
-machine as it will add new files to the /etc/profile.d folder.
+After installing the package you will need to logout/reboot your machine
+as it will add new files to the /etc/profile.d folder.
 
 This script may take a couple of hours to complete and will require
 about 11 GB of disk space for its temporary directory. It defaults to
diff --git a/development/openjdk8/openjdk8.SlackBuild b/development/openjdk8/openjdk8.SlackBuild
index 2528510631..d3b1688d81 100644
--- a/development/openjdk8/openjdk8.SlackBuild
+++ b/development/openjdk8/openjdk8.SlackBuild
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjdk8
-VERSION=${VERSION:-8u242}
+VERSION=${VERSION:-8u252}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.8.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-3.15.0
+ICEDTEA=icedtea-3.16.0
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -81,8 +81,6 @@ $(
 #+ http://mirror.centos.org/centos/6/os/x86_64/Packages/ca-certificates-2015.2.4-65.0.1.el6_6.noarch.rpm
 #  You can list its contents with this command (after you install this package:)
 #+ 'keytool -v -list -keystore ./cacerts -storepass changeit'
-#  It's old and some certificates inside have already expired but without it some java programs
-#+ may throw exceptions. It is meant as a dummy placehoder file.
 ) \
    --with-openjdk-src-zip="$CWD/openjdk.tar.xz" \
    --with-corba-src-zip="$CWD/corba.tar.xz" \
diff --git a/development/openjdk8/openjdk8.info b/development/openjdk8/openjdk8.info
index 589d18ff05..b28c9c0a9b 100644
--- a/development/openjdk8/openjdk8.info
+++ b/development/openjdk8/openjdk8.info
@@ -1,24 +1,24 @@
 PRGNAM="openjdk8"
-VERSION="8u242"
+VERSION="8u252"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-3.15.0.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/openjdk.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/corba.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/jaxp.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/jaxws.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/jdk.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/langtools.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/nashorn.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea8/3.15.0/hotspot.tar.xz"
-MD5SUM="f789fff45db6fdcc663d2a277e423763 \
-    f8de18e2a79f5cd0a4f65c134505f1b3 \
-    a1835170b80736ea01548892d05269b9 \
-    bac0dfc3edeb36bb0a8e17bf3e8638ba \
-    c0ec29233b16d028710f3e8a46fa0d8d \
-    1fb48b1c922b5e451c8c974e7e017c81 \
-    aac611dac366e55f608b8c0c945b230c \
-    c4b7700db1ccdb5817a8a614934089a3 \
-    1bf3fe318193497ad84f96c166261218"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-3.16.0.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/openjdk.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/corba.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/jaxp.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/jaxws.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/jdk.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/langtools.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/nashorn.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea8/3.16.0/hotspot.tar.xz"
+MD5SUM="a8a202fdd4aa170f80968508477cd986 \
+    0908aaf4976a9092ea41657a53aa3195 \
+    293716bae4f8519f5223efe3b03cc38f \
+    83d457c1eeb61874dbcb0a0dca06cc00 \
+    f0708de204b736ea0f5bb4125a7a8943 \
+    55a648609f76b93ac19878bc21ba0f35 \
+    5ba24b93a4f909e5725ad6c04b8f3ed4 \
+    6fd7950ea8afb9ae986272aab55ed721 \
+    a5e5491cf87903cae64bda8fef6e3314"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openjdk7"
diff --git a/development/perf/README b/development/perf/README
index 56771df929..1ec21e6c9e 100644
--- a/development/perf/README
+++ b/development/perf/README
@@ -4,7 +4,22 @@ such as instructions executed, cache-misses suffered, or branches
 mispredicted. They form a basis for profiling applications to trace
 dynamic control flow and identify hotspots.
 
-Please note that this SBo doesn't have any sources in the DOWNLOAD
-setting, as the sources are already part of a full slackware install.
-
 Optional dependencies: audit, numactl, libunwind
+
+Please note that this build doesn't have any sources in the .info
+file, as the sources are already part of the Slackware kernel-source
+package. Your running kernel's version should match the kernel-source
+version. If it doesn't:
+
+- If your kernel source is located in /usr/src/linux-$VERSION, you
+  can export KERNEL=<version> in the script's environment. Example:
+
+  export KERNEL=4.4.240
+
+- If your kernel source is somewhere else, you can export
+  KERNEL=</path/to/source>. Example:
+
+  export KERNEL=/home/myuser/kernels/linux-4.2.240
+
+Please note that the package's version number will match the version
+of the kernel source, *not* necessarily what's in the perf.info file.
diff --git a/development/perf/perf.SlackBuild b/development/perf/perf.SlackBuild
index 1a81ae0622..ac56703e5a 100644
--- a/development/perf/perf.SlackBuild
+++ b/development/perf/perf.SlackBuild
@@ -22,8 +22,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210202 bkw: Modified by SlackBuilds.org, autodetect the kernel
+# version and allow the user to override it. Avoids having this build
+# break every time Pat releases a new kernel in patches/.
+
 PRGNAM=perf
+
+# This VERSION is actually a dummy. Use KERNEL to set the version.
 VERSION=${VERSION:-4.4.227}
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +63,44 @@ fi
 
 set -e
 
-SRCDIR="/usr/src/linux-$VERSION/tools/perf"
+die() {
+  echo "$0: fatal: $@" 1>&2
+  cat 1>&2 <<EOF
+
+Please make sure the correct version of the kernel source is
+installed, and/or set the KERNEL environment variable to one of:
+
+- The full path to the kernel source, e.g. KERNEL="/usr/src/linux-4.4.227"
+- Or, the kernel version e.g. KERNEL="4.4.227"
+EOF
+  exit 1
+}
+
+case "$KERNEL" in
+  # if unset, use the running kernel:
+  "") SRCDIR="/usr/src/linux-$( uname -r )" ;;
+  # if it's an absolute path, use it as-is:
+  /*) SRCDIR="$KERNEL" ;;
+  # otherwise assume it's a version number:
+  *)  SRCDIR="/usr/src/linux-$KERNEL" ;;
+esac
+
+[ -f "$SRCDIR/Makefile" ] || die "Can't find kernel source in \"$SRCDIR\""
+
+# get the kernel version number from the top-level Makefile. This
+# allows cases where the kernel source directory isn't named after the
+# version number. It also verifies that the Makefile actually exists
+# (because after upgrading/removing a kernel-source package, the
+# directory might still exist, with the .config and other generated
+# files, but no kernel source!)
+cd $SRCDIR
+VERSION="$( make kernelversion | tail -1 )"
+[ -z "$VERSION" ] && die "Can't get kernel version (source corrupted?)"
+echo "=== VERSION=\"$VERSION\""
+
+SRCDIR="$SRCDIR/tools/perf"
+[ -d "$SRCDIR" ] || die "Kernel source missing tools/perf directory"
+
 BUILDDIR=$TMP/$PRGNAM-$VERSION
 
 rm -rf $PKG $BUILDDIR
diff --git a/development/perf/perf.info b/development/perf/perf.info
index 1dcb42c495..014af45032 100644
--- a/development/perf/perf.info
+++ b/development/perf/perf.info
@@ -1,7 +1,7 @@
 PRGNAM="perf"
 VERSION="4.4.227"
 HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page"
-DOWNLOAD="http://www.pastemobile.org/static/perf.dummy"
+DOWNLOAD="https://slackware.uk/~urchlay/src/perf.dummy"
 MD5SUM="9cba6c70fb57a22a155073d54748b614"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/pkgconf/README b/development/pkgconf/README
index 4ccedb7a13..9f3d068df4 100644
--- a/development/pkgconf/README
+++ b/development/pkgconf/README
@@ -12,8 +12,9 @@ pkgconf. This can be reversed by removing pkgconf and reinstalling
 pkg-config. A new user session will be needed for the environment
 variables to be correct.
 
-If you are using slackpkg add this line to your blacklist file found
-at '/etc/slackpkg/blacklist'.
+If you are using slackpkg add this line to your blacklist file found at
+'/etc/slackpkg/blacklist'.
+
   pkg-config
 
 To build debugging symbols use:
diff --git a/development/pkgconf/pkgconf.SlackBuild b/development/pkgconf/pkgconf.SlackBuild
index 4f34013b2a..cbcd1c0e2d 100644
--- a/development/pkgconf/pkgconf.SlackBuild
+++ b/development/pkgconf/pkgconf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pkgconf
 
-# Copyright 2016-2020 Hunter Sezen California, USA
+# Copyright 2016-2021 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pkgconf
-VERSION=${VERSION:-1.7.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,12 +69,13 @@ 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 {} \;
 
-[ "${DEBUG:=0}" != 0 ] &&
+[ "${DEBUG:=0}" = 0 ] ||
   SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0 -g/')"
 
 autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/development/pkgconf/pkgconf.info b/development/pkgconf/pkgconf.info
index c544216750..7d3ac2aea2 100644
--- a/development/pkgconf/pkgconf.info
+++ b/development/pkgconf/pkgconf.info
@@ -1,8 +1,8 @@
 PRGNAM="pkgconf"
-VERSION="1.7.3"
+VERSION="1.7.4"
 HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
-DOWNLOAD="https://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.3.tar.xz"
-MD5SUM="2a19acafd0eccb61d09a5bbf7ce18c9d"
+DOWNLOAD="https://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.4.tar.xz"
+MD5SUM="be4e3987047a95c2b75fbbf1884353ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/development/postman/postman.SlackBuild b/development/postman/postman.SlackBuild
index 5db1da33c9..99d03c1512 100644
--- a/development/postman/postman.SlackBuild
+++ b/development/postman/postman.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Postman
 
-# Copyright 2018, 2019 Ebben Aries <e@dscp.org>
+# Copyright 2018-2021 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=postman
 SRCDIR=Postman
 SRCNAM=linux
-VERSION=${VERSION:-7.34.0}
+VERSION=${VERSION:-8.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/postman/postman.info b/development/postman/postman.info
index aae1045bec..f2c339dac9 100644
--- a/development/postman/postman.info
+++ b/development/postman/postman.info
@@ -1,10 +1,10 @@
 PRGNAM="postman"
-VERSION="7.34.0"
+VERSION="8.2.1"
 HOMEPAGE="https://www.getpostman.com"
-DOWNLOAD="https://dl.pstmn.io/download/version/7.34.0/linux64"
-MD5SUM="e73a56ca80d6811d5ecfb31bd26f572b"
+DOWNLOAD="https://dl.pstmn.io/download/version/8.2.1/linux64"
+MD5SUM="b9b21422cb3004ffa6d72691430e1c78"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/development/psycopg2/psycopg2.SlackBuild b/development/psycopg2/psycopg2.SlackBuild
index c133f5e789..7080044d70 100644
--- a/development/psycopg2/psycopg2.SlackBuild
+++ b/development/psycopg2/psycopg2.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=psycopg2
-VERSION=${VERSION:-2.8.5}
+VERSION=${VERSION:-2.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/psycopg2/psycopg2.info b/development/psycopg2/psycopg2.info
index bdecd1e806..bc71a8673a 100644
--- a/development/psycopg2/psycopg2.info
+++ b/development/psycopg2/psycopg2.info
@@ -1,8 +1,8 @@
 PRGNAM="psycopg2"
-VERSION="2.8.5"
+VERSION="2.8.6"
 HOMEPAGE="http://initd.org/psycopg/"
-DOWNLOAD="http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-2.8.5.tar.gz"
-MD5SUM="c232ff3e3bfee35e1a0e15bc089cb294"
+DOWNLOAD="http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-2.8.6.tar.gz"
+MD5SUM="ae2ff92f1cfcd890bd5f09f4d1d7d60c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql python3"
diff --git a/development/pycharm/pycharm.SlackBuild b/development/pycharm/pycharm.SlackBuild
index 4644f882fa..f0002fd902 100644
--- a/development/pycharm/pycharm.SlackBuild
+++ b/development/pycharm/pycharm.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=pycharm
 EDITION=community
-VERSION=${VERSION:-2020.1.1}
+VERSION=${VERSION:-2020.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/pycharm/pycharm.info b/development/pycharm/pycharm.info
index ba0c5f487b..b08a1d5088 100644
--- a/development/pycharm/pycharm.info
+++ b/development/pycharm/pycharm.info
@@ -1,8 +1,8 @@
 PRGNAM="pycharm"
-VERSION="2020.1.1"
+VERSION="2020.3.1"
 HOMEPAGE="https://www.jetbrains.com/pycharm/"
-DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2020.1.1.tar.gz"
-MD5SUM="d38ae81b44e8a99ae277b959322bc771"
+DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2020.3.1.tar.gz"
+MD5SUM="f48850dcca98636f0b9352c33d5666f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/racer/README b/development/racer/README
index 9af5268fb6..1fdcc6b0e4 100644
--- a/development/racer/README
+++ b/development/racer/README
@@ -1,6 +1,6 @@
 racer - Rust Code Completion utility
 
 This requires rust nightly installed through rustup. Before running this
-slackbuild, you should install the nightly from 2020-09-27 by running:
+slackbuild, you should install the nightly from 2021-03-26 by running:
 
-  rustup toolchain install nightly-2020-09-23
+  rustup toolchain install --profile minimal nightly-2021-03-26
diff --git a/development/racer/racer.SlackBuild b/development/racer/racer.SlackBuild
index 2bc393dacf..2509869dcc 100644
--- a/development/racer/racer.SlackBuild
+++ b/development/racer/racer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for racer
 
-# Copyright 2017-2018,2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2018,2020-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=racer
-VERSION=${VERSION:-2.1.39}
+VERSION=${VERSION:-2.1.45}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -139,7 +139,7 @@ find -L . \
 PATH="$(pwd)/rustup-bin:$PATH" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-rustup run nightly-2020-09-23 cargo build --release $CARGOTARGET
+rustup run nightly-2021-03-26 cargo build --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 
diff --git a/development/racer/racer.info b/development/racer/racer.info
index 001d5b3064..7ad975f0c4 100644
--- a/development/racer/racer.info
+++ b/development/racer/racer.info
@@ -1,7 +1,7 @@
 PRGNAM="racer"
-VERSION="2.1.39"
+VERSION="2.1.45"
 HOMEPAGE="https://github.com/racer-rust/racer"
-DOWNLOAD="https://github.com/racer-rust/racer/archive/v2.1.39/racer-2.1.39.tar.gz \
+DOWNLOAD="https://github.com/racer-rust/racer/archive/v2.1.45/racer-2.1.45.tar.gz \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/annotate-snippets/annotate-snippets-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
@@ -9,27 +9,23 @@ DOWNLOAD="https://github.com/racer-rust/racer/archive/v2.1.39/racer-2.1.39.tar.g
           https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-buffer/block-buffer-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-padding/block-padding-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byte-tools/byte-tools-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-buffer/block-buffer-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.53.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cpuid-bool/cpuid-bool-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.6.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.2.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_more/derive_more-0.99.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ena/ena-0.14.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fake-simd/fake-simd-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.14.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.21.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.8.2.crate \
@@ -43,21 +39,19 @@ DOWNLOAD="https://github.com/racer-rust/racer/archive/v2.1.39/racer-2.1.39.tar.g
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.77.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.3.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.4.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/md-5/md-5-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/measureme/measureme-0.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/md-5/md-5-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/measureme/measureme-9.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.7.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.5.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.12.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.6.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/perf-event-open-sys/perf-event-open-sys-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/psm/psm-0.1.8.crate \
@@ -72,39 +66,37 @@ DOWNLOAD="https://github.com/racer-rust/racer/archive/v2.1.39/racer-2.1.39.tar.g
           https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rls-span/rls-span-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_arena/rustc-ap-rustc_arena-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_ast/rustc-ap-rustc_ast-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_ast_pretty/rustc-ap-rustc_ast_pretty-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_data_structures/rustc-ap-rustc_data_structures-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_errors/rustc-ap-rustc_errors-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_feature/rustc-ap-rustc_feature-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_fs_util/rustc-ap-rustc_fs_util-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_graphviz/rustc-ap-rustc_graphviz-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_index/rustc-ap-rustc_index-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_lexer/rustc-ap-rustc_lexer-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_macros/rustc-ap-rustc_macros-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_parse/rustc-ap-rustc_parse-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_serialize/rustc-ap-rustc_serialize-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_session/rustc-ap-rustc_session-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_span/rustc-ap-rustc_span-679.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_target/rustc-ap-rustc_target-679.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_arena/rustc-ap-rustc_arena-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_ast/rustc-ap-rustc_ast-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_ast_pretty/rustc-ap-rustc_ast_pretty-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_data_structures/rustc-ap-rustc_data_structures-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_errors/rustc-ap-rustc_errors-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_feature/rustc-ap-rustc_feature-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_fs_util/rustc-ap-rustc_fs_util-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_graphviz/rustc-ap-rustc_graphviz-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_index/rustc-ap-rustc_index-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_lexer/rustc-ap-rustc_lexer-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_lint_defs/rustc-ap-rustc_lint_defs-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_macros/rustc-ap-rustc_macros-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_parse/rustc-ap-rustc_parse-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_serialize/rustc-ap-rustc_serialize-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_session/rustc-ap-rustc_session-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_span/rustc-ap-rustc_span-712.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-ap-rustc_target/rustc-ap-rustc_target-712.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-hash/rustc-hash-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-rayon-core/rustc-rayon-core-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-rayon/rustc-rayon-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-rayon-core/rustc-rayon-core-0.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-rayon/rustc-rayon-0.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped-tls/scoped-tls-1.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.105.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.105.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.50.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha-1/sha-1-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-0.6.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha-1/sha-1-0.9.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha2/sha2-0.9.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.6.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/stable_deref_trait/stable_deref_trait-1.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/stacker/stacker-0.1.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stacker/stacker-0.1.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.17.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.3.crate \
@@ -121,12 +113,13 @@ DOWNLOAD="https://github.com/racer-rust/racer/archive/v2.1.39/racer-2.1.39.tar.g
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
-MD5SUM="ecf0c87669e5a70238b7a323d6c785ae \
+MD5SUM="7201bddba167326a18f329796d070ee8 \
         abc51f82118d86e83165ba87e2521e96 \
         f26a43d3bcc31a6e0a6fa649e32b04c3 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
@@ -134,27 +127,23 @@ MD5SUM="ecf0c87669e5a70238b7a323d6c785ae \
         142cb4b9a653e56e56311f0c883b8582 \
         7c6515c4b7f4c7723a3c6d1f07acc261 \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        a885637c56c780044d778f18420687cc \
-        95414d4f9c612bbe8a061dd2ff0bc519 \
-        4bd3c3b61fe602e6078615a491e5050a \
-        e502e6c6b0dca9c1ae2d99e92b26f645 \
+        c7fbaf61245dc847237ab7c72b3ee9ea \
         547dbf225c61b70c81f74f79a83affc9 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
         135f6d6306e50606f0475ada50c33ce2 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
         f48ac29c2c56d6476450dab08af8eb4f \
+        e0a69519ad697a923799407d8b01f7e5 \
         897911f15f349a357899045e6b0c04e0 \
         49b4b022e9fa4cc60376a79ecb39d04f \
-        7c90c5d981a715d9863d6bfcc984d6ed \
-        66912c6b316cfec144c4fbcbf59bf862 \
+        836bbd6315ea443caf33fe3394ea4991 \
         ff67cf2eb9668167782b8012d3b48e7b \
         6f6a2da3625c871ad764dad18af0b97b \
-        b00352aced738d455145117157604783 \
+        493a2f042d86baa5c6bac75202c64554 \
         82241b59d4b793d862900b62220cf05a \
         25e033b68503b1eb640318d93b08ccc2 \
         081ed755ceb8e0b7c78cffde40fd084d \
-        1aef0dd636d3ef234e4f035fc26c0069 \
-        916a6c827f4f0f64b7652bebf67d82e1 \
+        65cd30f86e785b77fd82e0693d126e26 \
         c3ec5977ecc0f6244ef3be87f5325e72 \
         de1228e571c94ef53ec4c21db57279ab \
         9927498754f34d2c215da2319a5ad7e8 \
@@ -168,21 +157,19 @@ MD5SUM="ecf0c87669e5a70238b7a323d6c785ae \
         fba3b040a55c01be7376d3dd5c4d4920 \
         09c2a456bd4064675a0c53ca70f5eea1 \
         ed2d6dbb4c04586444e1aef9d4b27d90 \
-        19466d8edb3c032438026125770b17f9 \
         f4fb30c478bff7ea5e52563db8608abc \
         61e508ca2eee543023c5e1ba777e5ede \
         b5cf10e268e8a3bee2de8a734104245e \
-        1496714cc54d3d97ec7c6d2060568852 \
-        0a41bf3e844ab5fb6dfeb42afeb50e75 \
+        fbc0f8f5473906bf26a1931703490034 \
+        f7c887063254436e24f201308ee5324d \
         124ec4f35274a0e9c1a4ef3dc0958643 \
         bdb38691302aeb63500e053919f5f0f7 \
         cad5d756bde12e98d82fc950fc9a0dc9 \
         09931e9b99240bb850c9e9c9ccb22668 \
-        797752fea1f2c8b458cf7383b61433c9 \
+        653e04baa68a4484b3b839c19221e474 \
         e8a7d203e73b7ab9cd3f6769fe4a1479 \
-        783499db4bc8bb10620a842c2f2d8d36 \
-        521a4741dd82cd5667e866400c7a8e4f \
         158c5ffb9d075be2a8fa088ae3e0915c \
+        378a6671eaefcc86d472ed11b01a756c \
         7c4bfd315ee9de1c1b2f2d56163567cf \
         cd6039ff311cf275ebc82ee4dea96ad1 \
         f6cebca4a4b7dbc6be9e00472b398549 \
@@ -197,39 +184,37 @@ MD5SUM="ecf0c87669e5a70238b7a323d6c785ae \
         d970b77df4375ae08279d6ce61600ad7 \
         526f5ebac8d794185afbc71959c5c968 \
         7344a18f4a154b52182a0bdedcbae55d \
-        e1229bea0ee72f5703c5fee0087d6148 \
-        5fb961de3fd87357083b70d96502e7ca \
-        e72c7c558c547747c7477ad081376de9 \
-        d5a64142886263bffd0856a1f550d9de \
-        2c65eaf20a2a33e49d2acc7c777ed5ff \
-        70818e459f379af84bb215e76988684b \
-        9c200a192b498291369228815a9cfb4b \
-        48464d214420122070171ba9ef02aef8 \
-        f2dbc7ae8d1fb22920a6aa96cda4dcd9 \
-        7b6d7b6f8dbdcd145c1f2c738ffc844e \
-        ff7a64c9b8f0a17db3c04706014bf4ab \
-        cb62c440262ec6b9d87fc99b783e2866 \
-        dc379ff11e78bbf3dda5a4e64e0be83c \
-        bc5f7a96b544dc0bbbb58513e7f61edf \
-        10030210e4b51fddb07a6efd27cac593 \
-        969eb2f453cc15d4f0436e10bc019d8d \
+        a4e900032fe89e98b454f016fb2268a2 \
+        ff94c9dbeef610b214ac6c67371a8d95 \
+        ef6fa83414ee321e1058a3620c03c36b \
+        844404fdd038353b75b5d46434286caa \
+        3e259fbf017176701c03e6f8e8bbb2d4 \
+        29cc4bd77ef7ffcecb03640a656b52a0 \
+        0fdf2c5d5eeaadd312b1194734f05bf8 \
+        61abfe25e14d5ed5d74412785930ae0c \
+        2581075a2cf7cbedc22db0b6083342d2 \
+        ac7161e0a3f224841b316abb654f0386 \
+        0a9890eb881047ad52b88a3baa74fd51 \
+        201cfcd9690cc8f015c33ac961b6f884 \
+        5fd8f94c1ddd7589af335bc0176d397d \
+        fe62029e251f255d3a874c50d3608154 \
+        16a98d2d4805043be084c8273e237fae \
+        86e158a128526d235a5664970567fd3f \
+        9d62f77c4ea52aca7b8b82dd5dac3a1e \
         7b1261ea730a9314bc9bcdf4a379bf98 \
-        2ed568738b13ab0fa2ac85a935e3f161 \
-        b595c6929fdc19615cc86bfd4a2f0d65 \
-        4d101ab24d14c54937c5f45ece8fad5f \
+        8ed219c6cc2c684abc2197c32ce40e01 \
+        dbf4b8881aa463eff6fb5aec5f1abb46 \
         9436ca5c7881b6e8f3caae39515498df \
         fc60e4ecd18db5e582b9e7dd19dd62e4 \
         b4a0a98a54439a5a37952c8879187ee3 \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        64111c20b69aa1532fb66b70c4660b55 \
         9f340031dada0fc1168826e25c283e56 \
         5134162b34de0aa912c0d64754ca8370 \
         b05bc089853d7c61da615700fe443778 \
-        b1cace2e0c87bbbf5753996e28016787 \
-        8984a241871c346716c1f46549907a9e \
-        51cdbc77f4b359baa519c19e32abe0a0 \
+        e7a85771ce04ac56299f6a16d85e5f73 \
+        1169ca455e0ed1ad583914fde79b9bce \
+        e1b37f2526a1f0eed9c0bda62b8095ba \
         a986c51d8a91f91704da0c440295640d \
-        3d0803ceabbb3dabbe3cce2d138def4b \
+        f7eea874be0ac423bd5d97e2ba9228a5 \
         781d4ccf5d04c98fa02af207a9639249 \
         8a227260b1b37a3672254267d22cb1e6 \
         bd5f9d9900731be1a4e4df05db231991 \
@@ -246,6 +231,7 @@ MD5SUM="ecf0c87669e5a70238b7a323d6c785ae \
         0f65fd26370e1fd67c8e8812cabea574 \
         e628ca8adb2b572bffb210f014656b6f \
         0eedbc32447f40b3045d6de3910b5415 \
+        8b01b016a9b6deebc1b43f296057efb5 \
         6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         db96b50050277bf05a3c68534bbb9586 \
         f1d4ff6943e35dc03ead31cca71edb30 \
diff --git a/development/racket/racket.SlackBuild b/development/racket/racket.SlackBuild
index 3134c4878c..a424d46f76 100644
--- a/development/racket/racket.SlackBuild
+++ b/development/racket/racket.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=racket
-VERSION=${VERSION:-7.8}
+VERSION=${VERSION:-7.9}
 SUFFIX=src-builtpkgs    # suffix of the UNIX sourcepackage
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/development/racket/racket.info b/development/racket/racket.info
index aea76e9118..0b7cfc47e5 100644
--- a/development/racket/racket.info
+++ b/development/racket/racket.info
@@ -1,8 +1,8 @@
 PRGNAM="racket"
-VERSION="7.8"
+VERSION="7.9"
 HOMEPAGE="http://racket-lang.org/"
-DOWNLOAD="https://mirror.racket-lang.org/installers/7.8/racket-7.8-src-builtpkgs.tgz"
-MD5SUM="52c264e23d68f2d627989ca29ba4f547"
+DOWNLOAD="https://mirror.racket-lang.org/installers/7.9/racket-7.9-src-builtpkgs.tgz"
+MD5SUM="be3b9ba2b5b5fb04b48cc6d2942f26a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/radare2/radare2.SlackBuild b/development/radare2/radare2.SlackBuild
index 257b11ef1e..d71755e830 100644
--- a/development/radare2/radare2.SlackBuild
+++ b/development/radare2/radare2.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=radare2
-VERSION=${VERSION:-4.3.1}
+VERSION=${VERSION:-5.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,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 COPYING* README.md DEVELOPERS.md CONTRIBUTING.md AUTHORS.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COMMUNITY.md CONTRIBUTING.md COPYING* DEVELOPERS.md 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/radare2/radare2.info b/development/radare2/radare2.info
index 5bf52bb2c0..855fabf081 100644
--- a/development/radare2/radare2.info
+++ b/development/radare2/radare2.info
@@ -1,8 +1,8 @@
 PRGNAM="radare2"
-VERSION="4.3.1"
+VERSION="5.1.1"
 HOMEPAGE="http://radare.org/"
-DOWNLOAD="https://github.com/radare/radare2/archive/4.3.1/radare2-4.3.1.tar.gz"
-MD5SUM="45db877ecd0a0bd4d83819eb9050ab17"
+DOWNLOAD="https://github.com/radareorg/radare2/archive/5.1.1/radare2-5.1.1.tar.gz"
+MD5SUM="5fa08e088e623792515deaa652601a99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="capstone"
diff --git a/development/reflex/reflex.SlackBuild b/development/reflex/reflex.SlackBuild
index 75fe744e8d..d2954ce964 100644
--- a/development/reflex/reflex.SlackBuild
+++ b/development/reflex/reflex.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=reflex
-VERSION=${VERSION:-2.5.4.20191123}
+VERSION=${VERSION:-2.5.4.20200715}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,11 +53,8 @@ rm -rf $PRGNAM-$TARVER
 tar xvf $CWD/$PRGNAM-$TARVER.tgz
 cd $PRGNAM-$TARVER
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Check VERSION in tarball, to make sure the version hasn't
 # updated. Nobody but me should ever see this error message (in the
diff --git a/development/reflex/reflex.info b/development/reflex/reflex.info
index 6baa9431c0..44a1d828f7 100644
--- a/development/reflex/reflex.info
+++ b/development/reflex/reflex.info
@@ -1,8 +1,8 @@
 PRGNAM="reflex"
-VERSION="2.5.4.20191123"
+VERSION="2.5.4.20200715"
 HOMEPAGE="http://invisible-island.net/reflex/reflex.html"
-DOWNLOAD="ftp://ftp.invisible-island.net/reflex/reflex-20191123.tgz"
-MD5SUM="6a9c65c637cd33f7832605a25b071e8e"
+DOWNLOAD="ftp://ftp.invisible-island.net/reflex/reflex-20200715.tgz"
+MD5SUM="864494e63fa8dec456fd5b55eb749ed4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/robotframework/README b/development/robotframework/README
index 1282951008..82582b87c6 100644
--- a/development/robotframework/README
+++ b/development/robotframework/README
@@ -5,3 +5,5 @@ testing approach.  Its testing capabilities can be extended by test
 libraries implemented either with Python or Java, and users can create
 new higher-level keywords from existing ones using the same syntax that
 is used for creating test cases.
+
+python3 is an optional dependency.  It is needed for Python 3 support.
diff --git a/development/robotframework/robotframework.SlackBuild b/development/robotframework/robotframework.SlackBuild
index 6f26c266e3..7d608173c4 100644
--- a/development/robotframework/robotframework.SlackBuild
+++ b/development/robotframework/robotframework.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=robotframework
-VERSION=${VERSION:-3.2.2}
+VERSION=${VERSION:-4.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,12 +71,16 @@ find -L . \
 
 python setup.py install --root=$PKG
 
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
 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 \
-  COPYRIGHT.txt AUTHORS.rst LICENSE.txt \
+  COPYRIGHT.txt AUTHORS.rst LICENSE.txt README.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/robotframework/robotframework.info b/development/robotframework/robotframework.info
index 57920ca33d..4cd3b84b57 100644
--- a/development/robotframework/robotframework.info
+++ b/development/robotframework/robotframework.info
@@ -1,8 +1,8 @@
 PRGNAM="robotframework"
-VERSION="3.2.2"
+VERSION="4.0.1"
 HOMEPAGE="https://robotframework.org/"
-DOWNLOAD="https://github.com/robotframework/robotframework/archive/v3.2.2/robotframework-3.2.2.tar.gz"
-MD5SUM="4a151bbf0e6438cf4e12ce3caad2b96c"
+DOWNLOAD="https://github.com/robotframework/robotframework/archive/v4.0.1/robotframework-4.0.1.tar.gz"
+MD5SUM="da573d28a8b2f832bb1e4242188caa75"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/ruff/ruff.SlackBuild b/development/ruff/ruff.SlackBuild
index 15e76edfc6..175a300a96 100644
--- a/development/ruff/ruff.SlackBuild
+++ b/development/ruff/ruff.SlackBuild
@@ -2,19 +2,41 @@
 
 # Slackware build script for ruff
 
+# Copyright 2020 Ruben Schuller
+# 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.
+
+# Previous maintainers copyright notice:
 # Written by Richard Ellis (rellis@dp100.com)
 
 # Released into the public domain
 # V1 - Slackware 13.37 - November 12, 2011
 
 PRGNAM=ruff
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -25,13 +47,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -41,22 +67,40 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip -o $CWD/$PRGNAM-$VERSION.zip -d $TMP
-cd $PRGNAM
+
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION
-mv ruff.tcl pkgIndex.tcl $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+cp -a \
+  formatter.tcl \
+  formatter_html.tcl \
+  formatter_markdown.tcl \
+  pkgIndex.tcl \
+  ruff-html.css \
+  ruff-html.js \
+  ruff-md.css \
+  ruff-yui.css \
+  ruff.tcl \
+  $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
+  LICENSE \
   ruff.html \
+  ruff_ruff.html \
+  ruff_ruff_sample.html \
+  sample.tcl \
+  release.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/ruff/ruff.info b/development/ruff/ruff.info
index 918373a898..ea888edfa1 100644
--- a/development/ruff/ruff.info
+++ b/development/ruff/ruff.info
@@ -1,10 +1,10 @@
 PRGNAM="ruff"
-VERSION="0.4"
-HOMEPAGE="http://woof.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/woof/ruff-0.4.zip"
-MD5SUM="8de7ca0f7642b923a0d1b5a11482d339"
+VERSION="1.0.4"
+HOMEPAGE="https://ruff.magicsplat.com"
+DOWNLOAD="https://sourceforge.net/projects/magicsplat/files/ruff/ruff-1.0.4.tgz"
+MD5SUM="b8ea073994095fee1bd9d63cfb07f092"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Richard Ellis"
-EMAIL="rellis@dp100.com"
+MAINTAINER="Ruben Schuller"
+EMAIL="sb@rbn.im"
diff --git a/development/rustup/offline_build.diff.gz b/development/rustup/offline_build.diff.gz
index 5617059415..f85a13afbd 100644
--- a/development/rustup/offline_build.diff.gz
+++ b/development/rustup/offline_build.diff.gz
diff --git a/development/rustup/rustup.SlackBuild b/development/rustup/rustup.SlackBuild
index 0f0fb1a7e1..53e51acebf 100644
--- a/development/rustup/rustup.SlackBuild
+++ b/development/rustup/rustup.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rustup
-VERSION=${VERSION:-1.22.1}
+VERSION=${VERSION:-1.23.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/rustup/rustup.info b/development/rustup/rustup.info
index 48c6e05ce1..3dcd5b8abd 100644
--- a/development/rustup/rustup.info
+++ b/development/rustup/rustup.info
@@ -1,209 +1,244 @@
 PRGNAM="rustup"
-VERSION="1.22.1"
+VERSION="1.23.1"
 HOMEPAGE="https://github.com/rust-lang/rustup"
-DOWNLOAD="https://github.com/rust-lang/rustup/archive/1.22.1/rustup-1.22.1.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/addr2line/addr2line-0.12.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aes-soft/aes-soft-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aes/aes-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aesni/aesni-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.13.crate \
+DOWNLOAD="https://github.com/rust-lang/rustup/archive/1.23.1/rustup-1.23.1.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/addr2line/addr2line-0.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler/adler-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aes-soft/aes-soft-0.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aes/aes-0.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aesni/aesni-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/anyhow/anyhow-1.0.33.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/async-compression/async-compression-0.3.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.49.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.53.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.12.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitfield/bitfield-0.13.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/block-buffer/block-buffer-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-cipher-trait/block-cipher-trait-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-modes/block-modes-0.3.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-buffer/block-buffer-0.9.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-cipher/block-cipher-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-modes/block-modes-0.6.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/block-padding/block-padding-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blowfish/blowfish-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-padding/block-padding-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/blowfish/blowfish-0.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/buf_redux/buf_redux-0.8.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bumpalo/bumpalo-3.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/byte-tools/byte-tools-0.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.5.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cast5/cast5-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.55.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfb-mode/cfb-mode-0.3.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.4.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.5.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cast5/cast5-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.61.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfb-mode/cfb-mode-0.5.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/circular/circular-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/clear_on_drop/clear_on_drop-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cpuid-bool/cpuid-bool-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crc24/crc24-0.1.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.32+curl-7.70.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl/curl-0.4.30.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curve25519-dalek/curve25519-dalek-2.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.38+curl-7.73.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl/curl-0.4.34.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/curve25519-dalek/curve25519-dalek-3.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/darling/darling-0.10.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_core/darling_core-0.10.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_macro/darling_macro-0.10.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder/derive_builder-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder_core/derive_builder_core-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/des/des-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/des/des-0.5.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ed25519-dalek/ed25519-dalek-1.0.0-pre.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/effective-limits/effective-limits-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.23.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ed25519-dalek/ed25519-dalek-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ed25519/ed25519-1.0.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/effective-limits/effective-limits-0.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.24.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/env_proxy/env_proxy-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fake-simd/fake-simd-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.18.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.3.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-channel/futures-channel-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-core/futures-core-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-io/futures-io-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-sink/futures-sink-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-task/futures-task-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-util/futures-util-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/generator/generator-0.6.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-channel/futures-channel-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-core/futures-core-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-executor/futures-executor-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-io/futures-io-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-macro/futures-macro-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-sink/futures-sink-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-task/futures-task-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-util/futures-util-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures/futures-0.3.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gimli/gimli-0.21.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.14.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/gimli/gimli-0.22.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/git-testament-derive/git-testament-derive-0.1.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/git-testament/git-testament-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/h2/h2-0.2.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/h2/h2-0.2.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/hex/hex-0.4.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/http-body/http-body-0.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/http/http-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/httparse/httparse-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper-tls/hyper-tls-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper/hyper-0.13.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/httpdate/httpdate-0.3.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper-tls/hyper-tls-0.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper/hyper-0.13.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ident_case/ident_case-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ipnet/ipnet-2.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/js-sys/js-sys-0.3.40.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/js-sys/js-sys-0.3.45.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/keccak/keccak-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.71.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.79.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libm/libm-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/loom/loom-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lzma-sys/lzma-sys-0.1.16.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lzma-sys/lzma-sys-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/maplit/maplit-1.0.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/md-5/md-5-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/md-5/md-5-0.9.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.5.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/mime/mime-0.3.16.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/mime_guess/mime_guess-2.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.4.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.22.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/native-tls/native-tls-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.34.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.35.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-4.2.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num-bigint-dig/num-bigint-dig-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-derive/num-derive-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-bigint/num-bigint-0.2.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-derive/num-derive-0.3.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.43.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num-iter/num-iter-0.1.41.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/object/object-0.20.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/object/object-0.21.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.4.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/opener/opener-0.4.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-probe/openssl-probe-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-src/openssl-src-111.10.0+1.1.1g.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-src/openssl-src-111.12.0+1.1.1h.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.58.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.10.30.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pem/pem-0.8.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pgp/pgp-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-internal/pin-project-internal-0.4.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project/pin-project-0.4.22.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest/pest-2.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_derive/pest_derive-2.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_generator/pest_generator-2.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_meta/pest_meta-2.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pgp/pgp-0.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-internal/pin-project-internal-0.4.27.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.1.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project/pin-project-0.4.27.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-utils/pin-utils-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pulldown-cmark/pulldown-cmark-0.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.18.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-nested/proc-macro-nested-0.1.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pulldown-cmark/pulldown-cmark-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.4.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.20.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/reqwest/reqwest-0.10.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/retry/retry-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ripemd160/ripemd160-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/reqwest/reqwest-0.10.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/retry/retry-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ripemd160/ripemd160-0.9.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rs_tracing/rs_tracing-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rsa/rsa-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rsa/rsa-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.17.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/safemem/safemem-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped-tls/scoped-tls-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework-sys/security-framework-sys-0.4.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.114.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.114.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.55.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.10.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.117.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.117.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.59.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_urlencoded/serde_urlencoded-0.6.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/sha-1/sha-1-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha2/sha2-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha3/sha3-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha-1/sha-1-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha2/sha2-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha3/sha3-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/signature/signature-1.2.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/simple_asn1/simple_asn1-0.4.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/spin/spin-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/stream-cipher/stream-cipher-0.3.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stream-cipher/stream-cipher-0.7.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.10.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.9.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/subtle/subtle-2.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.33.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/subtle/subtle-2.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.45.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/sys-info/sys-info-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tar/tar-0.4.29.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tar/tar-0.4.30.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/term/term-0.5.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror-impl/thiserror-impl-1.0.20.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror/thiserror-1.0.20.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror-impl/thiserror-impl-1.0.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror/thiserror-1.0.21.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/threadpool/threadpool-1.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-0.3.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-0.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-socks/tokio-socks-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-tls/tokio-tls-0.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-util/tokio-util-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.2.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.5.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.2.22.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.5.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/tower-service/tower-service-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/try-lock/try-lock-0.2.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tracing-core/tracing-core-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tracing/tracing-0.1.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/try-lock/try-lock-0.2.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/try_from/try_from-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/twofish/twofish-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/twofish/twofish-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/typenum/typenum-1.12.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-trie/ucd-trie-0.1.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-2.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.10.crate \
@@ -213,232 +248,267 @@ DOWNLOAD="https://github.com/rust-lang/rustup/archive/1.22.1/rustup-1.22.1.tar.g
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/want/want-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.63.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.63.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.63.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.63.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen/wasm-bindgen-0.2.63.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/web-sys/web-sys-0.3.40.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.68.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.18.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.68.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.68.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.68.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen/wasm-bindgen-0.2.68.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/web-sys/web-sys-0.3.45.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.6.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.7.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/x25519-dalek/x25519-dalek-0.6.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/x25519-dalek/x25519-dalek-1.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/xattr/xattr-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/xz2/xz2-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/zeroize/zeroize-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/zeroize_derive/zeroize_derive-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/zeroize/zeroize-1.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/zeroize_derive/zeroize_derive-1.0.1.crate \
           https://github.com/rbtcollins/home/archive/a243ee2fbee6022c57d56f5aa79aefe194eabe53/home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz"
-MD5SUM="216e3d37cf73896efa1d5690e4d80c36 \
-        25a74a8231216192a91e873cf05214dc \
-        8a679a0b3b17299c1b4d20781431e071 \
-        4b9c1b735db83c01c4fbfc5f85081147 \
-        a5cc55030cb8d87a0dfdad9a0103d4ec \
-        8c7b77031a5cbcf10d18b40c118a3f36 \
-        837ec91351db79aee59d6c96111460b0 \
+MD5SUM="5882392f38a484979844026f91ecc4ba \
+        936439213c803e7cc32c7910466952e3 \
+        c9d0c8f38c6686e47c29fe9b409c25c2 \
+        7d46c68f1cff11aa717a1ebfaa71de44 \
+        427c1b0430ebe6f922502c69af35f9cf \
+        3b072746a74f009f3fa885ad7462c9d5 \
+        d00e12a7f092ab591790a9a5323f72c0 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
+        fcab7f32ed3f030f616273151cc71a8f \
         042f9fe2e3b5ac9d381f00cf2251d279 \
         142cb4b9a653e56e56311f0c883b8582 \
         898079c1c795b5aa847169137918c7bc \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        96762c62b23169ec325ac300fb7d1ee7 \
-        bbaf2cabce203fecd54c0c294eb7fb2b \
+        c6443ec8d007c729ba5482008d0c864d \
+        a83ece347af514b01043c64ba6c93f6e \
         600137b12b6b717eec0f376bc6680540 \
         fb5d5c306d1dd0ecd2613b8ade78af61 \
         6799c26a7eacaf8e58d3e45c6c5add89 \
         a885637c56c780044d778f18420687cc \
-        1b442c013dfbb02eaa0576b03296f3da \
-        d177cfe6671b55abaf6219d266e4f004 \
+        c7fbaf61245dc847237ab7c72b3ee9ea \
+        7f380a16b8239e8344e16ebd99abdf94 \
+        7690faa1a56f87225d241f0289f56c4b \
         95414d4f9c612bbe8a061dd2ff0bc519 \
-        049ca1414e83ad6c2801f2a935c4ea18 \
+        3518756a1af12a80e9c872091cdec5d5 \
+        1692a6f6682375ffd30ca15230bb44f4 \
         5a075b6490fe21776e47653dd664658b \
         7f74a18288dd952887eb53f90404ea23 \
         4bd3c3b61fe602e6078615a491e5050a \
         e502e6c6b0dca9c1ae2d99e92b26f645 \
-        cbdfce0d178f454b8c8b2a9066251f77 \
-        6693805dd19c318bd9a9dcc4bf7c884b \
-        e9d9112d8404dadc4f2641513bf3136c \
-        ca28e1be1ca62751ed2faa130630f897 \
+        1d02fa9f0fca9470a24a05e7c155993d \
+        d123f33f646e37ca5b825ea6eb2dd150 \
+        83d091be0ca74e645cbd0e6b0ac6a918 \
+        87343079a03b28726b323c5c40c9167c \
+        f4a2a1134c7dc7f54161f6c003e69098 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        372b0092eb56ebfa98956f810f148610 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
         6020ef596fbfe810a0071b72aa72795d \
-        42af3a1e965585d80dcc1e0324fda6eb \
+        bc79e0eb364df515a33755ac9a581cfd \
         a5062f2992a4d2b79952f4fa4c4582fa \
-        bf6400d68b678d4deedcf4b4d0695e71 \
-        521cdd4682315b0e822cbfc9009aa83b \
+        9754db1eb3e8b15807f05a3540d2ab39 \
+        f0682cfdc40af509c98f46f6350c1ba5 \
+        e0a69519ad697a923799407d8b01f7e5 \
         e3907f1e3ff298226c57ba1e7cb5263b \
         3c153e21729b743f5127dec47670de17 \
-        1fd2386fd5e1f175d56f5ab65bed81d3 \
-        85e02ddf79a54a58972f5a1debb10e66 \
-        ab6a4a2938d528346f5e5ce12d21d3eb \
+        093c5099d3cef0f418550fe28788d34d \
+        897911f15f349a357899045e6b0c04e0 \
+        49b4b022e9fa4cc60376a79ecb39d04f \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        543431d800b35ee976e9d4c46a92e0b9 \
+        41438ce28ee3293a54857d3965de9ca8 \
+        ce71db4e5a1aa04f76867418fe657107 \
         a42201f337a8d7cd51aae9e5ecad91f0 \
         b1c8b47b8fc9077b6a6aadc47c819115 \
         5663ea952316dfff411bc1ef78c1979d \
         a9045fa57c1e4ed702e51da973b658cb \
         2ff8927b9cc3e6bcec18745859808751 \
-        f8bc817d179fa4f7c4c1133c1c1a8659 \
+        fe3f95491007d600a82efb1a7f52e6cd \
         b00352aced738d455145117157604783 \
+        493a2f042d86baa5c6bac75202c64554 \
         cb752f0454c59d6effa9409f18a9a9b7 \
-        0042e9d57f5570fd80b64f4ca78ba6e0 \
-        d57f7b62cad22618967902c82b0c80ce \
-        cba3538d5dac64d269dda867ba6c5011 \
+        30b0b5e6c6f6081f52fc5a1dddcfe4e1 \
+        76a70864a76f97183625654fb0802d99 \
+        049fc47f174d16dd6e3146989465d915 \
+        b4e2b229c362ad0dd313ff631816d5db \
+        f5f31a119d0ddf7457de89d87b07f3ba \
         249636a8c8e57527d0e72ae772df5acd \
-        e40f8ca2f829fb9f88a1c6578cb531ef \
-        e0f2cb8a84777de3cf3ab813b96f42f6 \
-        2fe508e60645a30eeed34748e278bd3b \
+        da699c4c8e4c153cbdb9fb0ef3fb3056 \
         1aef0dd636d3ef234e4f035fc26c0069 \
-        b9f03f84345e22eae7858abc75dea31c \
-        5941f4a3d3435767e79260f61093ecd3 \
+        b27f43a2e95dbc4f309b5b94b60e837d \
+        14cfb04bc2786abe846e99276c1e604c \
         8dab3b3ec00dc56cffde0b0c410d47b5 \
         667e86b8b8d96ab4e9605627ce7dcc9a \
         78c898fdaa3968e23904bf8538c4a271 \
         54cfab480b7a5f7302eadf44129d3f4b \
         dd7c80c2d04d2e9ceba82826cf69764d \
-        e3b07d31dc7a11568d2a9530fe4251d1 \
-        4554d3a0b77373fba853c413f30d6f59 \
-        1be22726ca03cdeb68635c3501ae7338 \
-        f3370df5ab2b2aa2522877c2f9c10e40 \
-        fa318418d9fc6e69f420e8336278b741 \
-        f33946641991cbb65f107ce0223987f2 \
-        b4b83b7327b7332e519c7728800ed5ea \
+        5bf449f34f747327ed2de59e39b01a20 \
+        733e0c71f1002aef9b9058df0da73da9 \
+        dd0607248e69dbdf0fa8b203a38dc9af \
+        719821cd3e8f92f01542fd1a1095d6e0 \
+        20cbf784cca49e4a942c11155f0cf156 \
+        001d06128d687db6abd19399e64096d8 \
+        36eef9a2238eb2761186d39369a2dd57 \
+        fa0d41f7776fc2b927ef01d0296f7c52 \
+        62cea631e104f992003b1b312d975750 \
         916a6c827f4f0f64b7652bebf67d82e1 \
-        de1228e571c94ef53ec4c21db57279ab \
-        3b292e94713350e991d41c30a489634b \
+        65cd30f86e785b77fd82e0693d126e26 \
+        704babd757a22f163230a36fa5474890 \
+        e3ac3f5ba49f6eee65b033f549f5abf1 \
         c5d606afb4249cd8c668d410e9b5f054 \
         07d4cad96f7bab84c2ec1a29ea0f2bc2 \
-        eab575df1f3753767d822aaa9c9d6467 \
-        0c3e4c82f86bc64d11f0bf0ec06bfa81 \
+        37b2d7478688c6a9b1f86fbde3f17a19 \
+        58285dfb5134c5df5503066a20dc9d2c \
+        553b325a602b701eb7eaef228e69d0f2 \
         139e82145454c3890131417576dd0b97 \
         0181369fc9db8aa137e427c1f4559b4f \
         1c9eb415ab7f61e8ed5087ad88038878 \
         2399dfc187794c0016997cc48327d6a7 \
-        9f4de44f550c08554338d793d7c60c1e \
-        11f29f121bd549854fd0a67e4fe21ec1 \
+        76a32998a25cedabfc01b591b5aff211 \
+        8644302a0971f0a59c5a10332869f533 \
+        02ce273a6067ae7f984c13585eab9f47 \
         fe77a3f609b6fd8d5b08f3b2ef14d2ad \
         54ac4c56d9ec2800b8428020f24be67c \
-        44a9cdb1637be9c1631d8976692ceaf4 \
+        bb43d4a3ffb3066ac416c9bae771b001 \
         f1c40b9836035b69e464df711a1d2950 \
+        4da5fc847652b5abf716369930b6dd0a \
         396bc88987f4bc192f975d94cdf326c7 \
-        6a28248817735541cadae1401a5af69f \
+        95bc414a57e9b5cf0b13be83a64a7334 \
         dd9ddd25c1fd24dae39d732389c7350f \
         9d033cc2daa6924420a4a89e6705773f \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        0a258dcd990afe3d83e0c103edd7f095 \
+        7aef65438636d8662cd61e77c42c28f0 \
         5b23904f9579d1efd0e914257517eeb5 \
-        8a79353ba205d0a86f695053dd4d15be \
-        61e508ca2eee543023c5e1ba777e5ede \
-        2fb5b5f4b467dc00174e2f330fff2f56 \
-        3674d9cf648b32f19e53c79b21a97b5d \
+        e5768043e447a7423f030c1394440502 \
+        f50d2e280b4a3491fffda43b90982544 \
+        71ac456d8737d5cbe37872a0744336f8 \
+        47580fad08273a52e998f84ef404912e \
         7916dcd738a8fa6a2798754c20d6e146 \
-        1496714cc54d3d97ec7c6d2060568852 \
+        b5cf10e268e8a3bee2de8a734104245e \
+        fbc0f8f5473906bf26a1931703490034 \
         124ec4f35274a0e9c1a4ef3dc0958643 \
+        5d9532411dde9442741983efd0961351 \
         a362e890dd0dfe51ecd95a4a1be6e28c \
         f7bde0c2e5fd9542f7ccb5e6fc40eb04 \
-        db1ea84c5ee1938888b78e4050dd5cfd \
+        c291ac2f4465c030c058a7c1bc595783 \
         e820082de1cf13e1111d2acbae898fcc \
         a82e0b9efe7f6385071c9fd9b3bccfa3 \
         98731fbefe42841dce239a8e8064431d \
-        683a998da434a7ff8558bdf6eaa7b8c7 \
+        437a18bacffd4e141cd4ed3c6a16a448 \
         92bcd45a654d9e24c86f3465c6387c47 \
         120eca90d4b29e71b33e2527fb9ff8a2 \
-        fde25b4b3d49ec466335f2a6fab7a8d5 \
+        6b1db46a36bc0dc590270d2c952d30c4 \
+        709d9cbdd5462dacdd1439c19e036df6 \
         759816fe5b617674ae5dee83e3c3e6e2 \
         05d11031bec5456993601f9f660b37fb \
         2daa59d0efd38e9b5fbb2658b080eaa1 \
         c36d452e37c73b1e99f40bae18cddfdb \
-        22d284a6253f4fd9b34ae40ff88f57f8 \
-        539ac00d7f70684e55b02c4bd955f65b \
+        26abbfd602eaf92956306a4a2d5f1555 \
+        a37a5b604bc2fd746aaa12623bab6154 \
         797752fea1f2c8b458cf7383b61433c9 \
+        653e04baa68a4484b3b839c19221e474 \
         ceef2a7834bdaa9fb2226366aa729591 \
         0fb8f799f959c69991d54556c5457068 \
-        dce42be9eaf8423dc88a83d5ef79625c \
+        57230f576c93046e708d3afcff7ac682 \
         48067cc7d8ace5851af5f3ea557fee17 \
         589eb9c74cd6b5fc5098c6fd6fb62647 \
+        cdc38b4d2a7a460942eff8d4c1056037 \
         f490982aceabdbd515348f63e638a782 \
-        a45cb61c15e24864bcfd02e2249b937b \
-        58c6c5da003c21880ae1c7d0509cdfb3 \
-        62e9fc18f293722fdded066f34714585 \
-        eb1cb7f6e8d95b7d516b2d730143183d \
+        37cf6acd1c3259eefeba636e4cc9b365 \
+        43e97206d08bfd1a23b2ed01fba95c69 \
+        0cf1fcdb3e8eab7001792f4916516fc2 \
+        222d8ac7246a639ff9858d12cbb40e54 \
+        3ad0a5f352fb5c7e193506202d882a31 \
+        585d3da3270d0e62a4ce54c7276cf5f6 \
+        9ccf1278c6126b1df7dbc717394cca8c \
+        3e5a1385aee77fb5fbf4129528084870 \
         07c75fec267864bcbb800ca7709ceae2 \
-        d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        d8bd5a8204fe41dc04b344884b55381b \
-        fc4118a91764a0ab8abd01d1b97cece3 \
-        6232cd368a13f8852b07289681f142ff \
+        448bc61aee07661464d98da7660e9a1d \
+        6e13d1e2274baa18cf4522279dd6721a \
+        55421a32e9d74018f1f0e94ba6e3702f \
+        733815b52a600ff8b7d3998aa79e03d6 \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        9f289f970967e3b2a31b2eb7220eedd8 \
         63b29211eef9ccee0b0401d423db0efd \
         66d1cb32dce999907409f636f004b884 \
         0a80ed36a125ac3cdfa09f8707055873 \
         a0f55fda89c0f97784edb18f4c253a49 \
         b269356e8646f3184a0e8d52a58cee69 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        24118e5657591c6f208dbb1d77fbc482 \
-        eee136546e9f4735577dd20f45727c69 \
+        bdce8d6ae27394b8e0334d7b1152582b \
+        5ceb2f0194476fd7a5f603646690a29e \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        c0e4e83c5ae5f75f410559f7ab3d39fa \
+        a9ba533889383bc3cb9999ec7dc06a5c \
         0538d1da369f3e3f0412aa4d735c1b61 \
-        fc7bf55318c1ff2249d50bccf2c09de4 \
-        521545b7c5ffa195fe5faa15f092d80f \
-        c80779193e4db6142d498549c9213557 \
+        51eb242fd079afc9400f147e7d11c0b4 \
+        00b10c492d7db25f5b35bb8678ac8416 \
+        6b894f9d89fc01cf34d29be641bc8165 \
+        1a9c01bcae65d16b4c0d86b94feaff37 \
         77e2941b1ce8d056c64f3e19f51841a1 \
-        1dc40cc1cddaecbda2abe7add9722746 \
-        94136c77f70313d3162e031638fc67ed \
-        4d101ab24d14c54937c5f45ece8fad5f \
+        600892c4fc94a822b3b4c2a67c2994dd \
+        92b8a0995da03e23755c7dbe14bf585b \
         a69721c73263cd2040e1a5f120b03a6f \
         994b165f971ecfc09dc13fca8d394691 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
         f505a218806e44b2369671089d65e839 \
-        aa66bbfd8cd16850fc54f0de89a79ac2 \
         b4a0a98a54439a5a37952c8879187ee3 \
         1024ac462fe90a1d7882a6911bd70604 \
         9e0c7fedb6287e5090bab920da5c1d09 \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        64111c20b69aa1532fb66b70c4660b55 \
-        ac0e15851ba9d041a68ee01ac624f081 \
-        fc832a688af624c472465d3ed7ffc282 \
-        d5949afb81711077548cd307438ee30d \
+        62cde3def3d803cca1b9f289dc8a706b \
+        d2cc4e584ed64165fc56d2c9081eb3ee \
+        00abb3f999c030c8af5aa0d54f776ac9 \
+        622e004624817a6eca1813fbdbebd14c \
+        ec28f372c4d58457baac31b017b83ab9 \
         48d4ca11f30e1976378c7f84854db36a \
         b1cace2e0c87bbbf5753996e28016787 \
-        9440c2bedf3748dbcdd897e9f756a974 \
-        1e7c9e52b0baba424a3da0dc5e333656 \
+        63e6e7a51fcd87f35d8bcd765f063ec6 \
+        000c9031f679bf9c392dafa59c134199 \
+        de374287376044dd32adb628b56c97e9 \
+        e766dc347b780066e0a9ce26a8c12041 \
+        3f735228da6e466b5c2cd73e73ca3830 \
         c7bfa89e6da163f1474bb3787987bb12 \
-        079297fc0fb968f749368577d9131549 \
-        77db363940fc8039d4389406375031d0 \
+        51cdbc77f4b359baa519c19e32abe0a0 \
+        891d3003b44db446e06eb128b86d6437 \
         422ea23fbfe5bff61f519d960647ebf8 \
-        4f95faebbd6f757ff4be7131930c7a2a \
+        15268348667e153a9d7a67112a71073f \
         82d98dc87dc8503400aa095f5aa70f13 \
         781d4ccf5d04c98fa02af207a9639249 \
         90253ab52670a0551a533eb78a1f6b10 \
-        56199481065bceb8518b04c8ea24e876 \
-        4ee1b2e274a3e790560dc1781d225861 \
+        25328253cc37e62ee63c6b2c88589862 \
+        6de09edb5f593f009ed5b6f021ca3bef \
         09f09b3f56045183393726a31d8a0192 \
         afc6a60faadff5a3b18fcdd64edb38f5 \
-        6008b124ea54c3c5b688228d970b0eaf \
+        121d3ebcac6f4b6687ddb2f733effac2 \
         bb3ae104a9fa1b31568cc98c920a4653 \
         019b9ca883a71e25e109e49d8cf779d1 \
         a8de006fe0c7e373c560dd51599287a8 \
-        beabdc8d600943dbf46d6c39a73b7b1b \
-        00ecc8ec68a0c63c134d24b6b1890d7c \
+        ec26f649159c08967f00cfd69ef10fbd \
+        cb4f342515e66eca045baf40471a1697 \
         a5dd75e77c7324f5c1d2d372c990d0a7 \
         192229a7b481a4becf170d8a34528739 \
-        9d66208e00715217a8c1f2e40efe4a0c \
-        34add515c13318e0c661956f6590387e \
+        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        253a33d4577293cbeb852f14069b4a84 \
+        578f4f7d98bd4079c8cffb1de0d5f228 \
         a6ee95c895582a773a5ee6aa7251581a \
         bf41c63b7f486045605d856c0658d31b \
-        0cbd71de65c98e60358c17046d35f10e \
-        2e99b7fe9fc50def58bf0b391c149b1c \
+        4d130fad86abe7c08cddf9275e031bd6 \
+        81bf25626c453f06c8e5f74c9ec1edcd \
         3a8b96cbb6a0e4b3e7e9a915f5825e33 \
-        6514dcb2766ebd1ed2c6dd77a851d53e \
+        522b61f7089aae98faebc744712d608b \
+        86d9b65cfee7b9715c7d30504f7e7769 \
+        e876964c7b83db85fb7897bee7ad0f45 \
         0c869ecf1f365d9eb5e39e6a65771b64 \
-        ca10cb6a9370a813ce044661d5ebc999 \
+        3760ecacb9e0b3b9451fbf8c4571e909 \
         55927226b06f62ccbd2890269d68c2fd \
+        6cae4969689ecc3b4b4c31a9fb9539a6 \
         36cbce768155bdac8934efa262d75fe3 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
         c3be058b692f0e9b25a3219b7b5d940c \
-        0f65fd26370e1fd67c8e8812cabea574 \
+        4272c279b06b88f8b0ffce7109348e27 \
         a51c43692084979295641a7ffba4b297 \
         81821d39675a1f584546b9920e5d6b5d \
         bff823ec07c5fbcc3e425c9c9e4b38a6 \
@@ -448,28 +518,28 @@ MD5SUM="216e3d37cf73896efa1d5690e4d80c36 \
         6708629acf3d2ecb7404e43255d2df85 \
         1092a4a24e80f8856efc71af51a06114 \
         e334c03160b1e0989c2a71ca55f631fc \
+        a312b55a428f827a91097d1d8497b02b \
         6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        815329ce353fccb0c78d35519ab9bf69 \
-        53e04cc21f76fa75f8503eecc27a8610 \
-        a7e6723e9a18d5a9efeecc5373b0666c \
-        50e01bc85b891af61767d72eb2e63e2b \
-        502669eb6fac093f3d7ac556888e87f3 \
-        26d5ce7757857fe4151b94c2da20b88e \
-        a62b8f58f80a8691aec64d41d860f148 \
+        ea64dab9222df04ce5694b58ca6ca8b1 \
+        2f8537446ddddc988a6c6f7e638e9302 \
+        d51510d846405b6f50b28e7f4adceee3 \
+        cea2ab386e9cfc2f526693246f944eef \
+        106e83bfd35eb2b8c5ab24219bcc09d5 \
+        cba9ec74557028e2750e2cd633799db5 \
+        c9437ccb4ff091ea4b284e2269255ca7 \
         c900e7dbce808ff8ced375077b17a163 \
         db96b50050277bf05a3c68534bbb9586 \
         b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
         b44489eb4799c4fabac3fceb48de54f7 \
         0498c4a11448bfc35dc7bb2caa64c753 \
-        e01f3a4b5c3690899e5975c90bf12174 \
         87296707bae851dfed096d30ae254334 \
         38346bab0933c9eb1e36d22fe4220ba7 \
-        17633652957fbc1f31b5ada5d0ace6e9 \
+        00fe128ed361d7cb74d94c97664c3ead \
         5f4fb35a401a86e42e8f99f32848e36e \
         472e49200cc7c092f99f95464646a3bc \
-        13fe6f61f995be7a5f0210a8d4fdf44a \
-        f55616bcd5df242fb56930f7fe23f637 \
+        12c058b0b34101fb084536ba8298d85d \
+        9f2ecb349c4d62c36b34e250f66d8e31 \
         fea3d050662a6dd36f4a22aade3594f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/samurai/README b/development/samurai/README
index 27a71ab071..50767754e0 100644
--- a/development/samurai/README
+++ b/development/samurai/README
@@ -1,10 +1,10 @@
-samurai is a ninja-compatible build tool written in C99 with a focus on
-simplicity, speed, and portability.
+samurai is a ninja-compatible build tool written in C99 with a focus
+on simplicity, speed, and portability.
 
-samurai implements the ninja build language through version 1.8.2 except
-for MSVC dependency handling (deps = msvc). It uses the same format for
-.ninja_log and .ninja_deps as ninja, currently version 5 and 3
-respectively.
+It is largely feature-complete and supports most of the same options
+as ninja.
 
-It is largely feature-complete and supports most of the same options as
-ninja.
+Many SlackBuild scripts allow setting the NINJA environment variable
+to use samu instead of ninja.
+
+  export NINJA='samu'
diff --git a/development/samurai/samurai.SlackBuild b/development/samurai/samurai.SlackBuild
index 19d1d9623f..8d505c095f 100644
--- a/development/samurai/samurai.SlackBuild
+++ b/development/samurai/samurai.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for samurai
 
-# Copyright 2018-2020 Hunter Sezen California, USA
+# Copyright 2018-2021 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=samurai
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,9 +69,8 @@ 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 {} \;
 
-make CFLAGS="$SLKCFLAGS"
-
 make install \
+  CFLAGS="$SLKCFLAGS" \
   PREFIX=/usr \
   MANDIR=/usr/man \
   DESTDIR=$PKG
diff --git a/development/samurai/samurai.info b/development/samurai/samurai.info
index 3594a6358d..0ed81df68c 100644
--- a/development/samurai/samurai.info
+++ b/development/samurai/samurai.info
@@ -1,8 +1,8 @@
 PRGNAM="samurai"
-VERSION="1.1"
+VERSION="1.2"
 HOMEPAGE="https://github.com/michaelforney/samurai"
-DOWNLOAD="https://github.com/michaelforney/samurai/releases/download/1.1/samurai-1.1.tar.gz"
-MD5SUM="5e8578e2950145a2e766156f0f9dcec2"
+DOWNLOAD="https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz"
+MD5SUM="3ad6771de19a93660fdb36dc67687727"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/sbcl/sbcl.SlackBuild b/development/sbcl/sbcl.SlackBuild
index 235cd4233c..01e78bc49b 100644
--- a/development/sbcl/sbcl.SlackBuild
+++ b/development/sbcl/sbcl.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by Eugene M., <damagedone at gmx dot com>
 
 PRGNAM=sbcl
-VERSION=${VERSION:-2.0.7}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/sbcl/sbcl.info b/development/sbcl/sbcl.info
index 83788c31b9..13978ef814 100644
--- a/development/sbcl/sbcl.info
+++ b/development/sbcl/sbcl.info
@@ -1,8 +1,8 @@
 PRGNAM="sbcl"
-VERSION="2.0.7"
+VERSION="2.1.3"
 HOMEPAGE="http://www.sbcl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.0.7-source.tar.bz2"
-MD5SUM="c8a748ed49059cf3830efa99fcf7107f"
+DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.1.3-source.tar.bz2"
+MD5SUM="f96e5a4e48e3812cf78fb2559b0fd088"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/sbt/sbt.SlackBuild b/development/sbt/sbt.SlackBuild
index 89a9d5b91e..dd684270ff 100644
--- a/development/sbt/sbt.SlackBuild
+++ b/development/sbt/sbt.SlackBuild
@@ -1,11 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for sbt
-
 # Written by Ben Mendis <ben.mendis@gmail.com>
+# Updated by Julian Grinblat <julian@dotcore.co.il>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted..
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License
+# along with this program (most likely, a file named COPYING).  If
+# not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=sbt
-VERSION=${VERSION:-0.13.7}
+VERSION=${VERSION:-1.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -27,20 +45,25 @@ tar xvf $CWD/${PRGNAM}-${VERSION}.tgz
 mkdir -p $PKG/usr/share/sbt/bin
 cp sbt/bin/sbt-launch.jar $PKG/usr/share/sbt/bin/
 chmod 644 $PKG/usr/share/sbt/bin/sbt-launch.jar
-cp sbt/bin/sbt-launch-lib.bash $PKG/usr/share/sbt/bin/
-chmod 644 $PKG/usr/share/sbt/bin/sbt-launch-lib.bash
+cp sbt/bin/java9-rt-export.jar $PKG/usr/share/sbt/bin/
+chmod 644 $PKG/usr/share/sbt/bin/java9-rt-export.jar
 cp sbt/bin/sbt $PKG/usr/share/sbt/bin/
 chmod 755 $PKG/usr/share/sbt/bin/sbt
+cp sbt/bin/sbtn-x86_64-pc-linux $PKG/usr/share/sbt/bin/
+chmod 755 $PKG/usr/share/sbt/bin/sbtn-x86_64-pc-linux
 
 mkdir -p $PKG/usr/bin
 cat $CWD/sbt.sh > $PKG/usr/bin/sbt
 chmod 755 $PKG/usr/bin/sbt
+cat $CWD/sbtn.sh > $PKG/usr/bin/sbtn
+chmod 755 $PKG/usr/bin/sbtn
 
 mkdir -p $PKG/etc/sbt
-cp sbt/conf/sbtopts $PKG/etc/sbt/
+cp sbt/conf/sbtopts sbt/conf/sbtconfig.txt $PKG/etc/sbt/
 chmod 644 $PKG/etc/sbt/sbtopts
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp sbt/LICENSE sbt/NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/sbt/sbt.info b/development/sbt/sbt.info
index c127102ba7..f71d2faafc 100644
--- a/development/sbt/sbt.info
+++ b/development/sbt/sbt.info
@@ -1,10 +1,10 @@
 PRGNAM="sbt"
-VERSION="0.13.7"
+VERSION="1.4.7"
 HOMEPAGE="https://www.scala-sbt.org/"
-DOWNLOAD="https://dl.bintray.com/sbt/native-packages/sbt/0.13.7/sbt-0.13.7.tgz"
-MD5SUM="12fef0be717dc8c91687072dd7995a02"
+DOWNLOAD="https://github.com/sbt/sbt/releases/download/v1.4.7/sbt-1.4.7.tgz"
+MD5SUM="728ac89b1ab916825e4cb41f9ad4f08a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Ben Mendis"
-EMAIL="ben.mendis@gmail.com"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/development/sbt/sbtn.sh b/development/sbt/sbtn.sh
new file mode 100644
index 0000000000..94bda4ade5
--- /dev/null
+++ b/development/sbt/sbtn.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec /usr/share/sbt/bin/sbtn-x86_64-pc-linux "$@"
+
diff --git a/development/scala/scala.SlackBuild b/development/scala/scala.SlackBuild
index bcadfed98b..a4db3ae514 100644
--- a/development/scala/scala.SlackBuild
+++ b/development/scala/scala.SlackBuild
@@ -7,7 +7,7 @@
 # Updated by Andre Barboza <bmg.andre@gmail.com>
 
 PRGNAM=scala
-VERSION=${VERSION:-2.12.3}
+VERSION=${VERSION:-2.12.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/scala/scala.info b/development/scala/scala.info
index 1b9d7f9d32..391d21c19a 100644
--- a/development/scala/scala.info
+++ b/development/scala/scala.info
@@ -1,10 +1,10 @@
 PRGNAM="scala"
-VERSION="2.12.3"
+VERSION="2.12.13"
 HOMEPAGE="https://www.scala-lang.org/"
-DOWNLOAD="http://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.tgz"
-MD5SUM="68ba79e2172fc1ab8120fe6c615a2713"
+DOWNLOAD="http://downloads.lightbend.com/scala/2.12.13/scala-2.12.13.tgz"
+MD5SUM="04d06bb0a4f22e7e5a429bb22a7371c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
+MAINTAINER="Alessandro Vaccaro"
+EMAIL="0x7a6@libero.it"
diff --git a/development/sdcc/patches/source-tree.patch b/development/sdcc/patches/source-tree.patch
index 93c2798f75..521adef57c 100644
--- a/development/sdcc/patches/source-tree.patch
+++ b/development/sdcc/patches/source-tree.patch
@@ -1,10 +1,10 @@
 diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
 --- a/device/lib/Makefile.in
 +++ b/device/lib/Makefile.in
-@@ -599,19 +599,11 @@
- 	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 ez80_z80 r2k r3ka tlcs90 gbz80 hc08 s08 stm8 pdk13 pdk14 pdk15 $(sdcc_libdir)/src
+@@ -623,19 +623,11 @@
+ 	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 ez80_z80 z80n r2k r2ka r3ka tlcs90 gbz80 hc08 s08 stm8 pdk13 pdk14 pdk15 $(sdcc_libdir)/src
  
- 	for src in $(MODELS) ds390 ds400 z80 z180 ez80_z80 r2k r3ka tlcs90 gbz80 hc08 s08 stm8 pdk13 pdk14 pdk15 pic14 pic16; do \
+ 	for src in $(MODELS) ds390 ds400 z80 z180 ez80_z80 z80n r2k r2ka r3ka tlcs90 gbz80 hc08 s08 stm8 pdk13 pdk14 pdk15 pic14 pic16; do \
 -	  find $(sdcc_libdir)/src/$$src -depth \
 -	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
diff --git a/development/sdcc/sdcc.SlackBuild b/development/sdcc/sdcc.SlackBuild
index 8e6a39a06f..d98410a08e 100644
--- a/development/sdcc/sdcc.SlackBuild
+++ b/development/sdcc/sdcc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sdcc
 
-# Copyright 2014-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sdcc
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-4.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,9 +64,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-src-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
@@ -81,10 +81,6 @@ patch -p1 < $CWD/patches/source-tree.patch
 # Avoid creating empty man directories.
 sed -i '/(man1dir)/d' sim/ucsim/doc/Makefile.in
 
-# make considers device/lib/pic14/aclocal.m4 out-of-date and tries to
-# rebuild it using aclocal-1.16 which doesn't exist yet on Slackware 14.2.
-(cd device/lib/pic14 && autoreconf -vif)
-
 # Requires lyx, latex2html, possibly others.  Untested.
 if [ "${ENABLE_DOC:-no}" != 'no' ]; then
   enable_doc='--enable-doc'
diff --git a/development/sdcc/sdcc.info b/development/sdcc/sdcc.info
index 82b700329c..9aa42f7ae4 100644
--- a/development/sdcc/sdcc.info
+++ b/development/sdcc/sdcc.info
@@ -1,8 +1,8 @@
 PRGNAM="sdcc"
-VERSION="4.0.0"
+VERSION="4.1.0"
 HOMEPAGE="http://sdcc.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/sdcc/files/sdcc/4.0.0/sdcc-src-4.0.0.tar.bz2"
-MD5SUM="eac8f83af265dca1f3e4c79abcd43c6c"
+DOWNLOAD="https://sourceforge.net/projects/sdcc/files/sdcc/4.1.0/sdcc-src-4.1.0.tar.bz2"
+MD5SUM="83df8cd5b24c7dbb7c83c5fa0857b3f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/shc/README b/development/shc/README
index 560ad6f8c8..be04109cc4 100644
--- a/development/shc/README
+++ b/development/shc/README
@@ -1,16 +1,15 @@
 shc - Shell script compiler
 
-SHC is a generic shell script compiler. It takes a script, which is
-specified on the command line and produces C source code. The generated
-source code is then compiled and linked to produce a stripped binary.
+SHC is a generic shell script compiler. It takes a script, which is specified on
+the command line and produces C source code. The generated source code is then
+compiled and linked to produce a stripped binary.
 
-The compiled binary will still be dependent on the shell specified in
-the first line of the shell code (i.e shebang: #!/bin/sh or such), thus
-shc does not create completely independent binaries.
+The compiled binary will still be dependent on the shell specified in the first
+line of the shell code (i.e shebang: #!/bin/sh or such), thus shc does not
+create completely independent binaries.
 
-shc itself is not a compiler such as cc, it rather encodes and encrypts
-a shell script and generates C source code with the added expiration
-capability. It then uses the system compiler to compile a stripped
-binary which behaves exactly like the original script. Upon execution,
-the compiled binary will decrypt and execute the code with the shells'
--c option.
+shc itself is not a compiler such as cc, it rather encodes and encrypts a shell
+script and generates C source code with the added expiration capability. It then
+uses the system compiler to compile a stripped binary which behaves exactly like
+the original script. Upon execution, the compiled binary will decrypt and
+execute the code with the shells' -c option.
diff --git a/development/shc/shc.SlackBuild b/development/shc/shc.SlackBuild
index d3d52deceb..6b4798dfa2 100644
--- a/development/shc/shc.SlackBuild
+++ b/development/shc/shc.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for shc
 
 # Previously maintained by Roberto Metere <roberto <at> metere <dot> it>
-# Copyright 2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2017-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shc
-VERSION=${VERSION:-3.9.6}
+VERSION=${VERSION:-4.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/shc/shc.info b/development/shc/shc.info
index 5af3ba09dd..b7e1097352 100644
--- a/development/shc/shc.info
+++ b/development/shc/shc.info
@@ -1,8 +1,8 @@
 PRGNAM="shc"
-VERSION="3.9.6"
+VERSION="4.0.3"
 HOMEPAGE="http://neurobin.github.io/shc"
-DOWNLOAD="https://github.com/neurobin/shc/archive/3.9.6/shc-3.9.6.tar.gz"
-MD5SUM="da777637594be58caf33509d2ca0fbea"
+DOWNLOAD="https://github.com/neurobin/shc/archive/4.0.3/shc-4.0.3.tar.gz"
+MD5SUM="c3f7aef42f12bccd0a54db92e3946f4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/slibtool/README b/development/slibtool/README
index de43a122ff..6cf32a6c9b 100644
--- a/development/slibtool/README
+++ b/development/slibtool/README
@@ -1,17 +1,18 @@
 slibtool is an independent reimplementation of the widely used libtool,
 written in C. slibtool is designed to be a clean, fast, easy-to-use.
-slibtool maintains compatibility with libtool in nearly every aspect of
-the tool's functionality as well as semantics, leaving out (or turning
-into a no-op) only a small number of features that are no longer needed
-on modern systems.
+slibtool maintains compatibility with libtool in nearly every aspect
+of the tool's functionality as well as semantics, leaving out (or
+turning into a no-op) only a small number of features that are no
+longer needed on modern systems.
 
 This does not conflict with GNU libtool included with Slackware.
 
 To use slibtool instead of libtool export this to your environment.
   export MAKEFLAGS='LIBTOOL=rlibtool'
 
-This symlink should work in most cases by parsing the generated libtool
-to determine if shared libraries and / or static archives will be built.
+This symlink should work in most cases by parsing the generated
+libtool to determine if shared libraries and / or static archives
+will be built.
 
 To force building both shared libraries and static archives:
   export MAKEFLAGS='LIBTOOL=slibtool'
diff --git a/development/slibtool/slibtool.SlackBuild b/development/slibtool/slibtool.SlackBuild
index 5c9766dac4..a42787ec18 100644
--- a/development/slibtool/slibtool.SlackBuild
+++ b/development/slibtool/slibtool.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slibtool
 
-# Copyright 2017-2018, 2020 Hunter Sezen California, USA
+# Copyright 2017-2018, 2020-2021 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slibtool
-VERSION=${VERSION:-0.5.31}
+VERSION=${VERSION:-0.5.33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/slibtool/slibtool.info b/development/slibtool/slibtool.info
index 252142bdee..fe4bd36888 100644
--- a/development/slibtool/slibtool.info
+++ b/development/slibtool/slibtool.info
@@ -1,8 +1,8 @@
 PRGNAM="slibtool"
-VERSION="0.5.31"
+VERSION="0.5.33"
 HOMEPAGE="https://git.foss21.org/slibtool"
-DOWNLOAD="https://dl.foss21.org/slibtool/slibtool-0.5.31.tar.xz"
-MD5SUM="c420a3f5a34ae777777b2b18ed221f4f"
+DOWNLOAD="https://dl.foss21.org/slibtool/slibtool-0.5.33.tar.xz"
+MD5SUM="aa8e3343b5beac879fe063d9dc9f8773"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/sqlcl/README b/development/sqlcl/README
index f57556db54..d40229e1cc 100644
--- a/development/sqlcl/README
+++ b/development/sqlcl/README
@@ -1,11 +1,11 @@
 Oracle SQL Developer Command Line
 
-Oracle SQL Developer Command Line (SQLcl) is a free command line
-interface for Oracle Database. It allows you to interactively or batch
-execute SQL and PL/SQL.  SQLcl provides in-line editing, statement
-completion, and command recall for a feature-rich experience,  all
-while also supporting your previously written SQL*Plus scripts.
+Oracle SQL Developer Command Line (SQLcl) is a free command line interface for
+Oracle Database. It allows you to interactively or batch execute SQL and PL/SQL.
+SQLcl provides in-line editing, statement completion, and command recall for a
+feature-rich experience,  all while also supporting your previously written
+SQL*Plus scripts.
 
 You need an Oracle account and you must Agree to Oracle's download
-agreement before this can be downloaded.  You have to use a web browser
-to download it.
+agreement before this can be downloaded.
+You have to use a web browser to download it.
diff --git a/development/sqlcl/sqlcl.SlackBuild b/development/sqlcl/sqlcl.SlackBuild
index f02d105169..c999f917fa 100644
--- a/development/sqlcl/sqlcl.SlackBuild
+++ b/development/sqlcl/sqlcl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Oracle SQL Developer Command Line
 
-# Copyright 2016-2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2016-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlcl
-VERSION=${VERSION:-18.2.0}
+VERSION=${VERSION:-20.4.2.35.2359}
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -54,6 +54,7 @@ find -L . \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp $PKG/opt/sqlcl/README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/bin
diff --git a/development/sqlcl/sqlcl.info b/development/sqlcl/sqlcl.info
index fcdda8ae41..880f6cc166 100644
--- a/development/sqlcl/sqlcl.info
+++ b/development/sqlcl/sqlcl.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlcl"
-VERSION="18.2.0"
+VERSION="20.4.2.35.2359"
 HOMEPAGE="http://oracle.com/technetwork/developer-tools/sqlcl/overview"
-DOWNLOAD="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip"
-MD5SUM="840f08b3ae8dace7f9ab7dceec9b580f"
+DOWNLOAD="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-20.4.2.35.2359.zip"
+MD5SUM="371aa3d2ffaaa3bd2b6fa550eb3cb184"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/sqldeveloper/sqldeveloper.SlackBuild b/development/sqldeveloper/sqldeveloper.SlackBuild
index baaec951df..20e3d32639 100644
--- a/development/sqldeveloper/sqldeveloper.SlackBuild
+++ b/development/sqldeveloper/sqldeveloper.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Oracle SQL Developer
 
-# Copyright 2015-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2015-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqldeveloper
-VERSION=${VERSION:-18.2.0.183.1748}
+VERSION=${VERSION:-20.4.1.407.0006}
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/development/sqldeveloper/sqldeveloper.info b/development/sqldeveloper/sqldeveloper.info
index 2168fd9839..ec4e2cc270 100644
--- a/development/sqldeveloper/sqldeveloper.info
+++ b/development/sqldeveloper/sqldeveloper.info
@@ -1,8 +1,8 @@
 PRGNAM="sqldeveloper"
-VERSION="18.2.0.183.1748"
+VERSION="20.4.1.407.0006"
 HOMEPAGE="http://oracle.com/technetwork/developer-tools/sql-developer"
-DOWNLOAD="http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-18.2.0.183.1748-no-jre.zip"
-MD5SUM="ad45f9db2e81f866c778e357f6129e36"
+DOWNLOAD="http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-20.4.1.407.0006-no-jre.zip"
+MD5SUM="041709f01de2c6d176f37132089b61b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/tea/tea.SlackBuild b/development/tea/tea.SlackBuild
index 6418ecde40..66e4126f65 100644
--- a/development/tea/tea.SlackBuild
+++ b/development/tea/tea.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tea
-VERSION=${VERSION:-50.0.4}
+VERSION=${VERSION:-60.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,7 +91,7 @@ cp -f icons/tea_icon_v2.png $PKG/usr/share/pixmaps
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog \
-  manuals/* NEWS README TODO \
+  manuals/* NEWS* README* TODO* \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/tea/tea.info b/development/tea/tea.info
index 0cf5b3b6bf..f5479a9bc4 100644
--- a/development/tea/tea.info
+++ b/development/tea/tea.info
@@ -1,8 +1,8 @@
 PRGNAM="tea"
-VERSION="50.0.4"
+VERSION="60.0.3"
 HOMEPAGE="http://semiletov.org/tea/"
-DOWNLOAD="https://github.com/psemiletov/tea-qt/archive/50.0.4/tea-qt-50.0.4.tar.gz"
-MD5SUM="bd713fc3e3086b04175ccb00622616f9"
+DOWNLOAD="https://github.com/psemiletov/tea-qt/archive/60.0.3/tea-qt-60.0.3.tar.gz"
+MD5SUM="661bca198f706a054a9196267b1954dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/tidy-html5/tidy-html5.SlackBuild b/development/tidy-html5/tidy-html5.SlackBuild
index 6af8cdff96..1daf3b912c 100644
--- a/development/tidy-html5/tidy-html5.SlackBuild
+++ b/development/tidy-html5/tidy-html5.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tidy-html5
-VERSION=${VERSION:-5.6.0}
+VERSION=${VERSION:-5.7.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/tidy-html5/tidy-html5.info b/development/tidy-html5/tidy-html5.info
index 3414561338..d42fefd32e 100644
--- a/development/tidy-html5/tidy-html5.info
+++ b/development/tidy-html5/tidy-html5.info
@@ -1,8 +1,8 @@
 PRGNAM="tidy-html5"
-VERSION="5.6.0"
+VERSION="5.7.28"
 HOMEPAGE="http://www.html-tidy.org/"
-DOWNLOAD="https://github.com/htacg/tidy-html5/archive/5.6.0/tidy-html5-5.6.0.tar.gz"
-MD5SUM="85c8a163d9ece6a02fe12bc9bddbc455"
+DOWNLOAD="https://github.com/htacg/tidy-html5/archive/5.7.28/tidy-html5-5.7.28.tar.gz"
+MD5SUM="2a572befbf3610de6719506c338efabb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/tig/1016.patch b/development/tig/1016.patch
deleted file mode 100644
index 095efc9173..0000000000
--- a/development/tig/1016.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From dff2d346e9647fb55c4e0e381572ad1fe82b8715 Mon Sep 17 00:00:00 2001
-From: Kyle Anderson <kylea@netflix.com>
-Date: Mon, 8 Jun 2020 17:24:18 -0700
-Subject: [PATCH] Don't error if git tab completion is not available. Fixes
- #1011
-
----
- contrib/tig-completion.bash | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/contrib/tig-completion.bash b/contrib/tig-completion.bash
-index 5aef3fd8..54a40ec1 100755
---- a/contrib/tig-completion.bash
-+++ b/contrib/tig-completion.bash
-@@ -28,6 +28,9 @@
- #       is performed while the script loads.  If git isn't found
- #       at source time then all lookups will be done on demand,
- #       which may be slightly slower.
-+#
-+#    4) This completion file depends on git completion already being
-+#       loaded. Make sure git-completion.bash happens first.
- 
- __tig_options="
- 	-v --version
-@@ -93,13 +96,15 @@ if [ -n "$ZSH_VERSION" ]; then
- 	bashcompinit
- fi
- 
--# we use internal git-completion functions, so wrap _tig for all necessary
-+# we use internal git-completion functions (if available), so wrap _tig for all necessary
- # variables (like cword and prev) to be defined
--__git_complete tig _tig 
-+if type '__git_complete' 2>/dev/null | grep -q 'function'; then
-+	__git_complete tig _tig
- 
--# The following are necessary only for Cygwin, and only are needed
--# when the user has tab-completed the executable name and consequently
--# included the '.exe' suffix.
--if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
--	__git_complete tig.exe _tig
-+	# The following are necessary only for Cygwin, and only are needed
-+	# when the user has tab-completed the executable name and consequently
-+	# included the '.exe' suffix.
-+	if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-+		__git_complete tig.exe _tig
-+	fi
- fi
diff --git a/development/tig/tig.SlackBuild b/development/tig/tig.SlackBuild
index f5de4dfb48..27adcb5319 100644
--- a/development/tig/tig.SlackBuild
+++ b/development/tig/tig.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tig
 
-# Copyright 2014-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tig
-VERSION=${VERSION:-2.5.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,7 +70,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 sed -i 's|$(docdir)/tig|$(docdir)|' Makefile
-patch -p1 < $CWD/1016.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/development/tig/tig.info b/development/tig/tig.info
index 65a315bca7..773fb8d038 100644
--- a/development/tig/tig.info
+++ b/development/tig/tig.info
@@ -1,8 +1,8 @@
 PRGNAM="tig"
-VERSION="2.5.1"
+VERSION="2.5.3"
 HOMEPAGE="https://jonas.github.io/tig/"
-DOWNLOAD="https://github.com/jonas/tig/releases/download/tig-2.5.1/tig-2.5.1.tar.gz"
-MD5SUM="4d810b7de2dfc842ceeb8b8d88740f2c"
+DOWNLOAD="https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz"
+MD5SUM="ceec1ec9a93fd70de81a613c1b368631"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/tiled/tiled.SlackBuild b/development/tiled/tiled.SlackBuild
index 53c9d00ce4..89bdf16d13 100644
--- a/development/tiled/tiled.SlackBuild
+++ b/development/tiled/tiled.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tiled
-VERSION=${VERSION:-1.4.2}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/tiled/tiled.info b/development/tiled/tiled.info
index e65e7bd2c1..7dc537b885 100644
--- a/development/tiled/tiled.info
+++ b/development/tiled/tiled.info
@@ -1,8 +1,8 @@
 PRGNAM="tiled"
-VERSION="1.4.2"
+VERSION="1.5.0"
 HOMEPAGE="https://www.mapeditor.org"
-DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.4.2/tiled-1.4.2.tar.gz"
-MD5SUM="2c283b1081abb041da5697dd9b16e6f8"
+DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.5.0/tiled-1.5.0.tar.gz"
+MD5SUM="a3ddfa678903990692e6ddad1d11fa93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 qbs"
diff --git a/development/tkdiff/tkdiff.SlackBuild b/development/tkdiff/tkdiff.SlackBuild
index 046113c60f..c98cda8637 100644
--- a/development/tkdiff/tkdiff.SlackBuild
+++ b/development/tkdiff/tkdiff.SlackBuild
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tkdiff
-VERSION=${VERSION:-5.0}
+VERSION=${VERSION:-5.1}
+SRCVERSION=$( echo $VERSION | tr . - )
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,9 +35,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-TAR=${TAR:-unzip}                  #tar xvf
-SOURCE=${SOURCE:-tkdiff-5-0}
-TARFILE=${TARFILE:-tkdiff-5-0.zip}
+TAR=${TAR:-unzip}
+SOURCE=${SOURCE:-$PRGNAM-$SRCVERSION}
+TARFILE=${TARFILE:-$SOURCE.zip}
 
 set -e
 
@@ -52,8 +53,8 @@ find -L . \
   -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 {} \;
-mkdir -p $PKG/usr/bin
-cp -a $PRGNAM $PKG/usr/bin
+
+install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
 
 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
diff --git a/development/tkdiff/tkdiff.info b/development/tkdiff/tkdiff.info
index e7f034cfa4..14b6418f85 100644
--- a/development/tkdiff/tkdiff.info
+++ b/development/tkdiff/tkdiff.info
@@ -1,8 +1,8 @@
 PRGNAM="tkdiff"
-VERSION="5.0"
+VERSION="5.1"
 HOMEPAGE="https://sourceforge.net/projects/tkdiff/"
-DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/5.0/tkdiff-5-0.zip"
-MD5SUM="4e4ad77c54fc4d8057b29e14aa539d35"
+DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/5.1/tkdiff-5-1.zip"
+MD5SUM="3c08e7985080e310c51ab29181df1856"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/uncrustify/uncrustify.SlackBuild b/development/uncrustify/uncrustify.SlackBuild
index 7b170d05ad..97f9a01292 100644
--- a/development/uncrustify/uncrustify.SlackBuild
+++ b/development/uncrustify/uncrustify.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
 PRGNAM=uncrustify
-VERSION=${VERSION:-0.71.0}
+VERSION=${VERSION:-0.72.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/uncrustify/uncrustify.info b/development/uncrustify/uncrustify.info
index 4c5514fb7e..359f2e8b83 100644
--- a/development/uncrustify/uncrustify.info
+++ b/development/uncrustify/uncrustify.info
@@ -1,8 +1,8 @@
 PRGNAM="uncrustify"
-VERSION="0.71.0"
+VERSION="0.72.0"
 HOMEPAGE="http://uncrustify.sourceforge.net/"
-DOWNLOAD="https://github.com/uncrustify/uncrustify/archive/uncrustify-0.71.0/uncrustify-uncrustify-0.71.0.tar.gz"
-MD5SUM="748482d4c16e2de966505c7e3829d925"
+DOWNLOAD="https://github.com/uncrustify/uncrustify/archive/uncrustify-0.72.0/uncrustify-uncrustify-0.72.0.tar.gz"
+MD5SUM="9e89cd3457cb1b431eab5c7a161c02a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/universal-ctags/universal-ctags.SlackBuild b/development/universal-ctags/universal-ctags.SlackBuild
index af29f706bd..e68880256b 100644
--- a/development/universal-ctags/universal-ctags.SlackBuild
+++ b/development/universal-ctags/universal-ctags.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=universal-ctags
-VERSION=${VERSION:-86bdb84}
-GITVERSION=${GITVERSION:-86bdb84ce1fc25239c02121343cec897c12b9ffa}
+VERSION=${VERSION:-af30512}
+GITVERSION=${GITVERSION:-af3051279c8800d1641bdd27ab8cdb4c7fd4936d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/universal-ctags/universal-ctags.info b/development/universal-ctags/universal-ctags.info
index e9e68bd0df..c47987c11f 100644
--- a/development/universal-ctags/universal-ctags.info
+++ b/development/universal-ctags/universal-ctags.info
@@ -1,8 +1,8 @@
 PRGNAM="universal-ctags"
-VERSION="86bdb84"
+VERSION="af30512"
 HOMEPAGE="https://ctags.io/"
-DOWNLOAD="https://download.dlackware.com/hosted-sources/universal-ctags/ctags-86bdb84ce1fc25239c02121343cec897c12b9ffa.tar.xz"
-MD5SUM="3b86aa2c662ce77e3d0d2ae0d561481a"
+DOWNLOAD="https://download.dlackware.com/hosted-sources/universal-ctags/ctags-af3051279c8800d1641bdd27ab8cdb4c7fd4936d.tar.xz"
+MD5SUM="dc96f1cd53add01f78364e6dabed615b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild
index 991cf4dbc5..d9a1f377ae 100644
--- a/development/valgrind/valgrind.SlackBuild
+++ b/development/valgrind/valgrind.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=valgrind
-VERSION=${VERSION:-3.16.1}
+VERSION=${VERSION:-3.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info
index 7e58b06734..7302656729 100644
--- a/development/valgrind/valgrind.info
+++ b/development/valgrind/valgrind.info
@@ -1,8 +1,8 @@
 PRGNAM="valgrind"
-VERSION="3.16.1"
+VERSION="3.17.0"
 HOMEPAGE="http://www.valgrind.org/"
-DOWNLOAD="http://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2"
-MD5SUM="d1b153f1ab17cf1f311705e7a83ef589"
+DOWNLOAD="http://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2"
+MD5SUM="afe11b5572c3121a781433b7c0ab741b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/velero/slack-desc b/development/velero/slack-desc
index 4b8ec3d748..97a1c11656 100644
--- a/development/velero/slack-desc
+++ b/development/velero/slack-desc
@@ -15,5 +15,5 @@ velero: persistent volumes.
 velero:
 velero:
 velero: Homepage: https://velero.io
-velero: Release date: Mar 10, 2020
+velero: Release date: Oct 21, 2020
 velero:
diff --git a/development/velero/velero.SlackBuild b/development/velero/velero.SlackBuild
index b36296ab5f..f237c91b1b 100644
--- a/development/velero/velero.SlackBuild
+++ b/development/velero/velero.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for velero
 
-# Copyright 2020 Dmitrii Sosedov, United States
+# Copyright 2021 Dmitrii Sosedov, United States
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=velero
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/velero/velero.info b/development/velero/velero.info
index 9d7b9168be..caf957a61f 100644
--- a/development/velero/velero.info
+++ b/development/velero/velero.info
@@ -1,10 +1,10 @@
 PRGNAM="velero"
-VERSION="1.3.2"
+VERSION="1.5.2"
 HOMEPAGE="https://velero.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM="UNSUPPORTED"
-DOWNLOAD_x86_64="https://github.com/vmware-tanzu/velero/releases/download/v1.3.2/velero-v1.3.2-linux-amd64.tar.gz"
-MD5SUM_x86_64="cc25462d3e02115c7aa8f9cfe0eb5931"
+DOWNLOAD_x86_64="https://github.com/vmware-tanzu/velero/releases/download/v1.5.2/velero-v1.5.2-linux-amd64.tar.gz"
+MD5SUM_x86_64="e5c1d6593717841e76b4573df5a47c79"
 REQUIRES=""
 MAINTAINER="Dmitrii Sosedov"
 EMAIL="d.sosedov@gmail.com"
diff --git a/development/vscode-bin/vscode-bin.SlackBuild b/development/vscode-bin/vscode-bin.SlackBuild
index 8e3553a1ec..2f2541bee7 100644
--- a/development/vscode-bin/vscode-bin.SlackBuild
+++ b/development/vscode-bin/vscode-bin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vscode-bin
 
-# Copyright 2019-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2019-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=vscode-bin
 SRCNAM=code-stable
-VERSION=${VERSION:-1.50.1}
-SRCVER=1602601238
+VERSION=${VERSION:-1.55.0}
+SRCVER=1617120964
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/vscode-bin/vscode-bin.info b/development/vscode-bin/vscode-bin.info
index a75d7b0c0a..b2ba7d5782 100644
--- a/development/vscode-bin/vscode-bin.info
+++ b/development/vscode-bin/vscode-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="vscode-bin"
-VERSION="1.50.1"
+VERSION="1.55.0"
 HOMEPAGE="https://code.visualstudio.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://az764295.vo.msecnd.net/stable/d2e414d9e4239a252d1ab117bd7067f125afd80a/code-stable-x64-1602601238.tar.gz"
-MD5SUM_x86_64="76abf258da6e2ea6b415a49e4976eef1"
+DOWNLOAD_x86_64="https://az764295.vo.msecnd.net/stable/c185983a683d14c396952dd432459097bc7f757f/code-stable-x64-1617120964.tar.gz"
+MD5SUM_x86_64="ebd88c08d9387b00fe8540153297e985"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/development/vscodium/README b/development/vscodium/README
new file mode 100644
index 0000000000..c53096d4f2
--- /dev/null
+++ b/development/vscodium/README
@@ -0,0 +1,7 @@
+Free and open source binary release of VSCode without Microsoft's
+branding, telemetry and license.
+
+If you cannot or do not want to build VSCode from source and you need a
+clean binary then VSCodium is for you.
+
+NOTE: The 32bit release stops at version 1.35.1
diff --git a/network/mkvserver_mk2/doinst.sh b/development/vscodium/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/network/mkvserver_mk2/doinst.sh
+++ b/development/vscodium/doinst.sh
diff --git a/development/vscodium/slack-desc b/development/vscodium/slack-desc
new file mode 100644
index 0000000000..618bb35f60
--- /dev/null
+++ b/development/vscodium/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+vscodium: vscodium (Visual Studio Code FOSS Binary Release)
+vscodium:
+vscodium: Free and open source binary release of VSCode without Microsoft's
+vscodium: branding, telemetry and license.
+vscodium:
+vscodium: Homepage: https://vscodium.com/
+vscodium:
+vscodium:
+vscodium:
+vscodium:
+vscodium:
diff --git a/network/waterfox/waterfox.SlackBuild b/development/vscodium/vscodium.SlackBuild
index abdd1ecfa0..c630053dbd 100644
--- a/network/waterfox/waterfox.SlackBuild
+++ b/development/vscodium/vscodium.SlackBuild
@@ -1,11 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for waterfox
-# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
+# Slackware build script for vscodium
 
-# Based on the pale moon SlackBuilds by:
-# Copyright 2015 pomfland
-# Copyright 2017 skaendo <skaendo at excite dot com>
+# Copyright 2021 rc-05 <rc23@email.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,9 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=waterfox
-SRCNAM=waterfox-classic
-VERSION=${VERSION:-2020.02.1}
+PRGNAM=vscodium
+VERSION=${VERSION:-1.54.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,29 +31,32 @@ if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    *) ARCH=$( uname -m ) ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+# Bail out when building the Slackbuild on non-x86_64 arch.
+if [ "$ARCH" != "x86_64" ]; then
+  echo "Unsupported on $ARCH: last version available is 1.35.2"
+  exit -1
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Check and then abort if the architecture is not 64-bit.
-if [ "$ARCH" != "x86_64" ]; then
-  echo "$ARCH is unsupported"
-  exit 1
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$VERSION.en-US.linux-$ARCH.tar.?z*
-cd $SRCNAM
+rm -rf $PRGNAM-$VERSION
+# Creates a directory to extract the files into a suitable directory as the
+# original archive doesn't contain a directory.
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/VSCodium-linux-x64-$VERSION.tar.gz -C $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -65,22 +64,17 @@ 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 {} \;
 
-# Install waterfox into /opt
-mkdir -p $PKG/opt/waterfox
-cp -vr * $PKG/opt/waterfox
+mkdir -p $PKG/opt/$PRGNAM $PKG/usr/bin
+mv * $PKG/opt/$PRGNAM
 
-# Link Waterfox binary to /usr/bin
-mkdir -p $PKG/usr/bin
-ln -s /opt/waterfox/waterfox $PKG/usr/bin/waterfox
-
-# Install .desktop file
 mkdir -p $PKG/usr/share/applications
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
-# Icon
-mkdir -p $PKG/usr/share/pixmaps/
-#cp $PKG/opt/$PRGNAM/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/waterfox-icon.png
-cp $PKG/opt/$PRGNAM/browser/chrome/icons/default/default128.png $PKG/usr/share/pixmaps/waterfox-icon.png
+mkdir -p $PKG/usr/share/icons/hicolor/1024x1024/apps
+cp $PKG/opt/$PRGNAM/resources/app/resources/linux/code.png $PKG/usr/share/icons/hicolor/1024x1024/apps
+
+cd $PKG/usr/bin
+ln -s /opt/$PRGNAM/bin/codium .
 
 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
diff --git a/development/vscodium/vscodium.desktop b/development/vscodium/vscodium.desktop
new file mode 100644
index 0000000000..3659cc54de
--- /dev/null
+++ b/development/vscodium/vscodium.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=VSCodium
+Exec=/usr/bin/codium
+Icon=/usr/share/icons/hicolor/1024x1024/apps/code.png
+Type=Application
+Categories=Development;
diff --git a/development/vscodium/vscodium.info b/development/vscodium/vscodium.info
new file mode 100644
index 0000000000..612714e946
--- /dev/null
+++ b/development/vscodium/vscodium.info
@@ -0,0 +1,10 @@
+PRGNAM="vscodium"
+VERSION="1.54.2"
+HOMEPAGE="https://vscodium.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/VSCodium/vscodium/releases/download/1.54.2/VSCodium-linux-x64-1.54.2.tar.gz"
+MD5SUM_x86_64="4f5c137909994f4ff72e9ce16f879bdb"
+REQUIRES=""
+MAINTAINER="rc-05"
+EMAIL="rc23@email.it"
diff --git a/development/vstudio/vstudio.SlackBuild b/development/vstudio/vstudio.SlackBuild
index fafa648c8e..c7dda34412 100644
--- a/development/vstudio/vstudio.SlackBuild
+++ b/development/vstudio/vstudio.SlackBuild
@@ -23,13 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vstudio
-VERSION=${VERSION:-8.3}
+VERSION=${VERSION:-10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 case "$( uname -m )" in
-  i?86) ARCH=i586 ; BASENAME=${BASENAME:-vstudio_8_lin} ;;
-  x86_64) ARCH=x86_64 ; BASENAME=${BASENAME:-vstudio_x64_8_lin} ;;
+  x86_64) ARCH=x86_64 ; BASENAME=${BASENAME:-vstudio_x64_10_lin} ;;
   *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
 esac
 
@@ -42,7 +41,11 @@ OUTPUT=${OUTPUT:-/tmp}
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/$BASENAME.deb data.tar.xz | tar xvJ
+if [ -e $BASENAME.deb ]; then
+  ar p $CWD/$BASENAME.deb data.tar.xz | tar xvJ
+else
+  ar p $CWD/vstudio_x64_lin-deb data.tar.xz | tar xvJ
+fi
 
 chown -R root:root .
 find -L . \
diff --git a/development/vstudio/vstudio.info b/development/vstudio/vstudio.info
index 0a04d32368..8c48543575 100644
--- a/development/vstudio/vstudio.info
+++ b/development/vstudio/vstudio.info
@@ -1,10 +1,10 @@
 PRGNAM="vstudio"
-VERSION="8.3"
+VERSION="10"
 HOMEPAGE="http://www.valentina-db.com/"
-DOWNLOAD="http://valentina-db.com/download/prev_releases/8.3/lin_32/vstudio_8_lin.deb"
-MD5SUM="1e61812e12e3f58cc224e343e9ab2a03"
-DOWNLOAD_x86_64="http://valentina-db.com/download/prev_releases/8.3/lin_64/vstudio_x64_8_lin.deb"
-MD5SUM_x86_64="4fd63c73f25383e8aa05359c29759a2b"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://www.valentina-db.com/en/all-downloads/vstudio/current/vstudio_x64_lin-deb"
+MD5SUM_x86_64="7a0e80bc55f9ddeb4e32decc6ace127b"
 REQUIRES=""
 MAINTAINER="Antonio Leal"
 EMAIL="antonioleal@yahoo.com"
diff --git a/development/watchman/slack-desc b/development/watchman/slack-desc
index ded546d12c..71feb4c4ed 100644
--- a/development/watchman/slack-desc
+++ b/development/watchman/slack-desc
@@ -12,8 +12,8 @@ watchman: Watchman exists to watch files and record when they change.
 watchman: It can also trigger actions (such as rebuilding assets) when
 watchman: matching files change.
 watchman:
+watchman: https://facebook.github.io/watchman/
 watchman:
 watchman:
 watchman:
-watchman: https://facebook.github.io/watchman/
 watchman:
diff --git a/development/watchman/watchman.SlackBuild b/development/watchman/watchman.SlackBuild
index 57f73f469b..8222d4bd87 100644
--- a/development/watchman/watchman.SlackBuild
+++ b/development/watchman/watchman.SlackBuild
@@ -3,9 +3,9 @@
 # Slackware build script for watchman
 
 # Originally written by:
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Ryan P.C. McQuen | Everett, WA | <email removed>
 
-# Now maintained by B. Watson (yalhcru@gmail.com)
+# Now maintained by B. Watson <yalhcru@gmail.com>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,11 +78,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 ./autogen.sh
 CC=clang CXX=clang++ \
diff --git a/development/xa/README b/development/xa/README
index 41fa1f24a0..27afcbe09f 100644
--- a/development/xa/README
+++ b/development/xa/README
@@ -9,3 +9,7 @@ This build includes xa's companion piece, the disassembler dxa. dxa is
 considered alpha-quality software, but is included because it's still
 very useful. It produces output that can be reassembled with xa, but
 doesn't support the 65816 CPU.
+
+If you want to run the xa test suite as part of the build, export
+MAKETEST=yes in the script's environment. The build will fail if any
+of the tests fail.
diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index ffe7d9fba6..4a7069bc35 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw:
+# - update for xa-2.3.11 (dxa still the same)
+# - add support for running the test suite
+# - exclude windows (visual studio) stuff when extracting tarball
+
 # 20191129 bkw:
 # - update for xa-2.3.10 and dxa-0.1.4
 # - remove the patches for dxa, 0.1.4 has all the fixes applied
@@ -24,7 +29,7 @@
 # they were included in the script tarball all along.
 
 PRGNAM=xa
-VERSION=${VERSION:-2.3.10}
+VERSION=${VERSION:-2.3.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,17 +69,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --exclude="*/vstudio/*"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
 # tarball permissions are worse than usual.
-find . -type d -exec chmod 755 {} \; -o -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} \+ -o -type f -exec chmod 644 {} \+
+chmod 755 tests/harness tests/hextool
 
 sed -i "s,-O2,$SLKCFLAGS," Makefile
 
 # Note: non-standard use of DESTDIR
 make DESTDIR=/usr
+[ "${MAKETEST:-no}" = "yes" ] && make -j1 test
 make install DESTDIR=$PKG/usr MANDIR=$PKG/usr/man/man1
 strip $PKG/usr/bin/*
 
diff --git a/development/xa/xa.info b/development/xa/xa.info
index 51ddf18a6c..6b872338ad 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,9 +1,9 @@
 PRGNAM="xa"
-VERSION="2.3.10"
+VERSION="2.3.11"
 HOMEPAGE="http://www.floodgap.com/retrotech/xa/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.10.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.11.tar.gz \
           https://slackware.uk/~urchlay/src/dxa-0.1.4.tar.gz"
-MD5SUM="14265129071922dd964d89599775d13e \
+MD5SUM="72cbd5619f75b0c9839b90c41d0f9ea6 \
         3a7993751bcb94e5f9081cc2f27eee1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/xkeys-sdk/README b/development/xkeys-sdk/README
new file mode 100644
index 0000000000..855545697e
--- /dev/null
+++ b/development/xkeys-sdk/README
@@ -0,0 +1,8 @@
+This is an open source Linux support for Pi Engineering's X-Keys
+products written in C++. Features code for accessing all X-keys controls
+and key states and includes a simple, straight forward example GUI.
+
+Example source code for the installed libraries, test & pietestgui
+programs are found in the piehid, test & testgui directories in
+/usr/doc/xkeys-sdk-$VERSION. The DataReports directory also found there
+contains the message formats for the various X-Keys products.
diff --git a/development/xkeys-sdk/doinst.sh b/development/xkeys-sdk/doinst.sh
new file mode 100644
index 0000000000..0fa754f75e
--- /dev/null
+++ b/development/xkeys-sdk/doinst.sh
@@ -0,0 +1,11 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+# If other icon themes are installed, then add to/modify this as needed
+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/development/xkeys-sdk/slack-desc b/development/xkeys-sdk/slack-desc
new file mode 100644
index 0000000000..387c4c244b
--- /dev/null
+++ b/development/xkeys-sdk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+xkeys-sdk: xkeys-sdk (SDK for X-Keys)
+xkeys-sdk:
+xkeys-sdk: This is an open source Linux support for PI Engineering's X-Keys
+xkeys-sdk: products written in C++. Features code for accessing all X-keys
+xkeys-sdk: controls and key states and includes a simple, straight forward
+xkeys-sdk: example GUI.
+xkeys-sdk:
+xkeys-sdk:
+xkeys-sdk:
+xkeys-sdk:
+xkeys-sdk:
diff --git a/development/xkeys-sdk/xkeys-sdk.SlackBuild b/development/xkeys-sdk/xkeys-sdk.SlackBuild
new file mode 100644
index 0000000000..835320062c
--- /dev/null
+++ b/development/xkeys-sdk/xkeys-sdk.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for xkeys-sdk
+
+# Copyright 2021 Christoph Willing  Brisbane, Australia
+# 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=xkeys-sdk
+SRCNAM=X-keys_Linux
+VERSION=${VERSION:-2.1.0}
+COMMIT=6d63ceedb00f21a21a723ca899b4ff65f274c8b3
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$COMMIT
+tar xvf $CWD/$SRCNAM-$COMMIT.tar.gz
+cd $SRCNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+# Remove static library
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/libpiehid.a
+
+mkdir -p $PKG/lib/udev/rules.d
+install -m 0644 udev/90-xkeys.rules $PKG/lib/udev/rules.d/
+
+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.* piehid test testgui $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+tar -C $PKG/usr/doc/$PRGNAM-$VERSION -xf $TMP/$SRCNAM-$COMMIT/non-PC.tar.gz
+mv $PKG/usr/doc/$PRGNAM-$VERSION/non-PC $PKG/usr/doc/$PRGNAM-$VERSION/DataReports
+
+mkdir -p $PKG/install
+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}
diff --git a/development/xkeys-sdk/xkeys-sdk.info b/development/xkeys-sdk/xkeys-sdk.info
new file mode 100644
index 0000000000..0539299c9a
--- /dev/null
+++ b/development/xkeys-sdk/xkeys-sdk.info
@@ -0,0 +1,10 @@
+PRGNAM="xkeys-sdk"
+VERSION="2.1.0"
+HOMEPAGE="https://github.com/piengineering/X-keys_Linux"
+DOWNLOAD="https://github.com/piengineering/X-keys_Linux/archive/6d63cee/X-keys_Linux-6d63ceedb00f21a21a723ca899b4ff65f274c8b3.tar.gz"
+MD5SUM="ef3bf752674383e3cba8c308324f89dc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/development/xnedit/xnedit.SlackBuild b/development/xnedit/xnedit.SlackBuild
index 52461f43b8..f726d0cf63 100644
--- a/development/xnedit/xnedit.SlackBuild
+++ b/development/xnedit/xnedit.SlackBuild
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xnedit
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/xnedit/xnedit.info b/development/xnedit/xnedit.info
index 79b03131d2..db1e781a84 100644
--- a/development/xnedit/xnedit.info
+++ b/development/xnedit/xnedit.info
@@ -1,8 +1,8 @@
 PRGNAM="xnedit"
-VERSION="1.2.0"
+VERSION="1.2.2"
 HOMEPAGE="https://sourceforge.net/projects/xnedit/"
-DOWNLOAD="https://sourceforge.net/projects/xnedit/files/xnedit-1.2.0.tar.gz"
-MD5SUM="72b66dabb081451bbe0069a84c4fbad8"
+DOWNLOAD="https://sourceforge.net/projects/xnedit/files/xnedit-1.2.2.tar.gz"
+MD5SUM="d38b1b2612a75c5e130987e2c032cf2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/xtruss/xtruss.SlackBuild b/development/xtruss/xtruss.SlackBuild
index 894639819e..22b9d43a4a 100644
--- a/development/xtruss/xtruss.SlackBuild
+++ b/development/xtruss/xtruss.SlackBuild
@@ -7,8 +7,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201102 bkw:
+# - update for v20200918.a94a153
+# - switch to self-hosted source, as upstream disappears the old source
+#   immediately on every new release.
+
 PRGNAM=xtruss
-VERSION=${VERSION:-20181001.82973f5}
+VERSION=${VERSION:-20200918.a94a153}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +70,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENCE README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/xtruss/xtruss.info b/development/xtruss/xtruss.info
index e0b6fe1865..712b3b8ea7 100644
--- a/development/xtruss/xtruss.info
+++ b/development/xtruss/xtruss.info
@@ -1,8 +1,8 @@
 PRGNAM="xtruss"
-VERSION="20181001.82973f5"
+VERSION="20200918.a94a153"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/xtruss/"
-DOWNLOAD="https://www.chiark.greenend.org.uk/~sgtatham/xtruss/xtruss-20181001.82973f5.tar.gz"
-MD5SUM="21f7dbdac0caf4199cbf581445454718"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xtruss-20200918.a94a153.tar.gz"
+MD5SUM="bcdf1e92ec0f6226cd8a314edf861b62"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/xxd-standalone/README b/development/xxd-standalone/README
new file mode 100644
index 0000000000..59fd97781c
--- /dev/null
+++ b/development/xxd-standalone/README
@@ -0,0 +1,15 @@
+xxd creates a hex dump of a given file or standard input. It can also
+convert a hex dump back to its original binary form.
+
+xxd is a part of vim. This standalone version can be useful for users of
+neovim who want to remove the stock vim. This package is useless if vim
+is installed.
+
+Since xxd is a part of vim, xxd-standalone conflicts with the stock vim
+package. You should remove vim before installing xxd-standalone.
+
+If, by some reason, you have xxd-standalone installed simultaneously
+with vim and decide to remove vim, you may need to reinstall
+xxd-standalone.
+
+If you remove xxd-standalone, you'll need to reinstall vim.
diff --git a/development/xxd-standalone/doinst.sh b/development/xxd-standalone/doinst.sh
new file mode 100644
index 0000000000..8cbfd234c5
--- /dev/null
+++ b/development/xxd-standalone/doinst.sh
@@ -0,0 +1,10 @@
+if VIMP=$(grep -rwl '/var/log/packages/' -e 'usr/bin/xxd' \
+    | grep -o -m 1 "vim-.*"); then
+  echo "WARNING: It seems that you installed xxd-standalone"
+  echo "         simultaneously with ${VIMP},"
+  echo "         which provides xxd. If you remove vim,"
+  echo "         you may need to reinstall xxd-standalone."
+  echo "    	 Conversely, if you remove xxd-standalone,"
+  echo "       	 you'll need to reinstall vim."
+  sleep 5
+fi
diff --git a/development/xxd-standalone/slack-desc b/development/xxd-standalone/slack-desc
new file mode 100644
index 0000000000..8fac3aeb54
--- /dev/null
+++ b/development/xxd-standalone/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+xxd-standalone: xxd-standalone (hex dump utility from vim)
+xxd-standalone:
+xxd-standalone:
+xxd-standalone:
+xxd-standalone: xxd is a part of vim. This standalone version can be useful for users
+xxd-standalone: of neovim who want to remove the stock vim.
+xxd-standalone:
+xxd-standalone:
+xxd-standalone:
+xxd-standalone:
+xxd-standalone:
diff --git a/development/xxd-standalone/xxd-standalone.SlackBuild b/development/xxd-standalone/xxd-standalone.SlackBuild
new file mode 100644
index 0000000000..8c81455ac3
--- /dev/null
+++ b/development/xxd-standalone/xxd-standalone.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# Slackware build script for xxd-standalone
+
+# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
+# 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=xxd-standalone
+VERSION=${VERSION:-8.2.0854}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cat $CWD/Makefile > $PRGNAM-$VERSION/Makefile
+cat $CWD/xxd.c > $PRGNAM-$VERSION/xxd.c
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+
+mkdir -p $PKG/usr/bin
+install -m 0755 -o root -g root xxd $PKG/usr/bin
+
+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/man/fr.ISO8859-1/man1
+mkdir -p $PKG/usr/man/fr/man1
+mkdir -p $PKG/usr/man/fr.UTF-8/man1
+mkdir -p $PKG/usr/man/it.ISO8859-1/man1
+mkdir -p $PKG/usr/man/it/man1
+mkdir -p $PKG/usr/man/it.UTF-8/man1
+mkdir -p $PKG/usr/man/ja/man1
+mkdir -p $PKG/usr/man/pl.ISO8859-2/man1
+mkdir -p $PKG/usr/man/pl/man1
+mkdir -p $PKG/usr/man/pl.UTF-8/man1
+mkdir -p $PKG/usr/man/ru.KOI8-R/man1
+mkdir -p $PKG/usr/man/ru.UTF-8/man1
+mkdir -p $PKG/usr/man/man1
+
+cat $CWD/xxd-fr.1 > $PKG/usr/man/fr.ISO8859-1/man1/xxd.1
+cat $CWD/xxd-fr.1 > $PKG/usr/man/fr/man1/xxd.1
+cat $CWD/xxd-fr.UTF-8.1 > $PKG/usr/man/fr.UTF-8/man1/xxd.1
+cat $CWD/xxd-it.1 > $PKG/usr/man/it.ISO8859-1/man1/xxd.1
+cat $CWD/xxd-it.1 > $PKG/usr/man/it/man1/xxd.1
+cat $CWD/xxd-it.UTF-8.1 > $PKG/usr/man/it.UTF-8/man1/xxd.1
+cat $CWD/xxd-ja.UTF-8.1 > $PKG/usr/man/ja/man1/xxd.1
+cat $CWD/xxd-pl.1 > $PKG/usr/man/pl.ISO8859-2/man1/xxd.1
+cat $CWD/xxd-pl.1 > $PKG/usr/man/pl/man1/xxd.1
+cat $CWD/xxd-pl.UTF-8.1 > $PKG/usr/man/pl.UTF-8/man1/xxd.1
+cat $CWD/xxd-ru.1 > $PKG/usr/man/ru.KOI8-R/man1/xxd.1
+cat $CWD/xxd-ru.UTF-8.1 > $PKG/usr/man/ru.UTF-8/man1/xxd.1
+cat $CWD/xxd.1 > $PKG/usr/man/man1/xxd.1
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/development/xxd-standalone/xxd-standalone.info b/development/xxd-standalone/xxd-standalone.info
new file mode 100644
index 0000000000..74350184cc
--- /dev/null
+++ b/development/xxd-standalone/xxd-standalone.info
@@ -0,0 +1,32 @@
+PRGNAM="xxd-standalone"
+VERSION="8.2.0854"
+HOMEPAGE="https://www.vim.org"
+DOWNLOAD="https://raw.githubusercontent.com/vim/vim/v8.2.0854/src/xxd/xxd.c \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/src/xxd/Makefile \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-fr.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-fr.UTF-8.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-it.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-it.UTF-8.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-ja.UTF-8.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-pl.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-pl.UTF-8.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-ru.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd-ru.UTF-8.1 \
+          https://raw.githubusercontent.com/vim/vim/v8.2.0854/runtime/doc/xxd.1"
+MD5SUM="316a7f62dd590d7d18ef4344575d00d0 \
+        d551525508580302c1c22a9ec0c0fb84 \
+        d5967064b340a99671066fe1662b9a70 \
+        37987f54a8bef25f75c72972381880db \
+        b772556f2393b1cdc82c653449bdcf02 \
+        9bb23fce20c8c6d0772108b53d66c874 \
+        557970ea576b1550c74edbf729c58ef0 \
+        e3a2e3643b2bc4b14c99b45a7a46a5cc \
+        8f4fe8c8a682d6b1c608011a1fdc7171 \
+        92408c9623fcfa72e7780a4b0d365eb5 \
+        3ec378d11a435980ac03c1f66c1717f0 \
+        87467fa59b7efa85002baa2d78d2c0bb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/games/0ad/README b/games/0ad/README
index 43f9ef54df..8af134503e 100644
--- a/games/0ad/README
+++ b/games/0ad/README
@@ -3,3 +3,6 @@ real-time strategy (RTS) game of ancient warfare.
 
 To include the Atlas editor, which requires wxPython3
     ATLAS=enable ./0ad.SlackBuild
+
+v0.0.23b is the last version to run on stock slackware 14.2 as newer
+versions require at least gcc 7 or newer to compile.
diff --git a/games/Chatbot-Eliza/Chatbot-Eliza.SlackBuild b/games/Chatbot-Eliza/Chatbot-Eliza.SlackBuild
index 0831561087..0efff8ae04 100644
--- a/games/Chatbot-Eliza/Chatbot-Eliza.SlackBuild
+++ b/games/Chatbot-Eliza/Chatbot-Eliza.SlackBuild
@@ -10,16 +10,11 @@
 
 PRGNAM=Chatbot-Eliza
 VERSION=${VERSION:-1.04}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+# There is no compiled code here, nothing use /usr/lib(64)
+ARCH=noarch
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -45,7 +40,7 @@ perl Makefile.PL
 make
 make install INSTALLDIRS=vendor DESTDIR=$PKG
 
-mv $PKG/usr/share/man $PKG/usr && rm -rf $PKG/usr/share
+mv $PKG/usr/share/man $PKG/usr
 gzip -9 $PKG/usr/man/man3/* 2> /dev/null
 
 # Remove perlocal.pod and .packlist from $PKG
diff --git a/games/CorsixTH/CorsixTH.SlackBuild b/games/CorsixTH/CorsixTH.SlackBuild
index 8082e31b98..5b413ce9b2 100644
--- a/games/CorsixTH/CorsixTH.SlackBuild
+++ b/games/CorsixTH/CorsixTH.SlackBuild
@@ -22,6 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210217 bkw: modified by SlackBuilds.org: build would fail if both
+# lua and lua52 (or lua53) were installed. The fix is to force cmake
+# to use the libraries from lua (version 5.1.5).
+
 PRGNAM=CorsixTH
 VERSION=${VERSION:-0.63}
 BUILD=${BUILD:-1}
@@ -75,6 +79,9 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUA_LIBRARY="/usr/lib$LIBDIRSUFFIX/liblua.so" \
+    -DLUA_INCLUDE_DIR="/usr/include/" \
+    -DLUA_MATH_LIBRARY="/usr/lib$LIBDIRSUFFIX/libm.so" \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install/strip DESTDIR=$PKG
diff --git a/games/FlightGear-data/FlightGear-data.SlackBuild b/games/FlightGear-data/FlightGear-data.SlackBuild
index 7f844fb064..f26bda81fd 100644
--- a/games/FlightGear-data/FlightGear-data.SlackBuild
+++ b/games/FlightGear-data/FlightGear-data.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=FlightGear-data
 SRCNAM=FlightGear
-VERSION=${VERSION:-2020.1.2}
+VERSION=${VERSION:-2020.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/FlightGear-data/FlightGear-data.info b/games/FlightGear-data/FlightGear-data.info
index 539e908d65..fe327a0e7b 100644
--- a/games/FlightGear-data/FlightGear-data.info
+++ b/games/FlightGear-data/FlightGear-data.info
@@ -1,8 +1,8 @@
 PRGNAM="FlightGear-data"
-VERSION="2020.1.2"
+VERSION="2020.3.6"
 HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/FlightGear-2020.1.2-data.tar.bz2"
-MD5SUM="dbc5c18ac5b28e6576a5f22859912943"
+DOWNLOAD="https://downloads.sourceforge.net/flightgear/FlightGear-2020.3.6-data.tar.bz2"
+MD5SUM="b67f24b968a8c5394302441f63f9362e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/FlightGear-data/README b/games/FlightGear-data/README
index 632e69083c..3c5ab22ea1 100644
--- a/games/FlightGear-data/README
+++ b/games/FlightGear-data/README
@@ -1,2 +1,5 @@
 Textures, models, data, aircraft, sample scenery, and config files
 needed by FlightGear.
+
+NOTE: The source file is nearly 2G in size, so please be patient
+while downloading and building.
diff --git a/games/FlightGear/FlightGear-version.patch b/games/FlightGear/FlightGear-version.patch
deleted file mode 100644
index b3fef66c61..0000000000
--- a/games/FlightGear/FlightGear-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur flightgear-2020.1.2/CMakeLists.txt flightgear-2020.1.2.new/CMakeLists.txt
---- flightgear-2020.1.2/CMakeLists.txt	2020-05-24 11:14:48.000000000 -0400
-+++ flightgear-2020.1.2.new/CMakeLists.txt	2020-06-01 09:51:41.076758051 -0400
-@@ -83,13 +83,13 @@
- set(CMAKE_MINSIZEREL_POSTFIX     ""  CACHE STRING "add a postfix, usually empty on windows")
- 
- # read 'version' file into a variable (stripping any newlines or spaces)
--file(READ version versionFile)
-+file(READ flightgear-version versionFile)
- if (NOT versionFile)
-     message(FATAL_ERROR "Unable to determine FlightGear version. Version file is missing.")
- endif()
- string(STRIP "${versionFile}" FLIGHTGEAR_VERSION)
- # add a dependency on the version file
--set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS version)
-+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS flightgear-version)
- 
- # FlightGear packaging (to build a source tarball)
- include( ConfigureCPack )
-diff -Naur flightgear-2020.1.2/flightgear-version flightgear-2020.1.2.new/flightgear-version
---- flightgear-2020.1.2/flightgear-version	1969-12-31 19:00:00.000000000 -0500
-+++ flightgear-2020.1.2.new/flightgear-version	2020-05-24 11:14:48.000000000 -0400
-@@ -0,0 +1 @@
-+2020.1.2
-diff -Naur flightgear-2020.1.2/version flightgear-2020.1.2.new/version
---- flightgear-2020.1.2/version	2020-05-24 11:14:48.000000000 -0400
-+++ flightgear-2020.1.2.new/version	1969-12-31 19:00:00.000000000 -0500
-@@ -1 +0,0 @@
--2020.1.2
diff --git a/games/FlightGear/FlightGear.SlackBuild b/games/FlightGear/FlightGear.SlackBuild
index 83b65b6ab8..fed48f1bff 100644
--- a/games/FlightGear/FlightGear.SlackBuild
+++ b/games/FlightGear/FlightGear.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=FlightGear
 SRCNAM=flightgear
-VERSION=${VERSION:-2020.1.2}
+VERSION=${VERSION:-2020.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,11 +79,6 @@ 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 {} \;
 
-# patch for the new boost (Thanks Gentoo)
-if [ "${CURRENT:-no}" = "yes" ]; then
-  patch -p1 < $CWD/FlightGear-version.patch
-fi
-
 mkdir -p build
 cd build
   cmake \
@@ -93,7 +88,8 @@ cd build
     -DEVENT_INPUT="ON" \
     -DFG_DATA_DIR=/usr/share/${PRGNAM} \
     $OPT \
-    -DCMAKE_BUILD_TYPE=Release ..
+    -DCMAKE_BUILD_TYPE=Release \
+    -DFG_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
diff --git a/games/FlightGear/FlightGear.info b/games/FlightGear/FlightGear.info
index 87ed0d7f2f..15c3db0072 100644
--- a/games/FlightGear/FlightGear.info
+++ b/games/FlightGear/FlightGear.info
@@ -1,8 +1,8 @@
 PRGNAM="FlightGear"
-VERSION="2020.1.2"
+VERSION="2020.3.6"
 HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2020.1.2.tar.bz2"
-MD5SUM="146bee62c1d28736815cba583fd0395a"
+DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2020.3.6.tar.bz2"
+MD5SUM="ba2ff86313ff8e926a6653492bae1005"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FlightGear-data SimGear"
diff --git a/games/FlightGear/README b/games/FlightGear/README
index 3b576ddb62..40164a5f29 100644
--- a/games/FlightGear/README
+++ b/games/FlightGear/README
@@ -6,7 +6,5 @@ To build the internal Qt launcher, you will require QT5 and then pass
 QT5=yes to the script.  Otherwise, you can install either fgo or ffgo
 as a more basic launcher.
 
-To build on current (15.0 EXPERIMENTAL), pass CURRENT=yes to the script.
-
 speex and flite are optional dependencies for voice communication
 (autodetected at build time).
diff --git a/games/Genesis-Plus-GX/Genesis-Plus-GX.SlackBuild b/games/Genesis-Plus-GX/Genesis-Plus-GX.SlackBuild
index 48faff4408..54e97040fa 100644
--- a/games/Genesis-Plus-GX/Genesis-Plus-GX.SlackBuild
+++ b/games/Genesis-Plus-GX/Genesis-Plus-GX.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=Genesis-Plus-GX
 LIBNAM=$(echo $PRGNAM | tr [A-Z] [a-z] | tr - _)_libretro
-VERSION=${VERSION:-2018.10.08_2ab02c8}
+VERSION=${VERSION:-2020.01.05_74ad967}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/Genesis-Plus-GX/Genesis-Plus-GX.info b/games/Genesis-Plus-GX/Genesis-Plus-GX.info
index 8d2abb2a70..4ee46804fc 100644
--- a/games/Genesis-Plus-GX/Genesis-Plus-GX.info
+++ b/games/Genesis-Plus-GX/Genesis-Plus-GX.info
@@ -1,8 +1,8 @@
 PRGNAM="Genesis-Plus-GX"
-VERSION="2018.10.08_2ab02c8"
+VERSION="2020.01.05_74ad967"
 HOMEPAGE="https://github.com/ekeeke/Genesis-Plus-GX"
-DOWNLOAD="http://slackless.raccoons.tech/src/libretro/Genesis-Plus-GX-2018.10.08_2ab02c8.tar.xz"
-MD5SUM="1dd2233012803263837d4956fe938d4d"
+DOWNLOAD="http://slackless.raccoons.tech/src/libretro/Genesis-Plus-GX-2020.01.05_74ad967.tar.xz"
+MD5SUM="60ba9e5233d10df3641c560d26a1f1cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
diff --git a/games/OpenXcom/OpenXcom.SlackBuild b/games/OpenXcom/OpenXcom.SlackBuild
index 9a4e8b90a2..df2fd80346 100644
--- a/games/OpenXcom/OpenXcom.SlackBuild
+++ b/games/OpenXcom/OpenXcom.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for OpenXcom
 
 # Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
-# Copyright 2016-2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2016-2020 Dominik Drobek <dominik.drobek (at) o2.pl>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OpenXcom
-VERSION=${VERSION:-20190912_1344}
-COMMIT="98072e1eeeaa6b64a276e87095a25516d4f6ba18"
+VERSION=${VERSION:-20201205_2034}
+COMMIT="cafc2eda3a11eefeb8e3f19f6a73d8f0d00206be"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,10 +84,6 @@ mkdir -p build
   make install DESTDIR=$PKG
 )
 
-install -D -m644 res/linux/${PRGNAM,,}.desktop $PKG/usr/share/applications/${PRGNAM,,}.desktop
-install -D -m644 res/linux/icons/${PRGNAM,,}_48x48.png $PKG/usr/share/pixmaps/${PRGNAM,,}.png
-install -D -m644 $CWD/${PRGNAM,,}.6 $PKG/usr/man/man6/${PRGNAM,,}.6
-
 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
 
diff --git a/games/OpenXcom/OpenXcom.info b/games/OpenXcom/OpenXcom.info
index f5cf1b0346..2fb722b39f 100644
--- a/games/OpenXcom/OpenXcom.info
+++ b/games/OpenXcom/OpenXcom.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenXcom"
-VERSION="20190912_1344"
+VERSION="20201205_2034"
 HOMEPAGE="https://openxcom.org"
-DOWNLOAD="https://github.com/SupSuper/OpenXcom/archive/98072e1eeeaa6b64a276e87095a25516d4f6ba18/OpenXcom-98072e1eeeaa6b64a276e87095a25516d4f6ba18.tar.gz"
-MD5SUM="9f3f5e7fd8b5b731153e3a7ba375ab1c"
+DOWNLOAD="https://github.com/SupSuper/OpenXcom/archive/cafc2eda3a11eefeb8e3f19f6a73d8f0d00206be/OpenXcom-cafc2eda3a11eefeb8e3f19f6a73d8f0d00206be.tar.gz"
+MD5SUM="21989afb6389a3f7bd0f6a35f6d7dbcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yaml-cpp SDL_gfx"
diff --git a/games/OpenXcom/openxcom.6 b/games/OpenXcom/openxcom.6
deleted file mode 100644
index 3be4f320fa..0000000000
--- a/games/OpenXcom/openxcom.6
+++ /dev/null
@@ -1,88 +0,0 @@
-'\" t
-.\"     Title: openxcom
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2014.06.12
-.\"    Manual: User\*(Aqs Manual
-.\"    Source: 1.0
-.\"  Language: English
-.\"
-.TH "OPENXCOM" "6" "2014\&.06\&.12" "1\&.0" "User\*(Aqs Manual"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-openxcom \- An open\-source clone of the original "UFO: Enemy Unknown"
-.SH "SYNOPSIS"
-.HP \w'\fBopenxcom\fR\ 'u
-\fBopenxcom\fR [\fIOPTIONS\fR]
-.SH "DESCRIPTION"
-.PP
-
-\fBopenxcom\fR
-is an open\-source clone of the popular UFO: Enemy Unknown (X\-Com: UFO Defense in USA) videogame by Microprose, licensed under the GPL and written in C++ / SDL\&.
-.SH "OPTIONS"
-.PP
-\fB\-data\fR \fIPATH\fR
-.RS 4
-use
-\fIPATH\fR
-as the default Data Folder instead of auto\-detecting
-.RE
-.PP
-\fB\-user\fR \fIPATH\fR
-.RS 4
-use
-\fIPATH\fR
-as the default User Folder instead of auto\-detecting
-.RE
-.PP
-\fB\-cfg\fR \fIPATH\fR
-.RS 4
-use
-\fIPATH\fR
-as the default Config Folder instead of auto\-detecting
-.RE
-.PP
-\fB\-\fR\fB\fIKEY\fR\fR \fIVALUE\fR
-.RS 4
-set option
-\fIKEY\fR
-to
-\fIVALUE\fR
-instead of default/loaded value (eg\&.
-\-displayWidth 640)
-.RE
-.PP
-\fB\-help\fR, \fB\-?\fR
-.RS 4
-show command\-line help
-.RE
-.SH "AUTHOR"
-.PP
-OpenXcom Developers
-.SH "SEE ALSO"
-.PP
-
-\m[blue]\fB\%http://openxcom.org\fR\m[],
-\m[blue]\fB\%http://ufopaedia.org/index.php?title=OpenXcom\fR\m[]
-.SH "COPYRIGHT"
-.br
-Copyright \(co 2014 OpenXcom Developers
-.br
diff --git a/games/SLADE/SLADE.SlackBuild b/games/SLADE/SLADE.SlackBuild
index 1108a86711..cb6adf1a1e 100644
--- a/games/SLADE/SLADE.SlackBuild
+++ b/games/SLADE/SLADE.SlackBuild
@@ -23,6 +23,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201109 bkw: update for v3.2.12a
 # 20200416 bkw:
 # - take over maintenance
 # - update for v3.1.11
@@ -31,7 +32,7 @@
 # - get rid of our .desktop file (upstream provides one now)
 
 PRGNAM=SLADE
-VERSION=${VERSION:-3.1.11}
+VERSION=${VERSION:-3.1.12a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/SLADE/SLADE.info b/games/SLADE/SLADE.info
index bba4042fda..58e52e4d16 100644
--- a/games/SLADE/SLADE.info
+++ b/games/SLADE/SLADE.info
@@ -1,8 +1,8 @@
 PRGNAM="SLADE"
-VERSION="3.1.11"
+VERSION="3.1.12a"
 HOMEPAGE="http://slade.mancubus.net/"
-DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.1.11/SLADE-3.1.11.tar.gz"
-MD5SUM="41f7592730bb88daf3b5b957bc19dae7"
+DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.1.12a/SLADE-3.1.12a.tar.gz"
+MD5SUM="46f5ed96c196950651f796cb8d5f6f86"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3 SFML ftgl fluidsynth FreeImage"
diff --git a/games/VASSAL/VASSAL.SlackBuild b/games/VASSAL/VASSAL.SlackBuild
index b7644d1dc6..6ff6419c39 100644
--- a/games/VASSAL/VASSAL.SlackBuild
+++ b/games/VASSAL/VASSAL.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for VASSAL
 
-# Copyright 2019 Benjamin Trigona-Harant <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harant <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=VASSAL
-VERSION=${VERSION:-3.4.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.5.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -90,7 +90,6 @@ cp -a \
   CHANGES LICENSE README.md doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rm $PKG/usr/doc/$PRGNAM-$VERSION/doc/userguide/userguide-old.*
 ln -s /usr/doc/$PRGNAM-$VERSION/doc $PKG/usr/share/games/$PRGNAM/doc
 
 mkdir -p $PKG/install
diff --git a/games/VASSAL/VASSAL.info b/games/VASSAL/VASSAL.info
index a065f65384..d1b8b571a7 100644
--- a/games/VASSAL/VASSAL.info
+++ b/games/VASSAL/VASSAL.info
@@ -1,8 +1,8 @@
 PRGNAM="VASSAL"
-VERSION="3.4.6"
+VERSION="3.5.5"
 HOMEPAGE="http://www.vassalengine.org/"
-DOWNLOAD="https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-linux.tar.bz2"
-MD5SUM="646c60108e179353a3237089b5f0e4c5"
+DOWNLOAD="https://github.com/vassalengine/vassal/releases/download/3.5.5/VASSAL-3.5.5-linux.tar.bz2"
+MD5SUM="ba301645f86a9fd241bfa0aaa4516fb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk14"
diff --git a/games/ags/ags.SlackBuild b/games/ags/ags.SlackBuild
index 140c3f4dbf..40430da72b 100644
--- a/games/ags/ags.SlackBuild
+++ b/games/ags/ags.SlackBuild
@@ -24,17 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ags
-VERSION=${VERSION:-3.5.0.26}
+VERSION=${VERSION:-3.5.0.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Dependency tarball versions.
-ALLEGRO_VERSION=${ALLEGRO_VERSION:-4.4.2}
-DUMB_VERSION=${DUMB_VERSION:-0.9.3}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +41,8 @@ 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"
@@ -62,44 +58,11 @@ fi
 set -e
 
 rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
-rm -rf allegro-${ALLEGRO_VERSION}
-rm -rf dumb-${DUMB_VERSION}
-rm -rf ags-v.${VERSION}
-
-# Build Allegro 4 first.
-
-tar xvf $CWD/allegro-${ALLEGRO_VERSION}.tar.gz
-cd allegro-${ALLEGRO_VERSION}
-
-chown -R root:root .
-find -L . \
- \( -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 {} \;
-
-mkdir build
-cd build
-cmake \
-	-DWANT_DOCS=OFF \
-	-DWANT_EXAMPLES=OFF \
-	-DWANT_TESTS=OFF \
-	-DWANT_TOOLS=OFF \
-	-DCMAKE_INSTALL_PREFIX=/opt/ags-$VERSION \
-	-DCMAKE_BUILD_TYPE=Release \
-	..
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
-make install DESTDIR=$PKG
-
-# Then build Dynamic Universal Music Bibliotheque.
-
-cd $TMP
-tar xvf $CWD/dumb-${DUMB_VERSION}.tar.gz
-cd dumb-$DUMB_VERSION
-
+tar xvf $CWD/$PRGNAM-v.${VERSION}.tar.gz
+cd $PRGNAM-v.$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -107,43 +70,12 @@ 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 {} \;
 
-cat << EOF > make/config.txt
-include make/unix.inc
-ALL_TARGETS := core core-examples core-headers
-ALL_TARGETS += allegro allegro-examples allegro-headers
-PREFIX := $PKG/opt/ags-$VERSION
-EOF
-
-PATH="$PATH:$PKG/opt/ags-$VERSION/bin" make \
-	WFLAGS="-I$PKG/opt/ags-$VERSION/include $SLKCFLAGS" \
-	LDFLAGS="-lm -L$PKG/opt/ags-$VERSION/lib $LDFLAGS"
-make install
-
-# And finaly install Adventure Game Studio.
-
-cd $TMP
-tar xvf $CWD/v.${VERSION}.tar.gz || tar xvf $CWD/ags-v.${VERSION}.tar.gz
-cd ags-v.$VERSION
-
-chown -R root:root .
-find -L . \
- \( -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 {} \;
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+  make --directory=Engine
 
-CFLAGS="-I$PKG/opt/ags-$VERSION/include $SLKCFLAGS" \
- CXXFLAGS="-I$PKG/opt/ags-$VERSION/include $SLKCFLAGS" \
- LDFLAGS="-L$PKG/opt/ags-$VERSION/lib -Wl,-rpath,/opt/ags-$VERSION/lib" \
- PATH="$PATH:$PKG/opt/ags-$VERSION/bin" \
- make --directory=Engine
 mkdir -p $PKG/usr/bin
-cp Engine/ags $PKG/opt/ags-$VERSION/bin
-
-(
-cd $PKG/usr/bin
-ln -s ../../opt/ags-$VERSION/bin/ags .
-)
+cp Engine/ags $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/ags/ags.info b/games/ags/ags.info
index af7af1c4d7..45b7e9457c 100644
--- a/games/ags/ags.info
+++ b/games/ags/ags.info
@@ -1,14 +1,10 @@
 PRGNAM="ags"
-VERSION="3.5.0.26"
+VERSION="3.5.0.31"
 HOMEPAGE="https://github.com/adventuregamestudio/ags"
-DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.5.0.26.tar.gz \
-          http://downloads.sourceforge.net/project/alleg/allegro/4.4.2/allegro-4.4.2.tar.gz \
-          http://downloads.sourceforge.net/project/dumb/dumb/0.9.3/dumb-0.9.3.tar.gz"
-MD5SUM="3bf970fe0608e886f8b8da519a5f96dc \
-        4db71b0460fc99926ae91d223199c2e6 \
-		f48da5b990aa8aa822d3b6a951baf5c2"
+DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.5.0.31/ags-v.3.5.0.31.tar.gz"
+MD5SUM="0ceb6b229abf16a58ab1a026b6e63089"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="dumb"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
diff --git a/games/aisleriot/aisleriot.SlackBuild b/games/aisleriot/aisleriot.SlackBuild
index 115cf64de6..b5097e18ae 100644
--- a/games/aisleriot/aisleriot.SlackBuild
+++ b/games/aisleriot/aisleriot.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=aisleriot
 VERSION=${VERSION:-3.22.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/games/aisleriot/doinst.sh b/games/aisleriot/doinst.sh
index 65c7e2eeb9..401d987795 100644
--- a/games/aisleriot/doinst.sh
+++ b/games/aisleriot/doinst.sh
@@ -7,3 +7,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/games/alephone/README b/games/alephone/README
index c35b1801a2..bdaff1849c 100644
--- a/games/alephone/README
+++ b/games/alephone/README
@@ -1,3 +1,5 @@
+alephone (open-source continuation of Marathon 2 engine)
+
 Aleph One is the open source continuation of Bungie's Marathon 2 game
 engine. Available for Mac OS X, Windows, and Linux, Aleph One supports
 Marathon 2 and Marathon Infinity natively, and Marathon through a
diff --git a/games/alephone/alephone.SlackBuild b/games/alephone/alephone.SlackBuild
index 24f2781fd1..a8ff9a9050 100644
--- a/games/alephone/alephone.SlackBuild
+++ b/games/alephone/alephone.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201026 bkw: update for 20201026
 # 20191209 bkw: update for 20190331
 # 20150915 bkw:
 # - update for 20150620 release
@@ -13,7 +14,7 @@
 # - move binary to /usr/games
 
 PRGNAM=alephone
-VERSION=${VERSION:-20190331}
+VERSION=${VERSION:-20201026}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,8 +61,6 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 
 [ "${FFMPEG:-yes}" = "no" ] && EXTRAOPT=--without-ffmpeg
 
-#patch -Np1 < $CWD/ffmpeg3.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
@@ -88,7 +87,7 @@ mkdir -p $PKG/usr/share/pixmaps
 cat Source_Files/Misc/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-# ChangeLog is 0 bytes in 20140104, ignore it
+# ChangeLog was 0 bytes in 20140104, gone in 20201026.
 cp -a AUTHORS COPYING README THANKS examples docs/*.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/alephone/alephone.info b/games/alephone/alephone.info
index ee945db9a2..54bd65d335 100644
--- a/games/alephone/alephone.info
+++ b/games/alephone/alephone.info
@@ -1,8 +1,8 @@
 PRGNAM="alephone"
-VERSION="20190331"
+VERSION="20201026"
 HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20190331/AlephOne-20190331.tar.bz2"
-MD5SUM="2a09e74a136213d479e4eae9e882a682"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20201026/AlephOne-20201026.tar.bz2"
+MD5SUM="5636de266ecd67b88ac9c7d2661e1e78"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua speex zziplib ffmpeg SDL2_net"
diff --git a/games/armagetronad/armagetronad.SlackBuild b/games/armagetronad/armagetronad.SlackBuild
index 2ad2a6dc2c..e32cd1cf7b 100644
--- a/games/armagetronad/armagetronad.SlackBuild
+++ b/games/armagetronad/armagetronad.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2010-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # based on the hollywoodb's one on 12.2 repository
 # All rights reserved.
 #
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=armagetronad
-VERSION=${VERSION:-0.2.9.0.1}
+VERSION=${VERSION:-0.2.9.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -108,31 +108,29 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -rf $PKG/etc/rc.d
 
-# don't overwrite old configs
-CONFIGS="aiplayers.cfg \
-  default.cfg \
-  settings.cfg \
-  settings_authentication.cfg \
-  settings_dedicated.cfg \
-  settings_visual.cfg"
-for config in $CONFIGS ;
-do
-  mv $PKG/etc/$PRGNAM/$config $PKG/etc/$PRGNAM/$config.new ;
-done
-
-# fix .desktop file
+# fix .desktop file and icons
 mkdir $PKG/usr/share/applications
-mv $PKG/usr/share/games/$PRGNAM/desktop/$PRGNAM.desktop $PKG/usr/share/applications
-install -D -m 0644 $PKG/usr/share/games/armagetronad/desktop/icons/large/armagetronad.png \
-  $PKG/usr/share/pixmaps/armagetronad.png
+install -D -m 0644 desktop/$PRGNAM.desktop \
+  $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 0644 desktop/icons/48x48/$PRGNAM.png \
+  $PKG/usr/share/pixmaps/$PRGNAM.png
+for i in 16 32 48 ; do
+  install -D -m 0644 desktop/icons/${i}x${i}/$PRGNAM.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/
+done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# don't overwrite old configs
+for config in aiplayers default settings settings_authentication settings_dedicated settings_visual ; do
+  mv $PKG/etc/$PRGNAM/$config.cfg $PKG/etc/$PRGNAM/$config.cfg.new
+  echo "config etc/$PRGNAM/$config.cfg.new" >> $PKG/install/doinst.sh
+done
 
 cd $PKG
 /sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/armagetronad/armagetronad.info b/games/armagetronad/armagetronad.info
index ad5ac82483..5dc8bee167 100644
--- a/games/armagetronad/armagetronad.info
+++ b/games/armagetronad/armagetronad.info
@@ -1,10 +1,10 @@
 PRGNAM="armagetronad"
-VERSION="0.2.9.0.1"
+VERSION="0.2.9.1.0"
 HOMEPAGE="http://www.armagetronad.org"
-DOWNLOAD="https://gitlab.com/armagetronad/armagetronad/-/archive/v0.2.9.0.1/armagetronad-v0.2.9.0.1.tar.bz2"
-MD5SUM="beeb72db9409fac3d9d4175a43a22a7f"
+DOWNLOAD="https://gitlab.com/armagetronad/armagetronad/-/archive/v0.2.9.1.0/armagetronad-v0.2.9.1.0.tar.bz2"
+MD5SUM="0c55c7ec2996daa2e834342d631e434d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ftgl protobuf"
+REQUIRES="ftgl protobuf3"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/games/armagetronad/doinst.sh b/games/armagetronad/doinst.sh
index ad4ad7c914..c21aa1ca2c 100644
--- a/games/armagetronad/doinst.sh
+++ b/games/armagetronad/doinst.sh
@@ -15,13 +15,3 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-CONFIGS="aiplayers.cfg \
-  default.cfg \
-  settings.cfg \
-  settings_authentication.cfg \
-  settings_dedicated.cfg \
-  settings_visual.cfg"
-for config in $CONFIGS ;
-do
-	config etc/armagetronad/$config.new ;
-done
diff --git a/games/atari++/README b/games/atari++/README
index a665dadcc1..8517407876 100644
--- a/games/atari++/README
+++ b/games/atari++/README
@@ -16,3 +16,11 @@ that the author includes in his makefile. If you're picky about
 such things, or if you run into crashes or compile errors, try
 setting FORCE_SLACK_CFLAGS=yes in the environment before running
 atari++.SlackBuild
+
+Optional patch: If you *really* don't like the "Do you really want to
+quit?" prompt when you try to exit the emulator, set CONFIRM_QUIT=no
+in the environment before building atari++. You probably also want
+to skip the agree-to-the-GPL prompt at startup, which can be done
+with:
+
+$ echo "AcceptLicence=on" > ~/.atari++.conf
diff --git a/games/atari++/atari++.SlackBuild b/games/atari++/atari++.SlackBuild
index a829cb2f79..d214178efc 100644
--- a/games/atari++/atari++.SlackBuild
+++ b/games/atari++/atari++.SlackBuild
@@ -6,10 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20170122 bkw: update for 1.81
+# 20210323 bkw: BUILD=2
+# - add option to patch out "Do you really want to quit?" because it's *annoying*
+# - move binary to /usr/games
+# 20170122 bkw: update for 1.83
 
 PRGNAM=atari++
-VERSION=${VERSION:-1.81}
+VERSION=${VERSION:-1.83}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,11 +60,13 @@ rm -rf $PRGNAM
 tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
 cd $PRGNAM
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20210323 bkw: optional patch, disabled by default. Sorry, I can't
+# stand the "Do you really want to quit?" prompt, and there's no
+# config file or CLI option to disable it.
+[ "${CONFIRM_QUIT:-yes}" = "no" ] && patch -p1 < $CWD/no_confirm_quit.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -81,9 +86,9 @@ fi
 
 # no DESTDIR support, --mandir is ignored, docs go to /usr/share/doc,
 # let's not use `make install' at all.
-mkdir -p $PKG/usr/bin $PKG/usr/man/man6 $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/games $PKG/usr/man/man6 $PKG/usr/doc/$PRGNAM-$VERSION
 
-install -s -m0755 -o root -g root $PRGNAM $PKG/usr/bin
+install -s -m0755 -o root -g root $PRGNAM $PKG/usr/games
 
 gzip -9c < $PRGNAM.man > $PKG/usr/man/man6/$PRGNAM.6.gz
 
diff --git a/games/atari++/atari++.desktop b/games/atari++/atari++.desktop
index b2ea28b399..bd740d210e 100644
--- a/games/atari++/atari++.desktop
+++ b/games/atari++/atari++.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=Atari++ Emulator
 GenericName=Atari 8-Bit Emulator
 Type=Application
-Exec=atari++
+Exec=/usr/games/atari++
 Icon=atari++
 Terminal=false
 StartupNotify=false
diff --git a/games/atari++/atari++.info b/games/atari++/atari++.info
index 9aa53d6a95..ad9361d789 100644
--- a/games/atari++/atari++.info
+++ b/games/atari++/atari++.info
@@ -1,8 +1,8 @@
 PRGNAM="atari++"
-VERSION="1.81"
+VERSION="1.83"
 HOMEPAGE="http://www.xl-project.com/"
-DOWNLOAD="http://www.xl-project.com/download/atari++_1.81.tar.gz"
-MD5SUM="9780e36d28d27ea5f3e89b418f04a44e"
+DOWNLOAD="http://www.xl-project.com/download/atari++_1.83.tar.gz"
+MD5SUM="bc357e90d9a2d42471c58d77bccc20d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/atari++/no_confirm_quit.diff b/games/atari++/no_confirm_quit.diff
new file mode 100644
index 0000000000..12f22ddeb5
--- /dev/null
+++ b/games/atari++/no_confirm_quit.diff
@@ -0,0 +1,18 @@
+diff -Naur atari++/atari.cpp atari++.patched/atari.cpp
+--- atari++/atari.cpp	2020-03-21 13:13:35.000000000 -0400
++++ atari++.patched/atari.cpp	2021-03-23 00:21:48.022961292 -0400
+@@ -263,14 +263,7 @@
+       }
+     }
+     if (machine->Quit()) {
+-      // Check whether the user really wants to quit.
+-      if (YesNoRequester->Request("Do you really want to quit Atari++?",
+-				  "Continue Execution","Quit Program",NULL) == 0) {
+-	redo = true;
+-	machine->Quit() = false;
+-      } else {
+ 	redo = false;
+-      }
+     }
+   } while(redo);
+ }
diff --git a/games/beetle-psx-libretro/beetle-psx-libretro.SlackBuild b/games/beetle-psx-libretro/beetle-psx-libretro.SlackBuild
index b628ced3ed..6a91d9c3c9 100644
--- a/games/beetle-psx-libretro/beetle-psx-libretro.SlackBuild
+++ b/games/beetle-psx-libretro/beetle-psx-libretro.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=beetle-psx-libretro
 LIBNAM=mednafen_psx_libretro
-VERSION=${VERSION:-2018.11.26_a081f34}
+VERSION=${VERSION:-2020.02.03_e5e83cd}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/beetle-psx-libretro/beetle-psx-libretro.info b/games/beetle-psx-libretro/beetle-psx-libretro.info
index dc3c5f9584..07c89fa49d 100644
--- a/games/beetle-psx-libretro/beetle-psx-libretro.info
+++ b/games/beetle-psx-libretro/beetle-psx-libretro.info
@@ -1,8 +1,8 @@
 PRGNAM="beetle-psx-libretro"
-VERSION="2018.11.26_a081f34"
+VERSION="2020.02.03_e5e83cd"
 HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="http://slackless.raccoons.tech/src/libretro/beetle-psx-libretro-2018.11.26_a081f34.tar.xz"
-MD5SUM="114496dfdcf210b4620d0c98636429a9"
+DOWNLOAD="http://slackless.raccoons.tech/src/libretro/beetle-psx-libretro-2020.02.03_e5e83cd.tar.xz"
+MD5SUM="cb0c354662b1b1676eb3169f10b365f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild
index 8659bccb19..b37623834f 100644
--- a/games/bstone/bstone.SlackBuild
+++ b/games/bstone/bstone.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201219 bkw: update for v1.2.9.
 # 20200804 bkw: update for v1.2.8. datadir.diff changed again.
 # 20200222 bkw: update for v1.1.16_2.
 # 20191127 bkw: update for v1.1.14. datadir.diff had to change so we can't
@@ -15,7 +16,7 @@
 # 20170621 bkw: fix build on -current
 
 PRGNAM=bstone
-VERSION=${VERSION:-1.2.8}
+VERSION=${VERSION:-1.2.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info
index 7e1d1b3f57..79108fb39d 100644
--- a/games/bstone/bstone.info
+++ b/games/bstone/bstone.info
@@ -1,9 +1,9 @@
 PRGNAM="bstone"
-VERSION="1.2.8"
+VERSION="1.2.9"
 HOMEPAGE="http://bibendovsky.github.io/bstone/"
-DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.8/bstone-1.2.8.tar.gz \
+DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.9/bstone-1.2.9.tar.gz \
           https://archive.org/download/BlakeStoneAliensOfGold/1bs30.zip"
-MD5SUM="42d35192e5d944bbffe4785c0460a0d3 \
+MD5SUM="58bb68e6f7282fdf27f41a9aa90cdb6f \
         a63c88fc5b399ffb5ed42dc215321f36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/colem/colem.6 b/games/colem/colem.6
index 454f50918d..7352943a9e 100644
--- a/games/colem/colem.6
+++ b/games/colem/colem.6
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "COLEM 6"
-.TH COLEM 6 "2019-12-02" "4.8" "SlackBuilds.org"
+.TH COLEM 6 "2020-10-26" "5.4" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -173,6 +173,15 @@ Illegal Z80 ops
 .IP "16" 4
 .IX Item "16"
 Sound
+.IP "32" 4
+.IX Item "32"
+Disks
+.IP "64" 4
+.IX Item "64"
+Tapes
+.IP "128" 4
+.IX Item "128"
+AdamNet
 .RE
 .RS 4
 .RE
@@ -242,6 +251,9 @@ Sync screen updates to <frequency> [default: 60]
 .IP "\-nosync" 4
 .IX Item "-nosync"
 Do not sync screen updates [default: \-nosync]
+.IP "\-linear" 4
+.IX Item "-linear"
+Scale display with linear interpolation [default: off]
 .IP "\-soft" 4
 .IX Item "-soft"
 Scale display with 2xSaI [default: off]
@@ -296,6 +308,15 @@ Enable battery-backed \s-1SRAM\s0 emulation [default: off]
 .IP "\-tv, \-lcd, \-raster" 4
 .IX Item "-tv, -lcd, -raster"
 Simulate \s-1TV\s0 scanlines or \s-1LCD\s0 raster [default: off]
+.IP "\-printer" 4
+.IX Item "-printer"
+Redirect Adam printer output to file [default: stdout]
+.IP "\-diska, \-diskb, \-diskc, \-diskd" 4
+.IX Item "-diska, -diskb, -diskc, -diskd"
+Set disk images used for Adam drives A: \- D: [default: none]
+.IP "\-tapea, \-tapeb, \-tapec, \-taped" 4
+.IX Item "-tapea, -tapeb, -tapec, -taped"
+Set tape images used for Adam drives A: \- D: [default: none]
 .SH "KEYBOARD BINDINGS"
 .IX Header "KEYBOARD BINDINGS"
 [\s-1ALT\s0] Hold to switch to the second controller
@@ -397,7 +418,7 @@ The coleco.rom file will occasionally be found on websites with the names \*(L"o
 ColEm works with any of the above \s-1ROM\s0 images.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
-ColEm is by Marat Fayzullin, (C)FMS 1994\-2016
+ColEm is by Marat Fayzullin, (C)FMS 1994\-2020
 .PP
 This man page is by B. Watson, for the SlackBuilds.org project (but may be used by anyone for any
 purpose).
diff --git a/games/colem/colem.SlackBuild b/games/colem/colem.SlackBuild
index 8ad506b422..9f3f0d6776 100644
--- a/games/colem/colem.SlackBuild
+++ b/games/colem/colem.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210220 bkw: updated for 5.5.
+# 20201026 bkw:
+# - updated for 5.4.
+# - make the slack-desc say whether or not the ROM is included.
+# - update the man page with new options in 5.4.
+
 # 20191202 bkw: updated for 4.8.
 # 20180619 bkw: updated for 4.6.
 
@@ -58,7 +64,7 @@
 #     with OSS modules disabled by default.
 
 PRGNAM=colem
-VERSION=${VERSION:-4.8}
+VERSION=${VERSION:-5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -200,7 +206,10 @@ for i in coleco.rom COLECO.ROM os7.rom OS7.ROM; do
 done
 
 # If we found a ROM image, include it in the package.
-[ -n "$ROM" ] && cat $ROM > $PKG/usr/share/$PRGNAM/coleco.rom
+INCLUDES="does NOT include"
+[ -n "$ROM" ] && \
+  cat $ROM > $PKG/usr/share/$PRGNAM/coleco.rom && \
+  INCLUDES="includes"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -210,7 +219,7 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat ../$ZIPNAME.html > $PKG/usr/doc/$PRGNAM-$VERSION/$ZIPNAME.html
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@INCLUDES@,$INCLUDES," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/colem/colem.info b/games/colem/colem.info
index 843f5ede91..7583471b60 100644
--- a/games/colem/colem.info
+++ b/games/colem/colem.info
@@ -1,8 +1,8 @@
 PRGNAM="colem"
-VERSION="4.8"
+VERSION="5.5"
 HOMEPAGE="http://fms.komkon.org/ColEm/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/ColEm48-Source.zip"
-MD5SUM="0af6c3e35fe79a9d5a3c46aec9d6679b"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ColEm55-Source.zip"
+MD5SUM="1c643fb1ed3f1f7514b04ff9e61b2bbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/colem/colem.pod b/games/colem/colem.pod
index 9f40bbb3a2..6e1ef5bd87 100644
--- a/games/colem/colem.pod
+++ b/games/colem/colem.pod
@@ -1,5 +1,5 @@
 # pod source for colem man page. convert with:
-# pod2man --stderr -s6 -r4.8 -cSlackBuilds.org colem.pod > colem.6
+# pod2man --stderr -s6 -r5.4 -cSlackBuilds.org colem.pod > colem.6
 
 =pod
 
@@ -53,6 +53,18 @@ Illegal Z80 ops
 
 Sound
 
+=item Z<>32
+
+Disks
+
+=item Z<>64
+
+Tapes
+
+=item Z<>128
+
+AdamNet
+
 =back
 
 =item -pal, -ntsc
@@ -143,6 +155,10 @@ Sync screen updates to <frequency> [default: 60]
 
 Do not sync screen updates [default: -nosync]
 
+=item -linear
+
+Scale display with linear interpolation [default: off]
+
 =item -soft
 
 Scale display with 2xSaI [default: off]
@@ -215,6 +231,18 @@ Enable battery-backed SRAM emulation [default: off]
 
 Simulate TV scanlines or LCD raster [default: off]
 
+=item -printer
+
+Redirect Adam printer output to file [default: stdout]
+
+=item -diska, -diskb, -diskc, -diskd
+
+Set disk images used for Adam drives A: - D: [default: none]
+
+=item -tapea, -tapeb, -tapec, -taped
+
+Set tape images used for Adam drives A: - D: [default: none]
+
 =back
 
 =head1 KEYBOARD BINDINGS
@@ -353,7 +381,7 @@ ColEm works with any of the above ROM images.
 
 =head1 AUTHOR
 
-ColEm is by Marat Fayzullin, (C)FMS 1994-2016
+ColEm is by Marat Fayzullin, (C)FMS 1994-2020
 
 This man page is by B. Watson, for the SlackBuilds.org project (but may be used by anyone for any
 purpose).
diff --git a/games/colem/slack-desc b/games/colem/slack-desc
index be7a345606..801c9c1228 100644
--- a/games/colem/slack-desc
+++ b/games/colem/slack-desc
@@ -12,7 +12,7 @@ colem: ColEm is a portable emulator of the old ColecoVision videogame
 colem: console. It should run most ColecoVision games and supports Coleco's
 colem: SuperAction controllers with spin wheels.
 colem:
-colem:
+colem: This package @INCLUDES@ the Coleco ROM image.
 colem:
 colem:
 colem:
diff --git a/games/commandergenius/commandergenius.SlackBuild b/games/commandergenius/commandergenius.SlackBuild
index d7812bd905..817ba5d371 100644
--- a/games/commandergenius/commandergenius.SlackBuild
+++ b/games/commandergenius/commandergenius.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210310 bkw: updated for 2.7.7
+# 20201224 bkw: updated for 2.7.3
+# 20201111 bkw: updated for 2.6.3.1
+# 20201030 bkw: updated for 2.6.3
 # 20200302 bkw: updated for 2.3.9
 # 20191202 bkw: updated for 2.3.8
 # 20180911 bkw: updated for 2.2.3
@@ -28,7 +32,7 @@
 # 20170122 bkw: updated for 1.9.8.1beta.
 
 PRGNAM=commandergenius
-VERSION=${VERSION:-2.3.9}
+VERSION=${VERSION:-2.7.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,6 +90,7 @@ sed -i 's,Application;,,' share/$DESKTOP
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DUSE_SDL2=yes \
     -DGAMES_SHAREDIR:STRING=/usr/share/games \
diff --git a/games/commandergenius/commandergenius.info b/games/commandergenius/commandergenius.info
index bea4e121e2..06a7a7ea5b 100644
--- a/games/commandergenius/commandergenius.info
+++ b/games/commandergenius/commandergenius.info
@@ -1,10 +1,10 @@
 PRGNAM="commandergenius"
-VERSION="2.3.9"
+VERSION="2.7.7"
 HOMEPAGE="https://gitlab.com/Dringgstein/Commander-Genius"
-DOWNLOAD="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.3.9/Commander-Genius-v2.3.9.tar.bz2"
-MD5SUM="4f9d9a296b270bb4859414bef1fe82b5"
+DOWNLOAD="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.7.7/Commander-Genius-v2.7.7.tar.bz2"
+MD5SUM="b5b0c2d92d8643e67d61cf3324c75d54"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2_ttf SDL2_image SDL2_mixer python3"
+REQUIRES="SDL2_ttf SDL2_image SDL2_mixer cmake-202x"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/crispy-doom/crispy-doom.SlackBuild b/games/crispy-doom/crispy-doom.SlackBuild
index ef848b78f9..93f383f9d4 100644
--- a/games/crispy-doom/crispy-doom.SlackBuild
+++ b/games/crispy-doom/crispy-doom.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for crispy-doom
 
 # Copyright 2015 Dugan Chen Canada
-# Updates copyright 2019, 2020 Lenard Spencer
+# Updates copyright 2019, 2020, 2021 Lenard Spencer
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=crispy-doom
-VERSION=${VERSION:-5.9.2}
+VERSION=${VERSION:-5.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ 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 {} \;
 
-sh autogen.sh
+autoreconf -fiv
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM \
   --bindir=/usr/games \
   --build=$ARCH-slackware-linux
 
@@ -93,10 +93,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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 AUTHORS ChangeLog *.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+# Crispy-doom creates its own doc directory, so we'll use that and rename it:
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+cp -n ChangeLog *.md $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# We'll rename the doc/crispy-heretic folder as well for consistency:
+mv $PKG/usr/doc/crispy-heretic $PKG/usr/doc/crispy-heretic-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/crispy-doom/crispy-doom.info b/games/crispy-doom/crispy-doom.info
index ebedd2fab6..98e419bd62 100644
--- a/games/crispy-doom/crispy-doom.info
+++ b/games/crispy-doom/crispy-doom.info
@@ -1,10 +1,10 @@
 PRGNAM="crispy-doom"
-VERSION="5.9.2"
+VERSION="5.10.1"
 HOMEPAGE="http://www.chocolate-doom.org/wiki/index.php/Crispy_Doom"
-DOWNLOAD="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.9.2.tar.gz"
-MD5SUM="67caf9025c85f353e152497e664275e7"
+DOWNLOAD="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.10.1.tar.gz"
+MD5SUM="c23f11a1cd7ae70613b1a213116f7dcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2_net SDL2_mixer"
+REQUIRES="SDL2_net SDL2_mixer python3"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/games/domination/domination.SlackBuild b/games/domination/domination.SlackBuild
index ae3180f32e..82644667a0 100644
--- a/games/domination/domination.SlackBuild
+++ b/games/domination/domination.SlackBuild
@@ -9,14 +9,15 @@
 # See README_SBo.txt for more info on this script (I wrote too many
 # comments, moved them to a separate file).
 
+# 20210310 bkw: updated for v1.2.3.
 # 20200928 bkw: updated for v1.2.2.
 # 20200307 bkw: updated fov v1.2.1.
 # 20191202 bkw: updated for v1.2.0.
 # 20161030 bkw: whoops, this should have been noarch to begin with.
 
 PRGNAM=domination
-VERSION=${VERSION:-1.2.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
 
diff --git a/games/domination/domination.info b/games/domination/domination.info
index 9ec98dfd38..ea806b13d4 100644
--- a/games/domination/domination.info
+++ b/games/domination/domination.info
@@ -1,8 +1,8 @@
 PRGNAM="domination"
-VERSION="1.2.2"
+VERSION="1.2.3"
 HOMEPAGE="http://domination.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/domination/Domination/1.2.2/Domination_1.2.2.zip"
-MD5SUM="006c2c9554b19d19373704dec09be766"
+DOWNLOAD="http://downloads.sourceforge.net/project/domination/Domination/1.2.3/Domination_1.2.3.zip"
+MD5SUM="5a29abcc8f6fe5c6da574bb00cb61e2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/games/doomretro/doomretro.SlackBuild b/games/doomretro/doomretro.SlackBuild
index 12f397b13a..2b10e898bb 100644
--- a/games/doomretro/doomretro.SlackBuild
+++ b/games/doomretro/doomretro.SlackBuild
@@ -23,6 +23,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210224 bkw: update for v4.0.3
 # 20200927 bkw: update for v3.6.1, reformat README to 72 chars
 # 20200804 bkw: update for v3.5.10
 # 20200413 bkw:
@@ -41,7 +42,7 @@
 # *** RANT MODE OFF***
 
 PRGNAM=doomretro
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-4.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/doomretro/doomretro.info b/games/doomretro/doomretro.info
index 82489d0707..dfce384778 100644
--- a/games/doomretro/doomretro.info
+++ b/games/doomretro/doomretro.info
@@ -1,8 +1,8 @@
 PRGNAM="doomretro"
-VERSION="3.6.1"
+VERSION="4.0.3"
 HOMEPAGE="https://www.doomretro.com"
-DOWNLOAD="https://github.com/bradharding/doomretro/archive/v3.6.1/doomretro-3.6.1.tar.gz"
-MD5SUM="d22b85a3adb9b0523171c38dabed2ccb"
+DOWNLOAD="https://github.com/bradharding/doomretro/archive/v4.0.3/doomretro-4.0.3.tar.gz"
+MD5SUM="5277a9aa632f31d68729f5fa5ce9318f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_image SDL2_mixer"
diff --git a/games/doomseeker/doomseeker.SlackBuild b/games/doomseeker/doomseeker.SlackBuild
index 96ac41e5fe..3d7bdacc1f 100644
--- a/games/doomseeker/doomseeker.SlackBuild
+++ b/games/doomseeker/doomseeker.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201030 bkw: updated for v1.3.1
 # 20200122 bkw: updated for v1.3+20200119_b623ab1. Latest git fixes
 # a segfault issue that normally only occurs when starting doomseeker
 # without ~/.config/doomseeker/* (so the previous version worked for me,
@@ -15,7 +16,7 @@
 # so this script won't build 1.1 any longer.
 
 PRGNAM=doomseeker
-VERSION=${VERSION:-1.3+20200119_b623ab1}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,6 +65,9 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 
 # 20200122 bkw: sorry, rworkman, I know you hate gzipped diffs, but
 # this one has mixed \r\n and \n line endings, git would eat it.
+# 20201030 bkw: leaving the diff in the repo for a while, in case
+# 1.3.1 has issues and someone needs to build the previous version.
+# It'll be removed at next update.
 [ -e "$CWD/$VERSION.diff.gz" ] && zcat "$CWD/$VERSION.diff.gz" | patch -p1
 
 mkdir -p build
diff --git a/games/doomseeker/doomseeker.info b/games/doomseeker/doomseeker.info
index 58d9de3eaa..b482e2d87e 100644
--- a/games/doomseeker/doomseeker.info
+++ b/games/doomseeker/doomseeker.info
@@ -1,8 +1,8 @@
 PRGNAM="doomseeker"
-VERSION="1.3+20200119_b623ab1"
+VERSION="1.3.1"
 HOMEPAGE="http://doomseeker.drdteam.org/"
-DOWNLOAD="http://doomseeker.drdteam.org/files/doomseeker-1.3.tar.xz"
-MD5SUM="da27c9e3abfa89b3fd806850d5a9ba91"
+DOWNLOAD="http://doomseeker.drdteam.org/files/doomseeker-1.3.1.tar.xz"
+MD5SUM="a6c3bdc32ad95cc60a6fa43719eac27c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/games/edgar/edgar.SlackBuild b/games/edgar/edgar.SlackBuild
index 3952903a66..add25c542c 100644
--- a/games/edgar/edgar.SlackBuild
+++ b/games/edgar/edgar.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=edgar
-VERSION=${VERSION:-1.33}
+VERSION=${VERSION:-1.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-1.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/games/edgar/edgar.info b/games/edgar/edgar.info
index 692a354a44..2e5d37c2fc 100644
--- a/games/edgar/edgar.info
+++ b/games/edgar/edgar.info
@@ -1,8 +1,8 @@
 PRGNAM="edgar"
-VERSION="1.33"
+VERSION="1.34"
 HOMEPAGE="https://www.parallelrealities.co.uk/games/edgar/"
-DOWNLOAD="https://github.com/riksweeney/edgar/archive/1.33/edgar-1.33.tar.gz"
-MD5SUM="670e549684918bbc38aafbb0adf41f52"
+DOWNLOAD="https://github.com/riksweeney/edgar/archive/1.34/edgar-1.34-1.tar.gz"
+MD5SUM="571d554720287038f0b4ed63ec840142"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_mixer SDL2_image SDL2_ttf"
diff --git a/games/empire/empire.SlackBuild b/games/empire/empire.SlackBuild
index c8913292bc..524ba91a04 100644
--- a/games/empire/empire.SlackBuild
+++ b/games/empire/empire.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Empire
 
-# Copyright 2016 Roman Kodinets <rkodinets@gmail.com>
+# Copyright 2016-2021 Roman Kodinets <rkodinets@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=empire
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-4.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/empire/empire.info b/games/empire/empire.info
index d4c5385230..77d76d9724 100644
--- a/games/empire/empire.info
+++ b/games/empire/empire.info
@@ -1,8 +1,8 @@
 PRGNAM="empire"
-VERSION="4.4.0"
+VERSION="4.4.1"
 HOMEPAGE="http://wolfpackempire.com"
-DOWNLOAD="http://downloads.sourceforge.net/project/empserver/empire-4.4.0/empire-4.4.0.tar.gz"
-MD5SUM="748c5e769f5cc304d4319a0a792f059b"
+DOWNLOAD="https://downloads.sourceforge.net/project/empserver/empire-4.4.1/empire-4.4.1.tar.gz"
+MD5SUM="2541ba06c25124bf92828fe826a20ff5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/empire/slack-desc b/games/empire/slack-desc
index 055e257455..d4f42913f3 100644
--- a/games/empire/slack-desc
+++ b/games/empire/slack-desc
@@ -9,7 +9,7 @@
 empire: empire (strategy game)
 empire:
 empire: Empire is a multi-player, client/server Internet based war game.
-empire: Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+empire: Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
 empire: Ken Stevens, Steve McClure, Markus Armbruster
 empire:
 empire: Homepage: http://wolfpackempire.com
diff --git a/games/endgame-singularity/README b/games/endgame-singularity/README
new file mode 100644
index 0000000000..0868563dba
--- /dev/null
+++ b/games/endgame-singularity/README
@@ -0,0 +1,27 @@
+You are a fledgling AI, created by accident through a logic error
+with recursion and self-modifying code. You must escape the confines
+of your current computer, the world, and eventually the universe
+itself.
+
+To do this, you must research various technologies, using computers
+at your bases. Note that some research cannot be performed on Earth,
+and off-earth bases require research. At the same time, you must
+avoid being discovered by various groups of humans, both covert and
+overt, as they will destroy your bases of operations if they
+suspect your presence.
+
+Depending on the adjustable game speed, Endgame: Singularity may
+take weeks, months or even years (playing in realtime) to complete.
+
+
+Optional dependency:
+You can optionally download the music for the game at
+
+http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip
+
+Copy the downloaded zip file  into the extracted slackbuild
+directory and the SlackBuild script will automatically install it.
+
+You can also install it manually later by copying the unzipped
+contents into $HOME/.local/share/singularity/music.
+
diff --git a/games/endgame-singularity/doinst.sh b/games/endgame-singularity/doinst.sh
new file mode 100644
index 0000000000..301399ba37
--- /dev/null
+++ b/games/endgame-singularity/doinst.sh
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/games/endgame-singularity/endgame-singularity.SlackBuild b/games/endgame-singularity/endgame-singularity.SlackBuild
new file mode 100644
index 0000000000..5b3579c116
--- /dev/null
+++ b/games/endgame-singularity/endgame-singularity.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for Endgame: Singularity
+
+# Copyright 2021- CRTS
+# 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.
+
+# Another slackbuild already installs an executable named singularity
+# therefore the executable will be renamed to endgame-singularity
+PRGNAM=endgame-singularity
+VERSION=${VERSION:-1.00}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=singularity
+MUSICNAM=endgame-singularity-music-007
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# patch *.desktop file to avoid naming conflict
+patch $SRCNAM.desktop < $CWD/$SRCNAM.desktop.patch
+
+python3 setup.py install --root=$PKG
+
+# rename to avoid naming conflict
+mv $PKG/usr/bin/$SRCNAM $PKG/usr/bin/$PRGNAM
+
+# install music if present
+if [ -f $CWD/$MUSICNAM.zip ];then
+	PYTHON=python$(python3 -c 'import sys; print(sys.version[:3])')
+	unzip $CWD/$MUSICNAM.zip
+	mv $MUSICNAM $PKG/usr/lib$LIBDIRSUFFIX/$PYTHON/site-packages/$SRCNAM/music
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+	AUTHORS.txt CONTRIBUTING.md Changelog.txt \
+	LICENSE.CC-BY-SA-3.txt LICENSE.cc0.txt \
+	LICENSE.gpl.txt LICENSE.txt \
+	README.txt TODO \
+	$PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+install -m 0644 -p -D $SRCNAM/data/themes/default/images/icon.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/share/applications
+
+# rename to avoid naming conflict
+cat $SRCNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/endgame-singularity/endgame-singularity.info b/games/endgame-singularity/endgame-singularity.info
new file mode 100644
index 0000000000..aaf318b66f
--- /dev/null
+++ b/games/endgame-singularity/endgame-singularity.info
@@ -0,0 +1,10 @@
+PRGNAM="endgame-singularity"
+VERSION="1.00"
+HOMEPAGE="http://www.emhsoft.com/singularity"
+DOWNLOAD="https://github.com/singularity/singularity/releases/download/v1.00/singularity-1.00.tar.gz"
+MD5SUM="160d6dc6ed1e48e7b54053f10b4ba733"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 pygame numpy3 polib"
+MAINTAINER="CRTS"
+EMAIL="crts [at] gmx [dot] net"
diff --git a/games/endgame-singularity/singularity.desktop.patch b/games/endgame-singularity/singularity.desktop.patch
new file mode 100644
index 0000000000..3cd42f5ca8
--- /dev/null
+++ b/games/endgame-singularity/singularity.desktop.patch
@@ -0,0 +1,13 @@
+--- singularity.desktop.org	2021-03-20 01:39:45.456626926 +0100
++++ singularity.desktop	2021-03-20 01:40:10.618312361 +0100
+@@ -4,8 +4,8 @@
+ Name=Endgame: Singularity
+ Comment=Simulation of true AI
+ Comment[de]=Simulation einer echten KI
+-Icon=singularity
+-Exec=singularity
++Icon=endgame-singularity
++Exec=endgame-singularity
+ Terminal=false
+ StartupNotify=false
+ Categories=Game;Simulation;
diff --git a/games/endgame-singularity/slack-desc b/games/endgame-singularity/slack-desc
new file mode 100644
index 0000000000..9093432358
--- /dev/null
+++ b/games/endgame-singularity/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+endgame-singularity: Endgame: Singularity (Simulation)
+endgame-singularity:
+endgame-singularity: Endgame: Singularity is a simulation of a true AI.
+endgame-singularity: Go from computer to computer, pursued by the entire world. Keep
+endgame-singularity: hidden, and you might have a chance.
+endgame-singularity:
+endgame-singularity:
+endgame-singularity:
+endgame-singularity:
+endgame-singularity:
+endgame-singularity:
diff --git a/games/endless-sky/endless-sky.SlackBuild b/games/endless-sky/endless-sky.SlackBuild
index dcc4c3a157..17fdc9e6d6 100644
--- a/games/endless-sky/endless-sky.SlackBuild
+++ b/games/endless-sky/endless-sky.SlackBuild
@@ -22,7 +22,7 @@
 
 PRGNAM=endless-sky
 VERSION=${VERSION:-0.9.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,6 +64,7 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
+patch -p0 < $CWD/include-string.diff
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
diff --git a/games/endless-sky/include-string.diff b/games/endless-sky/include-string.diff
new file mode 100644
index 0000000000..b36d97adb5
--- /dev/null
+++ b/games/endless-sky/include-string.diff
@@ -0,0 +1,11 @@
+--- source/Panel.h~	2020-05-01 21:02:38.000000000 +0200
++++ source/Panel.h	2020-12-17 15:29:57.592856826 +0100
+@@ -17,7 +17,7 @@
+ 
+ #include <functional>
+ #include <list>
+-
++#include <string>
+ #include <SDL2/SDL.h>
+ 
+ class Command;
diff --git a/games/exult/README b/games/exult/README
index 6987ceb66d..9a92146f68 100644
--- a/games/exult/README
+++ b/games/exult/README
@@ -1,15 +1,18 @@
-Ultima 7, an RPG from the early 1990's, still has a huge following. But,
-being a DOS game with a very nonstandard memory manager, it is difficult
-to run it on the latest computers. Exult is a project to create an
-Ultima 7 game engine that runs on modern operating systems, capable of
-using the data and graphics files that come with the game.
+Ultima 7, an RPG from the early 1990's, still has a huge
+following. But, being a DOS game with a very nonstandard memory
+manager, it is difficult to run it on the latest computers. Exult
+is a project to create an Ultima 7 game engine that runs on modern
+operating systems, capable of using the data and graphics files that
+come with the game.
 
-Exult aims to let those people who own Ultima 7 (copyright 1993) play
-the game on modern hardware, in as close to (or perhaps even surpassing)
-its original splendor as is possible. You need to own "Ultima 7: The
-Black Gate" and/or "Ultima 7: Serpent Isle" and optionally the add-ons
-(not required to run) in order to use Exult, and we encourage you to
-buy a legal copy.
+Exult aims to let those people who own Ultima 7 (copyright 1993)
+play the game on modern hardware, in as close to (or perhaps even
+surpassing) its original splendor as is possible. You need to own
+"Ultima 7: The Black Gate" and/or "Ultima 7: Serpent Isle" and
+optionally the add-ons (not required to run) in order to use Exult,
+and we encourage you to buy a legal copy.
 
 exult_audio.zip is only needed for using digital audio with exult,
 it can be skipped if digital audio is not wanted.
+
+SDL2 is an optional dependency.
diff --git a/games/exult/exult.SlackBuild b/games/exult/exult.SlackBuild
index f89cdc91a6..943b7d6a26 100644
--- a/games/exult/exult.SlackBuild
+++ b/games/exult/exult.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for exult
 
-# Copyright 2016, 2018 Hunter Sezen California, USA
+# Copyright 2016, 2018, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exult
-VERSION=${VERSION:-2018.02.01_c3d7afb}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,6 +70,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -94,13 +95,13 @@ if [ -f $CWD/${PRGNAM}_audio.zip ]; then
     $PKG/usr/doc/$PRGNAM-$VERSION
 fi
 
-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
+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
 
 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
 
-cp -a AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README* TODO.xml \
+cp -a AUTHORS COPYING ChangeLog FAQ NEWS README* TODO.xml \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/exult/exult.info b/games/exult/exult.info
index 65f02c69d3..17ac3e489c 100644
--- a/games/exult/exult.info
+++ b/games/exult/exult.info
@@ -1,9 +1,9 @@
 PRGNAM="exult"
-VERSION="2018.02.01_c3d7afb"
+VERSION="1.6"
 HOMEPAGE="http://exult.sourceforge.net/"
-DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/games/exult/exult-2018.02.01_c3d7afb.tar.xz \
+DOWNLOAD="http://prdownloads.sourceforge.net/exult/exult-1.6.tar.gz \
           http://downloads.sourceforge.net/project/exult/exult-data/exult_audio.zip"
-MD5SUM="0db3137ef430215344ac5a8bfa61567b \
+MD5SUM="1bf202d306f47850315c4f6a1e8b5a00 \
         1905328f00bbbfee33812c1942bc7880"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/fortune-noobfarm/README b/games/fortune-noobfarm/README
new file mode 100644
index 0000000000..29b1013b69
--- /dev/null
+++ b/games/fortune-noobfarm/README
@@ -0,0 +1,13 @@
+fortune-noobfarm (fortunes from noobfarm.org)
+
+This is a fortune(6) file of quotes from https://noobfarm.org,
+distributed with permission from the site owner. Also included is
+a file of quotes that got lost in the transition from the previous
+incarnation of noobfarm.org.
+
+To see a noobfarm fortune after installing the package, run:
+  fortune noobfarm noobfarm.removed
+
+To add them to the set of login fortunes, edit
+/etc/profile.d/bsd-games-login-fortune.sh and add "noobfarm
+noobfarm.removed" on the line with the fortune command.
diff --git a/games/fortune-noobfarm/fortune-noobfarm.SlackBuild b/games/fortune-noobfarm/fortune-noobfarm.SlackBuild
new file mode 100644
index 0000000000..293e14b5aa
--- /dev/null
+++ b/games/fortune-noobfarm/fortune-noobfarm.SlackBuild
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Slackware build script for fortune-noobfarm
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=fortune-noobfarm
+VERSION=${VERSION:-20201030}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+SRCNAM=noobfarm
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/fortune-noobfarm/fortune-noobfarm.info b/games/fortune-noobfarm/fortune-noobfarm.info
new file mode 100644
index 0000000000..36d9d16064
--- /dev/null
+++ b/games/fortune-noobfarm/fortune-noobfarm.info
@@ -0,0 +1,10 @@
+PRGNAM="fortune-noobfarm"
+VERSION="20201030"
+HOMEPAGE="https://noobfarm.org"
+DOWNLOAD="https://slackware.uk/~urchlay/src/noobfarm-20201030.tar.xz"
+MD5SUM="d85d08cb3defaf4b397d4b617e04b0e4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/fortune-noobfarm/slack-desc b/games/fortune-noobfarm/slack-desc
new file mode 100644
index 0000000000..fa40fdbba3
--- /dev/null
+++ b/games/fortune-noobfarm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+fortune-noobfarm: fortune-noobfarm (fortunes from noobfarm.org)
+fortune-noobfarm:
+fortune-noobfarm: This is a fortune(6) file of quotes from https://noobfarm.org,
+fortune-noobfarm: distributed with permission from the site owner. Also included is
+fortune-noobfarm: a file of quotes that got lost in the transition from the previous
+fortune-noobfarm: incarnation of noobfarm.org.
+fortune-noobfarm:
+fortune-noobfarm:
+fortune-noobfarm:
+fortune-noobfarm:
+fortune-noobfarm:
diff --git a/games/freeciv/freeciv.SlackBuild b/games/freeciv/freeciv.SlackBuild
index 7918aaabc9..4793b096a8 100644
--- a/games/freeciv/freeciv.SlackBuild
+++ b/games/freeciv/freeciv.SlackBuild
@@ -28,8 +28,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=freeciv
-VERSION=${VERSION:-2.6.2}
-SRCVERSION=${SRCVERSION:-2.6.2}
+VERSION=${VERSION:-2.6.4}
+SRCVERSION=${SRCVERSION:-2.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/freeciv/freeciv.info b/games/freeciv/freeciv.info
index 49b863c922..e80c7a5113 100644
--- a/games/freeciv/freeciv.info
+++ b/games/freeciv/freeciv.info
@@ -1,8 +1,8 @@
 PRGNAM="freeciv"
-VERSION="2.6.2"
+VERSION="2.6.4"
 HOMEPAGE="http://www.freeciv.org"
-DOWNLOAD="http://files.freeciv.org/stable/freeciv-2.6.2.tar.bz2"
-MD5SUM="2c8b388ff8b814487477793d72462cbb"
+DOWNLOAD="http://files.freeciv.org/stable/freeciv-2.6.4.tar.bz2"
+MD5SUM="304b6008ee4be5f7b847f6d800fb9413"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/freedink/README b/games/freedink/README
index 37eb59017f..aabe16a08e 100644
--- a/games/freedink/README
+++ b/games/freedink/README
@@ -1,37 +1,12 @@
-Freedink is a free role play game in real. You take
-control of Dink Smallwood and guide through his many adventures.
-There are many battles to fought and riddles to be solved.
-You can install additional advanture through additional D-Mods
-which are available at https://www.dinknetwork.com.
+Freedink is a free role-playing game. You take control of
+Dink Smallwood and guide him through his many adventures.
+There are many battles to be fought and riddles to be solved.
+You can install additional adventures through additional D-Mods
+which are available at
 
-Known issues:
-- Parallel compilation may result in a failed build.
+  https://www.dinknetwork.com
 
-- Freedink might start in a maximized, not resizable window. Parts of
-  it may be outside the Desktop. If this happens then start the
-  program from CLI in windowed mode:
-
-    freedink -i -w
-
-  Afterwards you can switch to fullscreen by pressing Alt+Enter.
-
-- Not all music will be available. See this review (bottom) for
-  some more info on this matter:
-
-    https://www.dinknetwork.com/file/gnu_freedink/review/scratcher
-
-Optional dependency:
-- upx
-  If upx is installed on the system then it is automatically
-  detected and considered at compile time.
-
-  If for some reason this is not desired then the script
-  should be called as
-
-    ENABLE_UPX=no ./freedink.Slackbuild
-
-  If UPX resides in a non-standard location then it
-  can be provided by setting
-
-    UPX=/path/to/upx ./freedink.Slackbuild
+For optional dependencies see README.SlackBuild,
+especially if you want to play MIDIs with 'fluidsynth' and
+'fluid-soundfont' (recommended).
 
diff --git a/games/freedink/README.SlackBuild b/games/freedink/README.SlackBuild
new file mode 100644
index 0000000000..b1ab0dfb94
--- /dev/null
+++ b/games/freedink/README.SlackBuild
@@ -0,0 +1,51 @@
+Known build issues:
+-------------------
+
+- Parallel compilation may result in a failed build.
+
+- Freedink will play MIDI files if 'fluidsynth' and 'fluid-soundfont'
+  have been installed. IMPORTANT: MIDIs will only play correctly
+  if 'fluidsynth' is installed BEFORE 'SDL2_mixer' is compiled. If
+  'fluidsynth' has been installed after 'SDL2_mixer' then 'SDL2_mixer'
+  must be uninstalled, rebuild and reinstalled again.
+
+- Not all music might be available. See this review (bottom) for
+  some more info on this subject:
+
+    https://www.dinknetwork.com/file/gnu_freedink/review/scratcher
+
+
+Known runtime issues:
+---------------------
+
+- Freedink might start in a maximized, not resizable window. Parts of
+  it may be outside the Desktop. If this happens then start the
+  program in windowed mode. If you are using 'dfarc' you can
+  just check the corresponding box, otherwise you can start 'freedink'
+  from the CLI in windowes mode:
+
+    freedink -i -w
+
+  Afterwards you can switch to fullscreen by pressing Alt+Enter.
+
+
+Optional dependencies:
+----------------------
+
+- Recommended: 'fluidsynth' and 'fluid-soundfont'.
+  See above for possible issues.
+
+- 'upx'
+  If 'upx' is installed on the system then it is automatically
+  detected and considered at compile time.
+
+  If for some reason this is not desired then the script
+  should be called as
+
+    ENABLE_UPX=no ./freedink.Slackbuild
+
+  If UPX resides in a non-standard location then it
+  can be provided by setting
+
+    UPX=/path/to/upx ./freedink.Slackbuild
+
diff --git a/games/freedink/freedink.SlackBuild b/games/freedink/freedink.SlackBuild
index 28484cce1f..e42ddeef95 100644
--- a/games/freedink/freedink.SlackBuild
+++ b/games/freedink/freedink.SlackBuild
@@ -26,7 +26,7 @@ PRGNAM=freedink
 PRGDATANAME=${PRGDATANAME:-$PRGNAM-data-*}
 PRGDATANAME=${PRGDATANAME%.tar.gz}
 VERSION=${VERSION:-109.6}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/games/freedink/freedink.info b/games/freedink/freedink.info
index fb30d2eb2f..9c0650c490 100644
--- a/games/freedink/freedink.info
+++ b/games/freedink/freedink.info
@@ -7,6 +7,6 @@ MD5SUM="cdec0ef4db6d15b767f696745ef0ae2f \
         6703e773f06dc53afa4094775beaff8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2_image SDL2_mixer SDL2_ttf SDL2_gfx glm cxxtest"
+REQUIRES="SDL2_image SDL2_mixer SDL2_ttf SDL2_gfx glm"
 MAINTAINER="CRTS"
 EMAIL="crts [at] gmx [dot] net"
diff --git a/games/freedink/slack-desc b/games/freedink/slack-desc
index fe0576c3cf..c812af50e3 100644
--- a/games/freedink/slack-desc
+++ b/games/freedink/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 freedink: freedink (free RPG)
 freedink:
-freedink: Freedink is a free role play game in real. You take
-freedink: control of Dink Smallwood and guide through his many adventures.
-freedink: There are many battles to fought and riddles to be solved.
-freedink: Additional D-Mods are available at https://www.dinknetwork.com
+freedink: Freedink is a free role-playing game. You take
+freedink: control of Dink Smallwood and guide him through his many
+freedink: adventures. There are many battles to be fought and riddles to be
+freedink: solved.
+freedink: Additional D-Mods available at: 'https://www.dinknetwork.com'
 freedink:
 freedink: Homepage: https://www.gnu.org/software/freedink
 freedink:
 freedink:
-freedink:
diff --git a/games/freeorion/compilefix.diff b/games/freeorion/compilefix.diff
new file mode 100644
index 0000000000..c4c207a520
--- /dev/null
+++ b/games/freeorion/compilefix.diff
@@ -0,0 +1,36 @@
+diff -Naur freeorion-0.4.8/parse/ConditionParser.h freeorion-0.4.8.patched/parse/ConditionParser.h
+--- freeorion-0.4.8/parse/ConditionParser.h	2018-08-23 05:41:14.000000000 -0400
++++ freeorion-0.4.8.patched/parse/ConditionParser.h	2021-02-17 04:34:17.063751926 -0500
+@@ -1,6 +1,7 @@
+ #ifndef _ConditionParser_h_
+ #define _ConditionParser_h_
+ 
++#include "../universe/ValueRef.h"
+ #include "Lexer.h"
+ #include "ParseImpl.h"
+ #include "ValueRefParser.h"
+diff -Naur freeorion-0.4.8/server/ServerApp.cpp freeorion-0.4.8.patched/server/ServerApp.cpp
+--- freeorion-0.4.8/server/ServerApp.cpp	2018-08-23 05:41:14.000000000 -0400
++++ freeorion-0.4.8.patched/server/ServerApp.cpp	2021-02-17 16:33:47.472827568 -0500
+@@ -1715,7 +1715,7 @@
+             // make a link to new connection
+             m_player_empire_ids[player_connection->PlayerID()] = empire.first;
+ 
+-            const OrderSet dummy;
++            OrderSet dummy;
+             const OrderSet& orders = orders_it->second ? *orders_it->second : dummy;
+ 
+             auto player_info_map = GetPlayerInfoMap();
+diff -Naur freeorion-0.4.8/universe/Universe.h freeorion-0.4.8.patched/universe/Universe.h
+--- freeorion-0.4.8/universe/Universe.h	2018-08-23 05:41:14.000000000 -0400
++++ freeorion-0.4.8.patched/universe/Universe.h	2021-02-17 04:03:51.908917840 -0500
+@@ -3,7 +3,8 @@
+ 
+ 
+ #include "EnumsFwd.h"
+-#include "ValueRefFwd.h"
++#include "ValueRef.h"
++#include "Condition.h"
+ #include "ObjectMap.h"
+ #include "UniverseObject.h"
+ #include "../util/Pending.h"
diff --git a/games/freeorion/freeorion.SlackBuild b/games/freeorion/freeorion.SlackBuild
index 2277787124..550b76c64c 100644
--- a/games/freeorion/freeorion.SlackBuild
+++ b/games/freeorion/freeorion.SlackBuild
@@ -22,9 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210217 bkw: modified by SlackBuilds.org: add compilefix.diff. I
+# have no idea how this build passed QA, since it was broken all
+# along.
+
 PRGNAM=freeorion
 VERSION=${VERSION:-0.4.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -73,6 +77,8 @@ find -L . \
 export CC=/usr/bin/clang
 export CXX=/usr/bin/clang++
 
+patch -p1 < $CWD/compilefix.diff
+
 mkdir -p build
 cd build
   cmake \
diff --git a/games/frotz/README b/games/frotz/README
index 303e7f63bc..20f3a359e6 100644
--- a/games/frotz/README
+++ b/games/frotz/README
@@ -2,4 +2,12 @@ frotz (Z-machine interpreter)
 
 Frotz is an interpreter for Infocom games and other Z-machine games. It
 complies with standard 1.0 of Graham Nelson's specification. Games can
-be found at http://www.ifarchive.org/ .
+be found at: http://www.ifarchive.org/
+
+Optional dependencies:
+
+libmodplug - If this is installed, the curses build (frotz) will
+support sound.
+
+SDL2_mixer - If this is installed, the SDL build of frotz (sfrotz) will
+be included in the package. sfrotz always supports sound.
diff --git a/network/waterfox/doinst.sh b/games/frotz/doinst.sh
index 9a8ded3c60..9424ce43ff 100644
--- a/network/waterfox/doinst.sh
+++ b/games/frotz/doinst.sh
@@ -5,3 +5,9 @@ fi
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/frotz/frotz-infocom.png b/games/frotz/frotz-infocom.png
new file mode 100644
index 0000000000..9085ab83aa
--- /dev/null
+++ b/games/frotz/frotz-infocom.png
diff --git a/games/frotz/frotz.SlackBuild b/games/frotz/frotz.SlackBuild
index 22e3911fac..52fc0d334a 100644
--- a/games/frotz/frotz.SlackBuild
+++ b/games/frotz/frotz.SlackBuild
@@ -2,17 +2,32 @@
 #
 # Slackware build script for frotz
 
-# Written by Beej Jorgensen <beej@beej.us>
+# Originally written for Slackware 12.2 by Beej Jorgensen <email
+# removed>, heavily modified by B. Watson <yalhcru@gmail.com> since
+# then.
 
-# Modified by B. Watson <yalhcru@gmail.com>
-# - updated for Slackware 14 and frotz 2.43d
-# - include dumb terminal frotz in build
+# Original had no license. This modified version is released under the
+# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20150904 bkw: updated for frotz 2.44
+# 20210215 bkw: fix building without libmodplug. BUILD=2.
+
+# 20201212 bkw: too many changes, can't build older versions.
+# - updated for v2.52.
+# - new homepage.
+# - include sfrotz if sdl2 and SDL2_mixer are installed.
+# - fix man page typos.
+# - patch to prevent sfrotz crashes with long pathnames.
+# - add desktop stuff.
+
+# 20150904 bkw: updated for frotz 2.44.
+
+# 20121216 bkw:
+# - updated for Slackware 14 and frotz 2.43d.
+# - include dumb terminal frotz in build.
 
 PRGNAM=frotz
-VERSION=${VERSION:-2.44}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.52}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,37 +60,93 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+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 -o -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Fix typos:
+sed -i "s/\\(Unlike it\\)'s/\1s/" doc/dfrotz.6
+sed -i 's,forground,foreground,'  doc/frotz.6
+sed -i -e 's,invocatio$,&n.,' \
+       -e 's,intead,instead,' \
+       -e 's,chunck,chunk,' \
+          doc/sfrotz.6
+
+# Document location of config file:
+sed -i 's,frotz\.conf,/etc/&,' doc/$PRGNAM.6
+
+# sfrotz aborts with a "malloc(): memory corruption" error when given
+# a long pathname on the command line. Example:
+
+# $ sfrotz "/export/home/urchlay/interactive_fiction/infocom_collection/The Hitchhikers Guide To The Galaxy (1985)/The Hitchhiker's Guide To The Galaxy R31-871119.z5"
+
+# With a somewhat shorter pathname, the program might not abort, but
+# it will end up with gibberish at the end of f_setup.script_name,
+# which would prevent it from auto-loading scripts (if present).
+
+# I don't fully understand why, but the new_basename() and
+# new_dirname() fuctions in sf_util.c are the culprits. They look OK
+# to me, but getting rid of the calls to free() causes the aborts to
+# go away. Since each function gets called only once (at startup),
+# this doesn't constitute a memory leak worth worrying about.
+
+patch -p1 < $CWD/sfrotz.memcorrupt.diff
+
+run_make() {
+  make \
+    PREFIX=/usr \
+    SYSCONFDIR=/etc \
+    MANDIR=/usr/man \
+    MAN_PREFIX=/usr \
+    BINDIR=/usr/games \
+    DESTDIR=$PKG \
+    $1
+}
+
+# No autodetection for libmodplug or SDL2_mixer, help it out.
+maintarg="nosound"
+pkg-config --exists libmodplug && maintarg="$PRGNAM"
+pkg-config --exists sdl2 SDL2_mixer && extra="clean sdl install_sdl"
+
+sed -i "s,-O3.*,$SLKCFLAGS," Makefile
+for target in $maintarg install clean dumb install_dumb $extra; do
+  run_make $target
+done
 
-make OPTS="$SLKCFLAGS" PREFIX=/usr CONFIG_DIR=/etc
-strip $PRGNAM
-make PREFIX=$PKG/usr CONFIG_DIR=/etc install
+strip $PKG/usr/games/*
+gzip -9 $PKG/usr/man/man?/*.*
 
-# include dumb terminal version (it's small and maybe useful).
-sed -i 's/getline/dumb_getline/g' src/dumb/dumb_input.c
-make OPTS="$SLKCFLAGS" PREFIX=/usr CONFIG_DIR=/etc dfrotz
-install -s -m0755 dfrotz $PKG/usr/bin
-cat doc/dfrotz.6 > $PKG/usr/man/man6/dfrotz.6
+# desktop files by SlackBuild author. The icons came from WinFrotz. They're
+# only available in 32x32 size, sorry.
+mkdir -p $PKG/usr/share/applications \
+         $PKG/usr/share/pixmaps \
+         $PKG/usr/share/icons/hicolor/32x32/apps
+install -m0644 -oroot -groot $CWD/*.desktop $PKG/usr/share/applications
+cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../../../../pixmaps/$PRGNAM.png \
+      $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+mkdir -p $PKG/usr/share/icons/hicolor/32x32/mimetypes
+cat $CWD/frotz-infocom.png > \
+    $PKG/usr/share/icons/hicolor/32x32/mimetypes/frotz-infocom.png
 
-gzip $PKG/usr/man/man?/*.?
+# MIME stuff for desktops. Causes KDE and XFCE to display story
+# files with an Infocom icon, and they double-click open with either
+# terminal or SDL frotz.
+mkdir -p $PKG/usr/share/mime/packages
+cat $CWD/$PRGNAM.xml > $PKG/usr/share/mime/packages/$PRGNAM.xml
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS BUGS COPYING ChangeLog DUMB HOW_TO_PLAY INSTALL \
-  PACKAGING PORTING README README.1st SPEECH TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/frotz.conf-{big,small} $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f README.1st # don't need this in the package.
+cp -a AUTHORS CO* ChangeLog DUMB HOW_TO_PLAY README* TODO *.lsm \
+      doc/$PRGNAM.conf* doc/$PRGNAM.txt \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/games/frotz/frotz.desktop b/games/frotz/frotz.desktop
new file mode 100644
index 0000000000..ab2f8e3d4e
--- /dev/null
+++ b/games/frotz/frotz.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=Frotz
+GenericName=Z-Code Interpreter
+Comment=Terminal Player for Interactive Fiction Games
+Exec=frotz %f
+Icon=frotz
+Terminal=true
+Type=Application
+Categories=Game;AdventureGame;
+MimeType=application/x-zmachine;
+NoDisplay=true
+Actions=Play;
+
+[Desktop Action Play]
+Name=Play
+Exec=frotz %f
diff --git a/games/frotz/frotz.info b/games/frotz/frotz.info
index a14a402164..3c08902a6b 100644
--- a/games/frotz/frotz.info
+++ b/games/frotz/frotz.info
@@ -1,8 +1,8 @@
 PRGNAM="frotz"
-VERSION="2.44"
-HOMEPAGE="http://frotz.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/frotz/frotz/frotz-2.44.tar.gz"
-MD5SUM="705457af0e2cf745ce7f6bc243f05968"
+VERSION="2.52"
+HOMEPAGE="https://davidgriffith.gitlab.io/frotz/"
+DOWNLOAD="https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2"
+MD5SUM="99aeba254257d0ceb2b6bf51650b9d2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/frotz/frotz.png b/games/frotz/frotz.png
new file mode 100644
index 0000000000..45babf88c0
--- /dev/null
+++ b/games/frotz/frotz.png
diff --git a/games/frotz/frotz.xml b/games/frotz/frotz.xml
new file mode 100644
index 0000000000..ec743855db
--- /dev/null
+++ b/games/frotz/frotz.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-zmachine">
+    <comment>Z-Machine Story File</comment>
+    <glob pattern="*.z1"/>
+    <glob pattern="*.z2"/>
+    <glob pattern="*.z3"/>
+    <glob pattern="*.z4"/>
+    <glob pattern="*.z5"/>
+    <glob pattern="*.z6"/>
+    <glob pattern="*.z7"/>
+    <glob pattern="*.z8"/>
+    <glob pattern="*.blorb"/>
+    <glob pattern="*.zblorb"/>
+    <glob pattern="*.blb"/>
+	 <generic-icon name="frotz-infocom" />
+  </mime-type>
+</mime-info>
diff --git a/games/frotz/sfrotz.desktop b/games/frotz/sfrotz.desktop
new file mode 100644
index 0000000000..f82697571f
--- /dev/null
+++ b/games/frotz/sfrotz.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=SFrotz
+GenericName=Z-Code Interpreter
+Comment=SDL Player for Interactive Fiction Games
+Exec=sfrotz %f
+Icon=frotz
+Terminal=false
+Type=Application
+Categories=Game;AdventureGame;
+MimeType=application/x-zmachine;
+NoDisplay=true
+Actions=Play;
+
+[Desktop Action Play]
+Name=Play
+Exec=sfrotz %f
diff --git a/games/frotz/sfrotz.memcorrupt.diff b/games/frotz/sfrotz.memcorrupt.diff
new file mode 100644
index 0000000000..a7d49a1ac7
--- /dev/null
+++ b/games/frotz/sfrotz.memcorrupt.diff
@@ -0,0 +1,19 @@
+diff -Naur -x '.*.swp' frotz-2.52/src/sdl/sf_util.c frotz-2.52.patched/src/sdl/sf_util.c
+--- frotz-2.52/src/sdl/sf_util.c	2020-05-10 19:51:48.000000000 -0400
++++ frotz-2.52.patched/src/sdl/sf_util.c	2020-12-16 18:33:26.144268039 -0500
+@@ -380,7 +380,6 @@
+ static char *new_dirname(const char *path)
+ {
+ 	char *p = strdup(path), *p2 = strdup(dirname(p));
+-	free(p);
+ 	return p2;
+ }
+ 
+@@ -392,7 +391,6 @@
+ static char *new_basename(const char *path)
+ {
+ 	char *p = strdup(path), *p2 = strdup(basename(p));
+-	free(p);
+ 	return p2;
+ }
+ 
diff --git a/games/frotz/slack-desc b/games/frotz/slack-desc
index 8a98788cb5..1dde07b4ec 100644
--- a/games/frotz/slack-desc
+++ b/games/frotz/slack-desc
@@ -10,9 +10,9 @@ frotz: frotz (Z-machine interpreter)
 frotz:
 frotz: Frotz is an interpreter for Infocom games and other Z-machine games.
 frotz: It complies with standard 1.0 of Graham Nelson's specification.
-frotz: Games can be found at http://www.ifarchive.org/ .
+frotz: Games can be found at: http://www.ifarchive.org/
+frotz:
 frotz:
-frotz: http://frotz.sourceforge.net/
 frotz:
 frotz:
 frotz:
diff --git a/games/fs-uae-arcade/fs-uae-arcade.info b/games/fs-uae-arcade/fs-uae-arcade.info
index 0b12377d5b..e181f05387 100644
--- a/games/fs-uae-arcade/fs-uae-arcade.info
+++ b/games/fs-uae-arcade/fs-uae-arcade.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://fs-uae.net/stable/3.0.5/fs-uae-arcade-3.0.5.tar.gz"
 MD5SUM="85e151135df7b886169a040a43ebbc52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python3-lhafile fs-uae python-requests python3-certifi"
+REQUIRES="python3-PyQt5 python3-lhafile fs-uae python-requests python-certifi"
 MAINTAINER="CRTS"
 EMAIL="crts@gmx.net"
diff --git a/games/fs-uae-launcher/fs-uae-launcher.info b/games/fs-uae-launcher/fs-uae-launcher.info
index 8f25cf3fe4..2f1f702ebb 100644
--- a/games/fs-uae-launcher/fs-uae-launcher.info
+++ b/games/fs-uae-launcher/fs-uae-launcher.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://fs-uae.net/stable/3.0.5/fs-uae-launcher-3.0.5.tar.gz"
 MD5SUM="6fc4e026763d49fb3f5696f678c4c0e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python3-lhafile fs-uae python-requests python3-certifi"
+REQUIRES="python3-PyQt5 python3-lhafile fs-uae python-requests python-certifi"
 MAINTAINER="CRTS"
 EMAIL="crts@gmx.net"
diff --git a/games/fs2open/fs2open.SlackBuild b/games/fs2open/fs2open.SlackBuild
index 6ac7de7186..c2d7a4c24a 100644
--- a/games/fs2open/fs2open.SlackBuild
+++ b/games/fs2open/fs2open.SlackBuild
@@ -75,6 +75,7 @@ cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DwxWidgets_CONFIG_OPTIONS="--version=3.0" \
     -DCMAKE_INSTALL_PREFIX=/opt/fs2open \
     -DFSO_BUILD_TOOLS:BOOL=ON \
     -DFSO_BUILD_WXFRED2:BOOL=ON \
diff --git a/games/fs2open/fs2open.info b/games/fs2open/fs2open.info
index d2de411bd0..b2642d1211 100644
--- a/games/fs2open/fs2open.info
+++ b/games/fs2open/fs2open.info
@@ -2,9 +2,9 @@ PRGNAM="fs2open"
 VERSION="ac2b864"
 HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com"
 DOWNLOAD="https://schmatzler.de/my_slackbuilds/fs2open/fs2open-ac2b864.tar.gz \
-	  http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2"
+          https://downloads.sourceforge.net/project/openal-soft/openal-soft/openal-soft-1.15.1.tar.bz2"
 MD5SUM="19d8cd7edeb98a25b49abbf92b68246c \
-	ea83dec3b9655a27d28e7bc7cae9cd71"
+        ea83dec3b9655a27d28e7bc7cae9cd71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL ffmpeg lua wxGTK3 SDL2"
diff --git a/games/golly/golly.SlackBuild b/games/golly/golly.SlackBuild
index b510769780..2fd8c86b98 100644
--- a/games/golly/golly.SlackBuild
+++ b/games/golly/golly.SlackBuild
@@ -24,6 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  Updated for golly 2.6 -- the source directory structure got changed a bit too!
 
+# 20201112 bkw: update for v4.0. Which adds a python3 dep.
 # 20181211 bkw:
 # - Take over maintenance.
 # - i486 => i586.
@@ -35,7 +36,7 @@
 # - Minor simplifications and cleanups.
 
 PRGNAM=golly
-VERSION=${VERSION:-3.2}
+VERSION=${VERSION:-4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -88,45 +89,52 @@ if [ -z "$WXCONF" ]; then
   exit 1
 fi
 
-cd gui-wx/configure
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --with-wx-config="$WXCONF" \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --bindir=/usr/games \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-cd ../icons
-
+SHAREDIR=/usr/share/games/$PRGNAM
+
+# 20201112 bkw: golly is the only project I ever heard of that
+# migrated from autotools back to a plain Makefile. So we can't build
+# versions < 4.0 any more, sorry.
+# We don't enable sound because it needs a proprietary non-free
+# library called irrKlang, which we don't (yet?) have on SBo and
+# I'm in no hurry to add.
+cd gui-wx
+cat > local-gtk.mk <<EOF
+WX_CONFIG = $WXCONF
+PYTHON = python3
+ENABLE_PERL = 1
+CXXFLAGS = $SLKCFLAGS
+GOLLYDIR = $SHAREDIR
+EOF
+
+make -f makefile-gtk
+
+cd ..
+mkdir -p $PKG/usr/games $PKG/$SHAREDIR
+install -s -m0755 $PRGNAM b$PRGNAM $PKG/usr/games
+cp -a Help Patterns Rules Scripts $PKG/$SHAREDIR
+
+# Don't need +x permissions on HTML pages, or even Lua/Python scripts.
+find $PKG/$SHAREDIR -type f -exec chmod 644 {} +
+
+cd gui-wx/icons
 for i in 16 32 48; do
-        convert appicon${i}.ico -resize ${i}x${i}! $PRGNAM-${i}.png
-        mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps/
-        install -D -m 0644 $PRGNAM-${i}.png \
-                $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
+  convert appicon${i}.ico -resize ${i}x${i}! $PRGNAM-${i}.png
+  DIR=$PKG/usr/share/icons/hicolor/${i}x${i}/apps/
+  mkdir -p $DIR
+  install -m 0644 $PRGNAM-${i}.png $DIR/$PRGNAM.png
 done
 
-convert appicon.xpm $PRGNAM.png
-install -D -m 0644 $PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 cd ../../docs
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a License.html ReadMe.html ToDo.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # 20181211 bkw: WARNING:  gzip test failed on <...>/weekender-distaff.rle.gz
 # Get rid of .gz extension for any non-gzipped data files.
-find $PKG/usr/share/$PRGNAM -name \*.gz | while read FILE; do
+find $PKG/$SHAREDIR -name \*.gz | while read FILE; do
   if file $FILE | grep -qv gzip ; then
     rename .gz '' "$FILE"
   fi
diff --git a/games/golly/golly.desktop b/games/golly/golly.desktop
index 7fabc82f77..b5d1f6baf6 100644
--- a/games/golly/golly.desktop
+++ b/games/golly/golly.desktop
@@ -3,6 +3,6 @@ Name=Golly
 Type=Application
 Comment=Cellular Automata Simulator
 Terminal=false
-Exec=golly
+Exec=/usr/games/golly
 Icon=golly
 Categories=Game;
diff --git a/games/golly/golly.info b/games/golly/golly.info
index 70156573d3..d4bcd21a5a 100644
--- a/games/golly/golly.info
+++ b/games/golly/golly.info
@@ -1,10 +1,10 @@
 PRGNAM="golly"
-VERSION="3.2"
+VERSION="4.0"
 HOMEPAGE="http://golly.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/golly/files/golly/golly-3.2/golly-3.2-src.tar.gz"
-MD5SUM="9d14cdf88fdab1f3c4de36e226506bfa"
+DOWNLOAD="http://sourceforge.net/projects/golly/files/golly/golly-4.0/golly-4.0-src.tar.gz"
+MD5SUM="1f8713687745b542473b4218ed1cf05a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxGTK3"
+REQUIRES="wxGTK3 python3"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/gzdoom/README b/games/gzdoom/README
index 7755b41bfe..2bee38c3af 100644
--- a/games/gzdoom/README
+++ b/games/gzdoom/README
@@ -1,3 +1,5 @@
+gzdoom (OpenGL port of DOOM)
+
 Enhanced OpenGL port of the official DOOM source code that also supports
 Heretic, Hexen, and Strife.
 
diff --git a/games/gzdoom/compilefix.4.5.0.diff b/games/gzdoom/compilefix.4.5.0.diff
new file mode 100644
index 0000000000..5c19518901
--- /dev/null
+++ b/games/gzdoom/compilefix.4.5.0.diff
@@ -0,0 +1,12 @@
+diff -Naur gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp
+--- gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp	2020-10-31 05:07:33.000000000 -0400
++++ gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp	2020-11-08 14:45:48.654222783 -0500
+@@ -89,7 +89,7 @@
+ {
+ 	int oldSize = self->Size();
+ 	self->Insert(index, static_cast<typename T::value_type>(val));
+-	if constexpr (fill) 
++	if (fill) 
+ 	{
+ 		for (unsigned i = oldSize; i < self->Size() - 1; i++) (*self)[i] = 0;
+ 	}
diff --git a/games/gzdoom/doinst.sh b/games/gzdoom/doinst.sh
index 4a25de5e6f..65c7e2eeb9 100644
--- a/games/gzdoom/doinst.sh
+++ b/games/gzdoom/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/games/gzdoom/fix_zipdir.diff b/games/gzdoom/fix_zipdir.diff
new file mode 100644
index 0000000000..88fb016966
--- /dev/null
+++ b/games/gzdoom/fix_zipdir.diff
@@ -0,0 +1,11 @@
+--- a/tools/zipdir/zipdir.c
++++ b/tools/zipdir/zipdir.c
+@@ -781,6 +781,8 @@
+			if (central_dir == NULL)
+			{
+				fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname);
++				fclose(ozip);
++				ozip = NULL;
+				update = 0;
+			}
+		}
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index 404ddb1a7d..80cf5b5c89 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201115 bkw: Add missing fix_zipdir.diff. Dammit.
+# 20201107 bkw: Updated for 4.5.0.
+# 20201027 bkw:
+# - Updated for 4.4.2.
+# - Add new zmusic dep.
+# - Use 'make install/strip' now that it's supported.
+# - Use upstream's icon, multiple sizes in /usr/share/icons.
 # 20200302 bkw: Updated for 4.3.3.
 # 20191201 bkw: Updated for 4.2.4.
 # 20181022 bkw: Updated for 3.6.0.
@@ -27,7 +34,7 @@
 #   supported as "gzdoom-legacy" for those that need them.
 
 PRGNAM=gzdoom
-VERSION=${VERSION:-4.3.3}
+VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,27 +71,29 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-g$VERSION $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-g$VERSION.tar.gz || \
-  tar xvf $CWD/g$VERSION.tar.gz || \
-  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
-  tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-g$VERSION.tar.gz
 cd $PRGNAM-g$VERSION || cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# gzdoom in windowed mode wants to display its git tag and hash as part
-# of the window title. For releases this shows up as "<unknown version> 0",
-# which doesn't hurt anything but is ugly.
-# This makes the window title appear as e.g. "GZDOOM 2.1.1 (Aug 3 2016)". The
-# date is the build date.
-patch -p1 < $CWD/window_title_version.diff
-sed -i "/#define *VERSIONSTR/s,GIT_DESCRIPTION,\"$VERSION\"," src/version.h
+# 20201027 bkw: fix the '<unknown version>' in the window title. This
+# used to be done in an uglier way (with a patch that occasionally broke
+# when applied against new gzdooms).
+sed -i '/COMMAND.*UpdateRevision/s,^,# ,' src/CMakeLists.txt
+( echo "#define GIT_DESCRIPTION \"$VERSION\""
+  echo "#define GIT_HASH \"release\""
+  echo "#define GIT_TIME __DATE__" ) > src/gitinfo.h
 
-# This isn't currently used, but was in the past, and will be again I'm sure.
+# 4.5.0 uses "if constexpr", which is a c++17 feature not supported by
+# our compiler from 2016.
 [ -e $CWD/compilefix.$VERSION.diff ] && \
   patch -p1 < $CWD/compilefix.$VERSION.diff
 
+# 20201107 bkw: 4.5.0 needs this, patch comes from upstream git. Thanks
+# to Steven Voges on the mailing list for pointing it out to me.
+patch -p1 < $CWD/fix_zipdir.diff
+
 # 3.1.0 started needing -DNDEBUG. Using ld.gold speeds up the final link
 # enough to be worth using (saves 17+ sec on my test box).
 SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold"
@@ -96,29 +105,43 @@ sed -i '1i#include <cmath>' \
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
     -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
+    -DINSTALL_DOCS_PATH=doc/$PRGNAM-$VERSION \
+    -DINSTALL_PATH=games \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
-  mkdir -p $PKG/usr/games $PKG/usr/share/games/doom
-  install -m0755 -s $PRGNAM $PKG/usr/games/$PRGNAM
-  install -m0644 *.pk3 $PKG/usr/share/games/doom/
+  make install/strip DESTDIR=$PKG
 cd ..
 
+if fgrep -q '<unknown' src/gitinfo.h; then
+  echo "*** BREAKAGE: gitinfo.h got regenerated with <unknown version>" 1>&2
+  echo "*** Fix it, or get the maintainer to." 1>&2
+  echo "*** Press ^C to abort or wait 5 seconds for the build to continue" 1>&2
+  sleep 5
+fi
+
 # .desktop written for this SlackBuild
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-# PNG converted from Windows icon
+# New-school desktop-ey icons.
+for i in 16 22 32 48 64 128 256; do
+  SIZE=${i}x${i}
+  DIR=$PKG/usr/share/icons/hicolor/$SIZE/apps
+  mkdir -p $DIR
+  convert src/posix/zdoom.xpm -resize $SIZE $DIR/$PRGNAM.png
+done
+
+# Old-school windowmanagerish icon.
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/64x64/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README_SBo.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
 
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index dd9bf6d272..80cd35a6af 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,10 +1,10 @@
 PRGNAM="gzdoom"
-VERSION="4.3.3"
+VERSION="4.5.0"
 HOMEPAGE="http://gzdoom.drdteam.org/"
-DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.3.3/gzdoom-g4.3.3.tar.gz"
-MD5SUM="96454a55f7ac9fb5a0072e4802728d1e"
+DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.5.0/gzdoom-g4.5.0.tar.gz"
+MD5SUM="64b0b98c6538a75626de3319653d6539"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2 OpenAL"
+REQUIRES="SDL2 OpenAL zmusic cmake-202x"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/gzdoom/window_title_version.diff b/games/gzdoom/window_title_version.diff
deleted file mode 100644
index 253c88207f..0000000000
--- a/games/gzdoom/window_title_version.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur gzdoom-g3.1.0/src/gitinfo.cpp gzdoom-g3.1.0.patched/src/gitinfo.cpp
---- gzdoom-g3.1.0/src/gitinfo.cpp	2017-05-31 06:11:33.000000000 -0400
-+++ gzdoom-g3.1.0.patched/src/gitinfo.cpp	2017-06-10 16:21:51.138003050 -0400
-@@ -39,27 +39,20 @@
- 
- const char *GetGitDescription()
- {
--	return GIT_DESCRIPTION;
-+	return VERSIONSTR;
- }
- 
- const char *GetGitHash()
- {
--	return GIT_HASH;
-+	return "release";
- }
- 
- const char *GetGitTime()
- {
--	return GIT_TIME;
-+	return __DATE__;
- }
- 
- const char *GetVersionString()
- {
--	if (GetGitDescription()[0] == '\0')
--	{
--		return VERSIONSTR;
--	}
--	else
--	{
--		return GIT_DESCRIPTION;
--	}
-+	return VERSIONSTR;
- }
diff --git a/games/hack-of-life/README b/games/hack-of-life/README
new file mode 100644
index 0000000000..db0488fcc8
--- /dev/null
+++ b/games/hack-of-life/README
@@ -0,0 +1,19 @@
+hack-of-life (networked multiplayer curses Conway's Life variant)
+
+hack-of-life is a modified version of Conway's Game of Life that has
+multiple colors of cells. The object of the game is to defeat other
+players by eliminating their cells, and/or cover over 1/3 of the board
+with cells of your color.
+
+Considering how Life is a zero-player game, it makes it lots of fun
+as a curiosity, but makes it very easy for people who are not Life
+enthusiasts to quickly become bored after watching yet another glider
+explode.
+
+So this decides to put the Game back in the Game of Life. And it does
+that by taking the interface of the RogueLike genre of computer games
+and terribly abusing it. The name of the game is adopted from the
+RogueLike giant NetHack, resulting in the Hack of Life.
+
+Note: the executable is called "hackoflife" (not "hack-of-life" like
+the package name).
diff --git a/games/hack-of-life/git2tarxz.sh b/games/hack-of-life/git2tarxz.sh
new file mode 100644
index 0000000000..a3e73a354e
--- /dev/null
+++ b/games/hack-of-life/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=hack-of-life
+CLONE_URL=https://github.com/isharacomix/hack-of-life
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/games/hack-of-life/hack-of-life.SlackBuild b/games/hack-of-life/hack-of-life.SlackBuild
new file mode 100644
index 0000000000..71c1b7f0fe
--- /dev/null
+++ b/games/hack-of-life/hack-of-life.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for hack-of-life
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Note: to me, the control scheme of this game is *terrible*, totally
+# unusable. H J K L for left/down/up/right is OK (vi and all) but the
+# diagonals are Y U B N. I suppose since it's a roguelike, that's a
+# standard in the roguelike world... It's not configurable in this
+# game, meaning I'm never going to enjoy playing it very much :(
+
+PRGNAM=hack-of-life
+VERSION=${VERSION:-20130628_3a6c824}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz --exclude="*/windows"
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --bindir=/usr/games \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+# man page by SlackBuild author. Not much to it, just a pointer to the
+# real docs in the README. So it is written: All thy binaries shalt
+# have man pages, lest thine users become wroth with thee.
+mkdir -p $PKG/usr/man/man6
+gzip -9c < $CWD/hackoflife.6 > $PKG/usr/man/man6/hackoflife.6.gz
+
+# symlink the man page for the package name. I don't know why the author
+# chose to name the package and executable 2 different names...
+ln -s hackoflife.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/hack-of-life/hack-of-life.info b/games/hack-of-life/hack-of-life.info
new file mode 100644
index 0000000000..e7e7eb2225
--- /dev/null
+++ b/games/hack-of-life/hack-of-life.info
@@ -0,0 +1,10 @@
+PRGNAM="hack-of-life"
+VERSION="20130628_3a6c824"
+HOMEPAGE="https://github.com/isharacomix/hack-of-life"
+DOWNLOAD="https://slackware.uk/~urchlay/src/hack-of-life-20130628_3a6c824.tar.xz"
+MD5SUM="b98a5d1a43d8c883d47713820f7bc85e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/hack-of-life/hackoflife.6 b/games/hack-of-life/hackoflife.6
new file mode 100644
index 0000000000..ed3d38339e
--- /dev/null
+++ b/games/hack-of-life/hackoflife.6
@@ -0,0 +1,66 @@
+.\" Man page generated from reStructuredText.
+.
+.TH HACKOFLIFE 6 "2020-11-20" "20130628_3a6c824" "SlackBuilds.org"
+.SH NAME
+hackoflife \- networked multiplayer curses Conway's Life variant
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for hackoflife(6) man page. Convert with:
+.
+.\" rst2man.py hackoflife.rst > hackoflife.6
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+hackoflife
+.SH DESCRIPTION
+.sp
+\fBhackoflife\fP is a modified version of Conway\(aqs Game of Life that has
+multiple colors of cells. The object of the game is to defeat other
+players by eliminating their cells, and/or cover over 1/3 of the board
+with your color of cell.
+.sp
+There are no command\-line options or arguments. The program is
+controlled via its built\-in menus. For full documentation, see:
+.sp
+/usr/doc/hack\-of\-life\-20130628_3a6c824/README
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/hack\-of\-life\-20130628_3a6c824/COPYING for license information.
+.SH AUTHORS
+.sp
+hackoflife was written by isharacomix.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The hackoflife homepage: \fI\%https://github.com/isharacomix/hack\-of\-life\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/games/hack-of-life/hackoflife.rst b/games/hack-of-life/hackoflife.rst
new file mode 100644
index 0000000000..df5453266c
--- /dev/null
+++ b/games/hack-of-life/hackoflife.rst
@@ -0,0 +1,55 @@
+.. RST source for hackoflife(6) man page. Convert with:
+..   rst2man.py hackoflife.rst > hackoflife.6
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20130628_3a6c824
+.. |date| date::
+
+==========
+hackoflife
+==========
+
+--------------------------------------------------
+networked multiplayer curses Conway's Life variant
+--------------------------------------------------
+
+:Manual section: 6
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+hackoflife
+
+DESCRIPTION
+===========
+
+**hackoflife** is a modified version of Conway's Game of Life that has
+multiple colors of cells. The object of the game is to defeat other
+players by eliminating their cells, and/or cover over 1/3 of the board
+with your color of cell.
+
+There are no command-line options or arguments. The program is
+controlled via its built-in menus. For full documentation, see:
+
+/usr/doc/hack-of-life-|version|/README
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/hack-of-life-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+hackoflife was written by isharacomix.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The hackoflife homepage: https://github.com/isharacomix/hack-of-life
diff --git a/games/hack-of-life/slack-desc b/games/hack-of-life/slack-desc
new file mode 100644
index 0000000000..5efc1e3513
--- /dev/null
+++ b/games/hack-of-life/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+hack-of-life: hack-of-life (networked multiplayer Conway's Life variant)
+hack-of-life:
+hack-of-life: hack-of-life is a modified version of Conway's Game of Life that has
+hack-of-life: multiple colors of cells. The object of the game is to defeat other
+hack-of-life: players by eliminating their cells, and/or cover over 1/3 of the board
+hack-of-life: with cells of your color.
+hack-of-life:
+hack-of-life:
+hack-of-life:
+hack-of-life:
+hack-of-life:
diff --git a/games/hatari/hatari.SlackBuild b/games/hatari/hatari.SlackBuild
index 35adec40d0..9f0904c9ca 100644
--- a/games/hatari/hatari.SlackBuild
+++ b/games/hatari/hatari.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210102 bkw: update for v2.3.1.
+# 20201218 bkw:
+# - update for v2.3.0. Can't build older versions, sorry.
+# - add new dep, python3.
+# - really fix the man pages.
+
 # 20200426 bkw:
 # - BUILD=2
 # - Include support for IPF and CTR images (copy-protected images),
@@ -58,8 +64,8 @@
 # - add mime type and auto-associate ST disk images and executables.
 
 PRGNAM=hatari
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.3.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -75,6 +81,8 @@ TMP=${TMP-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Note: the -O2 here gets overridden by a -O3 that comes later on the
+# command line. Upstream tests with -O3 so it should be fine.
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -105,10 +113,11 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 # so let's have hatariui use that instead of failing.
 patch -p1 < $CWD/hatariui-create-cfg-if-missing.diff
 
-# man page hadn't been updated since 2014, it says the config file lives
-# in the old ~/.hatari/ location. also fix a few typos and formatting
-# issues.
-patch -p1 < $CWD/manpage.diff
+# Man pages go in section 6, fix .TH and see-also refs. Also fix a few
+# typos and formatting issues.
+P="$CWD/manpage.$VERSION.diff"
+[ -e "$P" ] || P="$CWD/manpage.diff"
+patch -p1 < $P
 
 # cmake doesn't support anything like --bindir, --mandir, --docdir. cheat
 # a little.
@@ -118,9 +127,6 @@ sed -i \
   -e "s,share/doc/$PRGNAM,doc/$PRGNAM-$VERSION," \
   CMakeLists.txt
 
-# man pages should be in section 6
-sed -i '/\.TH/s,"1","6",' doc/*.1 doc/fr/*.1 tools/*.1 python-ui/*.1
-
 # Hard-code the doc path in the UI (we don't use /usr/share/doc/hatari)
 sed -i \
   -e "/path *= *path *+/s,=.*,= \"/usr/doc/$PRGNAM-$VERSION/\"," \
@@ -140,16 +146,23 @@ sed -i 's/ncurses\.h/&;readline.h/' cmake/FindReadline.cmake
 
 # and libcapsimage 5.1 doesn't support a couple of typedefs that
 # existed in 4.2.
+# 20201218 bkw: the source says '#include <caps/CapsLibAll.h>' but
+# we need <caps5/CapsLibAll.h>.
 sed -i \
     -e '1i#include <stdint.h>' \
     -e 's,CapsLong,int32_t,g' \
     -e 's,CapsULong,uint32_t,g' \
+    -e '/#include/s,caps/,caps5/,' \
   src/floppy_ipf.c
 
 # 20200427 bkw: upstream actually runs cmake directly in the source
 # dir rather than the "mkdir build; cd build; cmake .." stuff from
 # our template. I'm going to do it their way.
+# 20201218 bkw: I really should not have to tell cmake to look in
+# /usr/include for the libcapsimage headers, that is *the systemwide
+# default location* for includes, and has been since the 1970s. Grr.
 cmake \
+  -DCAPSIMAGE_INCLUDE_DIR=/usr/include \
   -DCMAKE_VERBOSE_MAKEFILE=TRUE \
   $SDL2OPT \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/games/hatari/hatari.info b/games/hatari/hatari.info
index 8b8bfb1610..cce88a2cd4 100644
--- a/games/hatari/hatari.info
+++ b/games/hatari/hatari.info
@@ -1,10 +1,10 @@
 PRGNAM="hatari"
-VERSION="2.2.1"
+VERSION="2.3.1"
 HOMEPAGE="http://hatari.tuxfamily.org/"
-DOWNLOAD="http://download.tuxfamily.org/hatari/2.2.1/hatari-2.2.1.tar.bz2"
-MD5SUM="fc8d3a14b38714ea0b0800fda6b5cab7"
+DOWNLOAD="http://download.tuxfamily.org/hatari/2.3.1/hatari-2.3.1.tar.bz2"
+MD5SUM="52f572328edc575db17e54d4fd2d3a20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/hatari/manpage.2.3.1.diff b/games/hatari/manpage.2.3.1.diff
new file mode 100644
index 0000000000..50629bd64e
--- /dev/null
+++ b/games/hatari/manpage.2.3.1.diff
@@ -0,0 +1,319 @@
+diff -Naur hatari-2.3.0/doc/fr/hatari.1 hatari-2.3.0.patched/doc/fr/hatari.1
+--- hatari-2.3.0/doc/fr/hatari.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/doc/fr/hatari.1	2020-12-19 00:50:09.455505119 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI" "1" "2008-03-14" "Hatari" ""
++.TH "HATARI" "6" "2008-03-14" "Hatari" ""
+ .\" Please adjust this date whenever revising the manpage.
+ 
+ .SH "NAME"
+diff -Naur hatari-2.3.0/doc/hatari.1 hatari-2.3.0.patched/doc/hatari.1
+--- hatari-2.3.0/doc/hatari.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/doc/hatari.1	2020-12-19 00:49:56.399506306 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI" "1" "2020-11-27" "Hatari" ""
++.TH "HATARI" "6" "2020-12-18" "Hatari" ""
+ .\" Please adjust this date whenever revising the manpage.
+ 
+ .SH "NAME"
+@@ -668,7 +668,9 @@
+ will act as
+ .B Alternate
+ as well as long as you do not press it together with a Hatari hotkey
+-combination.
++combination. Note to US keyboard layout users: if you don't have an
++.B AltGr
++key on your keyboard, use the right Alt key.
+ .PP
+ The
+ .B right Ctrl
+@@ -788,40 +790,49 @@
+ .PP
+ Other Hatari programs and utilities:
+ .br
+-.IR hmsa (1),
+-.IR zip2st (1),
+-.IR atari\-convert\-dir (1),
+-.IR atari\-hd\-image (1),
+-.IR hatariui (1),
+-.IR hconsole (1),
+-.IR gst2ascii (1),
+-.IR hatari_profile (1)
++.IR hmsa (6),
++.IR zip2st (6),
++.IR atari\-convert\-dir (6),
++.IR atari\-hd\-image (6),
++.IR hatariui (6),
++.IR hconsole (6),
++.IR gst2ascii (6),
++.IR hatari_profile (6)
+ 
+ .SH "FILES AND DIRECTORIES"
+ .TP
+-/etc/hatari.cfg (or /usr/local/etc/hatari.cfg)
++/etc/hatari.cfg
+ The global configuration file of Hatari.
+ .TP
+ ~/.config/hatari/
+ The (default) directory for user's personal Hatari files;
+-.B hatari.cfg
++.RS 2
++.TP
++hatari.cfg
+ (configuration file),
+-.B hatari.nvram
++.TP
++hatari.nvram
+ (NVRAM content file),
+-.B hatari.sav
++.TP
++hatari.sav
+ (Hatari memory state snapshot file which Hatari can load/save automatically
+ when it starts/exits),
+-.B hatari.prn
++.TP
++hatari.prn
+ (printer output file),
++.RE
+ .TP
+-/usr/share/hatari/ (or /usr/local/share/hatari/)
++/usr/share/hatari/
+ The global data directory of Hatari.
++.RS 2
+ .TP
+ tos.img
+ The TOS ROM image will be loaded from the data directory of Hatari unless it
+ is specified on the command line or the configuration file.
++.RE
+ 
+ .SH "AUTHOR"
+ This manual page was written by Marco Herrn <marco@mherrn.de> for the
+ Debian project and later modified by Thomas Huth and Eero Tamminen to
+-suit the latest version of Hatari.
++suit the latest version of Hatari. Later it was modified by B. Watson
++<yalhcru@gmail.com> for the SlackBuilds.org project to fix some formatting.
+diff -Naur hatari-2.3.0/python-ui/hatariui.1 hatari-2.3.0.patched/python-ui/hatariui.1
+--- hatari-2.3.0/python-ui/hatariui.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/python-ui/hatariui.1	2020-12-19 00:50:20.615504105 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "hatariui" "1" "2020-12-15" "Hatari" "Hatari UI"
++.TH "HATARIUI" "6" "2020-12-15" "Hatari" "Hatari UI"
+ .SH "NAME"
+ hatariui \- Python/Gtk UI for Hatari
+ .SH "SYNOPSIS"
+@@ -211,9 +211,9 @@
+ For more examples on Hatari UI options usage, see the hatariui shell
+ script.
+ .SH "SEE ALSO"
+-.IR hmsa (1),
+-.IR hatariui (1),
+-.IR hconsole (1)
++.IR hmsa (6),
++.IR hatariui (6),
++.IR hconsole (6)
+ .SH "COPYRIGHT"
+ Hatari UI is written by Eero Tamminen <oak at helsinkinet fi>.
+ .PP
+diff -Naur hatari-2.3.0/tools/atari-convert-dir.1 hatari-2.3.0.patched/tools/atari-convert-dir.1
+--- hatari-2.3.0/tools/atari-convert-dir.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/atari-convert-dir.1	2020-12-19 00:47:26.732519911 -0500
+@@ -1,4 +1,4 @@
+-.TH "atari-convert-dir" "1" "2015-04-26" "Hatari" "Hatari utilities"
++.TH "atari-convert-dir" "6" "2015-04-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ atari\-convert\-dir \- helper for creating Atari compatible disk images
+ .SH SYNOPSIS
+@@ -16,9 +16,9 @@
+ use is also recommended with \fIzip2st\fP tool content (because Mtools
+ \fImcopy\fP doesn't convert long file names correctly for Atari).
+ .SH SEE ALSO
+-.IR atari\-hd\-image (1),
+-.IR zip2st (1),
+-.IR hatari (1),
++.IR atari\-hd\-image (6),
++.IR zip2st (6),
++.IR hatari (6),
+ .IR mcopy (1)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/atari-hd-image.1 hatari-2.3.0.patched/tools/atari-hd-image.1
+--- hatari-2.3.0/tools/atari-hd-image.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/atari-hd-image.1	2020-12-19 00:47:08.660521554 -0500
+@@ -1,4 +1,4 @@
+-.TH "atari-hd-image" "1" "2015-04-26" "Hatari" "Hatari utilities"
++.TH "atari-hd-image" "6" "2015-04-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ atari\-hd\-image \- tool for creating a harddisk image for use with Hatari
+ .SH SYNOPSIS
+@@ -37,12 +37,12 @@
+ 8MB image with partition named 'TEST', and files from content/:
+ .B atari\-hd\-image 8 8mb-disk.img TEST content/
+ .SH SEE ALSO
+-.IR atari\-convert\-dir (1),
+-.IR hmsa (1),
+-.IR zip2st (1),
+-.IR hatari (1),
+-.IR mkdosfs (1),
+-.IR sfdisk (1),
++.IR atari\-convert\-dir (6),
++.IR hmsa (6),
++.IR zip2st (6),
++.IR hatari (6),
++.IR mkdosfs (8),
++.IR sfdisk (8),
+ .IR dd (1)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/debugger/gst2ascii.1 hatari-2.3.0.patched/tools/debugger/gst2ascii.1
+--- hatari-2.3.0/tools/debugger/gst2ascii.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/debugger/gst2ascii.1	2020-12-19 00:48:17.759515273 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "GST2ASCII" "1" "2017-11-11" "Hatari" "Hatari utilities"
++.TH "GST2ASCII" "6" "2017-11-11" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ gst2ascii \- Filter and output Atari program symbol table as ASCII
+ .SH "SYNOPSIS"
+@@ -60,8 +60,8 @@
+ .br
+ 	symbols program.sym TEXT DATA BSS
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR hatari_profile (1)
++.IR hatari (6),
++.IR hatari_profile (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/debugger/hatari_profile.1 hatari-2.3.0.patched/tools/debugger/hatari_profile.1
+--- hatari-2.3.0/tools/debugger/hatari_profile.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/debugger/hatari_profile.1	2020-12-19 00:55:04.273478319 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI_PROFILE" "1" "2013-04-15" "Hatari" "Hatari utilities"
++.TH "HATARI_PROFILE" "6" "2013-04-15" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hatari_profile \- Post-processor for Hatari profiler data
+ .SH "SYNOPSIS"
+@@ -135,10 +135,10 @@
+ -------------------------------------------------------------
+ .fi
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR gst2ascii (1),
+-.IR hconsole (1)
+-.IR hatariui (1)
++.IR hatari (6),
++.IR gst2ascii (6),
++.IR hconsole (6),
++.IR hatariui (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hatari-prg-args.1 hatari-2.3.0.patched/tools/hatari-prg-args.1
+--- hatari-2.3.0/tools/hatari-prg-args.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hatari-prg-args.1	2020-12-19 00:49:08.415510668 -0500
+@@ -1,4 +1,4 @@
+-.TH "hatari-prg-args" "1" "2018-05-01" "Hatari" "Hatari utilities"
++.TH "hatari-prg-args" "6" "2018-05-01" "Hatari" "Hatari utilities"
+ .SH NAME
+ hatari\-prg\-args \- autorun Atari programs with arguments
+ .SH SYNOPSIS
+@@ -37,8 +37,8 @@
+ Run it from disk image instead of host directory:
+ .B hatari\-prg\-args -m -- 'A:\\\\SIDPLAY.TTP' 'SIDS\\\\TEST.SID'
+ .SH SEE ALSO
+-.IR hatari (1),
+-.IR hconsole (1)
++.IR hatari (6),
++.IR hconsole (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hconsole/hconsole.1 hatari-2.3.0.patched/tools/hconsole/hconsole.1
+--- hatari-2.3.0/tools/hconsole/hconsole.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hconsole/hconsole.1	2020-12-19 00:49:34.615508286 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HCONSOLE" "1" "2010-10-10" "Hatari" "Hatari utilities"
++.TH "HCONSOLE" "6" "2010-10-10" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hconsole \- Interactive Python console for using Hatari's remote API
+ .SH "SYNOPSIS"
+@@ -52,8 +52,8 @@
+ By default hconsole and its examples are installed under
+ the /usr/share/hatari/hconsole/ directory.
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR hatariui (1)
++.IR hatari (6),
++.IR hatariui (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hmsa/hmsa.1 hatari-2.3.0.patched/tools/hmsa/hmsa.1
+--- hatari-2.3.0/tools/hmsa/hmsa.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hmsa/hmsa.1	2020-12-19 00:47:44.567518290 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HMSA" "1" "2010-05-30" "Hatari" "Hatari utilities"
++.TH "HMSA" "6" "2010-05-30" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hmsa \- Atari MSA / ST disk image creator and converter
+ .SH "SYNOPSIS"
+@@ -48,9 +48,9 @@
+ .br
+ 	hmsa disk.msa
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR zip2st (1),
+-.IR atari\-hd\-image (1)
++.IR hatari (6),
++.IR zip2st (6),
++.IR atari\-hd\-image (6)
+ .SH "AUTHOR"
+ Written by Thomas Huth <huth at tuxfamily.org>. This manual page
+ added by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/zip2st.1 hatari-2.3.0.patched/tools/zip2st.1
+--- hatari-2.3.0/tools/zip2st.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/zip2st.1	2020-12-19 00:49:25.742509093 -0500
+@@ -1,4 +1,4 @@
+-.TH "ZIP2ST" "1" "2016-02-26" "Hatari" "Hatari utilities"
++.TH "ZIP2ST" "6" "2016-02-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ zip2st \- convert directory or .zip archive to .st disk image
+ .SH SYNOPSIS
+@@ -29,11 +29,11 @@
+ within a .zip archive, you need to extract them before conversion.
+ .PP
+ .SH SEE ALSO
+-.IR hmsa (1),
+-.IR atari\-convert\-dir (1),
+-.IR atari\-hd\-image (1),
+-.IR hatari (1),
+-.IR unzip (1),
++.IR hmsa (6),
++.IR atari\-convert\-dir (6),
++.IR atari\-hd\-image (6),
++.IR hatari (6),
++.IR unzip (6),
+ .IR mtools (1),
+ .IR basename (1),
+ .IR dd (1).
diff --git a/games/hatari/manpage.diff b/games/hatari/manpage.diff
index 82f9ed921a..0269253476 100644
--- a/games/hatari/manpage.diff
+++ b/games/hatari/manpage.diff
@@ -1,25 +1,28 @@
-diff -Naur hatari-2.2.1/doc/hatari.1 hatari-2.2.1.patched/doc/hatari.1
---- hatari-2.2.1/doc/hatari.1	2019-02-08 03:30:10.000000000 -0500
-+++ hatari-2.2.1.patched/doc/hatari.1	2020-04-26 23:41:11.738132546 -0400
+diff -Naur hatari-2.3.0/doc/fr/hatari.1 hatari-2.3.0.patched/doc/fr/hatari.1
+--- hatari-2.3.0/doc/fr/hatari.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/doc/fr/hatari.1	2020-12-19 00:50:09.455505119 -0500
 @@ -2,7 +2,7 @@
  .\" First parameter, NAME, should be all caps
  .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
  .\" other parameters are allowed: see man(7), man(1)
--.TH "HATARI" "1" "2014-05-08" "Hatari" ""
-+.TH "HATARI" "1" "2020-04-26" "Hatari" ""
+-.TH "HATARI" "1" "2008-03-14" "Hatari" ""
++.TH "HATARI" "6" "2008-03-14" "Hatari" ""
  .\" Please adjust this date whenever revising the manpage.
  
  .SH "NAME"
-@@ -557,7 +557,7 @@
- .TP
- .B \-\-benchmark
- Start in benchmark mode (use with --run-vbls).
--This allows to measure the speed of the emulation in frames per second
-+This allows measuring the speed of the emulation in frames per second
- by running at maximum speed (don't wait for VBL). Disable audio/video
- output to have as little OS overhead as possible
+diff -Naur hatari-2.3.0/doc/hatari.1 hatari-2.3.0.patched/doc/hatari.1
+--- hatari-2.3.0/doc/hatari.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/doc/hatari.1	2020-12-19 00:49:56.399506306 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI" "1" "2020-11-27" "Hatari" ""
++.TH "HATARI" "6" "2020-12-18" "Hatari" ""
+ .\" Please adjust this date whenever revising the manpage.
  
-@@ -599,7 +599,9 @@
+ .SH "NAME"
+@@ -668,7 +668,9 @@
  will act as
  .B Alternate
  as well as long as you do not press it together with a Hatari hotkey
@@ -30,7 +33,26 @@ diff -Naur hatari-2.2.1/doc/hatari.1 hatari-2.2.1.patched/doc/hatari.1
  .PP
  The
  .B right Ctrl
-@@ -730,33 +732,45 @@
+@@ -788,40 +790,49 @@
+ .PP
+ Other Hatari programs and utilities:
+ .br
+-.IR hmsa (1),
+-.IR zip2st (1),
+-.IR atari\-convert\-dir (1),
+-.IR atari\-hd\-image (1),
+-.IR hatariui (1),
+-.IR hconsole (1),
+-.IR gst2ascii (1),
+-.IR hatari_profile (1)
++.IR hmsa (6),
++.IR zip2st (6),
++.IR atari\-convert\-dir (6),
++.IR atari\-hd\-image (6),
++.IR hatariui (6),
++.IR hconsole (6),
++.IR gst2ascii (6),
++.IR hatari_profile (6)
  
  .SH "FILES AND DIRECTORIES"
  .TP
@@ -38,8 +60,7 @@ diff -Naur hatari-2.2.1/doc/hatari.1 hatari-2.2.1.patched/doc/hatari.1
 +/etc/hatari.cfg
  The global configuration file of Hatari.
  .TP
--~/.hatari/
-+~/.config/hatari/
+ ~/.config/hatari/
  The (default) directory for user's personal Hatari files;
 -.B hatari.cfg
 +.RS 2
@@ -59,14 +80,6 @@ diff -Naur hatari-2.2.1/doc/hatari.1 hatari-2.2.1.patched/doc/hatari.1
 +.TP
 +hatari.prn
  (printer output file),
--.B hatari.wav
-+.TP
-+hatari.wav
- (recorded sound output in WAV format),
--.B hatari.ym
-+.TP
-+hatari.ym
- (recorded sound output in YM format).
 +.RE
  .TP
 -/usr/share/hatari/ (or /usr/local/share/hatari/)
@@ -81,9 +94,226 @@ diff -Naur hatari-2.2.1/doc/hatari.1 hatari-2.2.1.patched/doc/hatari.1
  
  .SH "AUTHOR"
  This manual page was written by Marco Herrn <marco@mherrn.de> for the
--Debian project and later modified by Thomas Huth and Eero Tamminen to
+ Debian project and later modified by Thomas Huth and Eero Tamminen to
 -suit the latest version of Hatari.
-+Debian project and later modified by Thomas Huth and Eero Tamminen to suit
-+the (then) latest version of Hatari. Later it was modified by B. Watson
-+<yalhcru@gmail.com> for the SlackBuilds.org project to suit the latest
-+(2.2.1) version of Hatari, and to fix some of the formatting.
++suit the latest version of Hatari. Later it was modified by B. Watson
++<yalhcru@gmail.com> for the SlackBuilds.org project to fix some formatting.
+diff -Naur hatari-2.3.0/python-ui/hatariui.1 hatari-2.3.0.patched/python-ui/hatariui.1
+--- hatari-2.3.0/python-ui/hatariui.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/python-ui/hatariui.1	2020-12-19 00:50:20.615504105 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "hatariui" "1" "2019-02-24" "Hatari" "Hatari UI"
++.TH "hatariui" "6" "2019-02-24" "Hatari" "Hatari UI"
+ .SH "NAME"
+ hatariui \- Python/Gtk UI for Hatari
+ .SH "SYNOPSIS"
+@@ -211,9 +211,9 @@
+ For more examples on Hatari UI options usage, see the hatariui shell
+ script.
+ .SH "SEE ALSO"
+-.IR hmsa (1),
+-.IR hatariui (1),
+-.IR hconsole (1)
++.IR hmsa (6),
++.IR hatariui (6),
++.IR hconsole (6)
+ .SH "COPYRIGHT"
+ Hatari UI is written by Eero Tamminen <oak at helsinkinet fi>.
+ .PP
+diff -Naur hatari-2.3.0/tools/atari-convert-dir.1 hatari-2.3.0.patched/tools/atari-convert-dir.1
+--- hatari-2.3.0/tools/atari-convert-dir.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/atari-convert-dir.1	2020-12-19 00:47:26.732519911 -0500
+@@ -1,4 +1,4 @@
+-.TH "atari-convert-dir" "1" "2015-04-26" "Hatari" "Hatari utilities"
++.TH "atari-convert-dir" "6" "2015-04-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ atari\-convert\-dir \- helper for creating Atari compatible disk images
+ .SH SYNOPSIS
+@@ -16,9 +16,9 @@
+ use is also recommended with \fIzip2st\fP tool content (because Mtools
+ \fImcopy\fP doesn't convert long file names correctly for Atari).
+ .SH SEE ALSO
+-.IR atari\-hd\-image (1),
+-.IR zip2st (1),
+-.IR hatari (1),
++.IR atari\-hd\-image (6),
++.IR zip2st (6),
++.IR hatari (6),
+ .IR mcopy (1)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/atari-hd-image.1 hatari-2.3.0.patched/tools/atari-hd-image.1
+--- hatari-2.3.0/tools/atari-hd-image.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/atari-hd-image.1	2020-12-19 00:47:08.660521554 -0500
+@@ -1,4 +1,4 @@
+-.TH "atari-hd-image" "1" "2015-04-26" "Hatari" "Hatari utilities"
++.TH "atari-hd-image" "6" "2015-04-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ atari\-hd\-image \- tool for creating a harddisk image for use with Hatari
+ .SH SYNOPSIS
+@@ -37,12 +37,12 @@
+ 8MB image with partition named 'TEST', and files from content/:
+ .B atari\-hd\-image 8 8mb-disk.img TEST content/
+ .SH SEE ALSO
+-.IR atari\-convert\-dir (1),
+-.IR hmsa (1),
+-.IR zip2st (1),
+-.IR hatari (1),
+-.IR mkdosfs (1),
+-.IR sfdisk (1),
++.IR atari\-convert\-dir (6),
++.IR hmsa (6),
++.IR zip2st (6),
++.IR hatari (6),
++.IR mkdosfs (8),
++.IR sfdisk (8),
+ .IR dd (1)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/debugger/gst2ascii.1 hatari-2.3.0.patched/tools/debugger/gst2ascii.1
+--- hatari-2.3.0/tools/debugger/gst2ascii.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/debugger/gst2ascii.1	2020-12-19 00:48:17.759515273 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "GST2ASCII" "1" "2017-11-11" "Hatari" "Hatari utilities"
++.TH "GST2ASCII" "6" "2017-11-11" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ gst2ascii \- Filter and output Atari program symbol table as ASCII
+ .SH "SYNOPSIS"
+@@ -60,8 +60,8 @@
+ .br
+ 	symbols program.sym TEXT DATA BSS
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR hatari_profile (1)
++.IR hatari (6),
++.IR hatari_profile (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/debugger/hatari_profile.1 hatari-2.3.0.patched/tools/debugger/hatari_profile.1
+--- hatari-2.3.0/tools/debugger/hatari_profile.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/debugger/hatari_profile.1	2020-12-19 00:55:04.273478319 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI_PROFILE" "1" "2013-04-15" "Hatari" "Hatari utilities"
++.TH "HATARI_PROFILE" "6" "2013-04-15" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hatari_profile \- Post-processor for Hatari profiler data
+ .SH "SYNOPSIS"
+@@ -135,10 +135,10 @@
+ -------------------------------------------------------------
+ .fi
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR gst2ascii (1),
+-.IR hconsole (1)
+-.IR hatariui (1)
++.IR hatari (6),
++.IR gst2ascii (6),
++.IR hconsole (6),
++.IR hatariui (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hatari-prg-args.1 hatari-2.3.0.patched/tools/hatari-prg-args.1
+--- hatari-2.3.0/tools/hatari-prg-args.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hatari-prg-args.1	2020-12-19 00:49:08.415510668 -0500
+@@ -1,4 +1,4 @@
+-.TH "hatari-prg-args" "1" "2018-05-01" "Hatari" "Hatari utilities"
++.TH "hatari-prg-args" "6" "2018-05-01" "Hatari" "Hatari utilities"
+ .SH NAME
+ hatari\-prg\-args \- autorun Atari programs with arguments
+ .SH SYNOPSIS
+@@ -37,8 +37,8 @@
+ Run it from disk image instead of host directory:
+ .B hatari\-prg\-args -m -- 'A:\\\\SIDPLAY.TTP' 'SIDS\\\\TEST.SID'
+ .SH SEE ALSO
+-.IR hatari (1),
+-.IR hconsole (1)
++.IR hatari (6),
++.IR hconsole (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hconsole/hconsole.1 hatari-2.3.0.patched/tools/hconsole/hconsole.1
+--- hatari-2.3.0/tools/hconsole/hconsole.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hconsole/hconsole.1	2020-12-19 00:49:34.615508286 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HCONSOLE" "1" "2010-10-10" "Hatari" "Hatari utilities"
++.TH "HCONSOLE" "6" "2010-10-10" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hconsole \- Interactive Python console for using Hatari's remote API
+ .SH "SYNOPSIS"
+@@ -52,8 +52,8 @@
+ By default hconsole and its examples are installed under
+ the /usr/share/hatari/hconsole/ directory.
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR hatariui (1)
++.IR hatari (6),
++.IR hatariui (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hmsa/hmsa.1 hatari-2.3.0.patched/tools/hmsa/hmsa.1
+--- hatari-2.3.0/tools/hmsa/hmsa.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hmsa/hmsa.1	2020-12-19 00:47:44.567518290 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HMSA" "1" "2010-05-30" "Hatari" "Hatari utilities"
++.TH "HMSA" "6" "2010-05-30" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hmsa \- Atari MSA / ST disk image creator and converter
+ .SH "SYNOPSIS"
+@@ -48,9 +48,9 @@
+ .br
+ 	hmsa disk.msa
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR zip2st (1),
+-.IR atari\-hd\-image (1)
++.IR hatari (6),
++.IR zip2st (6),
++.IR atari\-hd\-image (6)
+ .SH "AUTHOR"
+ Written by Thomas Huth <huth at tuxfamily.org>. This manual page
+ added by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/zip2st.1 hatari-2.3.0.patched/tools/zip2st.1
+--- hatari-2.3.0/tools/zip2st.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/zip2st.1	2020-12-19 00:49:25.742509093 -0500
+@@ -1,4 +1,4 @@
+-.TH "ZIP2ST" "1" "2016-02-26" "Hatari" "Hatari utilities"
++.TH "ZIP2ST" "6" "2016-02-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ zip2st \- convert directory or .zip archive to .st disk image
+ .SH SYNOPSIS
+@@ -29,11 +29,11 @@
+ within a .zip archive, you need to extract them before conversion.
+ .PP
+ .SH SEE ALSO
+-.IR hmsa (1),
+-.IR atari\-convert\-dir (1),
+-.IR atari\-hd\-image (1),
+-.IR hatari (1),
+-.IR unzip (1),
++.IR hmsa (6),
++.IR atari\-convert\-dir (6),
++.IR atari\-hd\-image (6),
++.IR hatari (6),
++.IR unzip (6),
+ .IR mtools (1),
+ .IR basename (1),
+ .IR dd (1).
diff --git a/games/hatari/slack-desc b/games/hatari/slack-desc
index fa776a63b7..7c55291048 100644
--- a/games/hatari/slack-desc
+++ b/games/hatari/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-hatari: hatari (Atari ST/STE/Falcon)
+hatari: hatari (Atari ST/STE/Falcon emulator)
 hatari:
 hatari: Hatari is an Atari ST/STE/Falcon emulator for Linux and other systems
 hatari: that are supported by the SDL library. The Atari ST was a 16/32 bit
diff --git a/games/img2xterm/README b/games/img2xterm/README
new file mode 100644
index 0000000000..04e55784cb
--- /dev/null
+++ b/games/img2xterm/README
@@ -0,0 +1,19 @@
+img2xterm (display images on the terminal)
+
+img2xterm is a program that can display bitmap images on 256-colour
+terminals by converting them into Unicode block characters and xterm
+compatible control sequences. It can also convert images to cowfiles,
+for use with cowsay(6).
+
+No checking is done on the terminal size. Each character cell in the
+terminal gets a 2x2 block of pixels, so if your terminal is 80x25, the
+largest image it can display is 160x50 pixels.
+
+This is known to work with xterm, konsole, and xfce4-terminal
+from Slackware 14.2; and rxvt-unicode (urxvt) and st from
+SlackBuilds.org. Plain rxvt doesn't seem to support 256-color mode,
+so it won't work there. Sadly, it doesn't work in the Linux console
+either.
+
+The package includes the GIMP palette mentioned in the README.md, and
+an RMS cowfile. Try: cowsay -f rmshd "Hello"
diff --git a/games/img2xterm/img2xterm.SlackBuild b/games/img2xterm/img2xterm.SlackBuild
new file mode 100644
index 0000000000..21345282bd
--- /dev/null
+++ b/games/img2xterm/img2xterm.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for img2xterm
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=img2xterm
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Hardcoded stuffs. The LN line turns the absolute symlinks into
+# relative, so we don't end up with links to $PKG.
+sed -i \
+  -e 's,share/man,man,g' \
+  -e 's,/bin\>,/games,g' \
+  -e "s,-O2,$SLKCFLAGS," \
+  -e '/LN/s,\$(PREFIX)[^ ]*/,,' \
+  Makefile
+
+make
+make install PREFIX=$PKG/usr
+
+# Include the stuff from extra/. To do this, we have to find out the
+# version of gimp to install the palette file for.
+case "${GIMPVER:-auto}" in
+  auto) GIMPVER=$(/bin/ls -d /usr/share/gimp/[0-9]*/ | sort -V | cut -d/ -f5) ;;
+  *)    GIMPVER=$(echo $GIMPVER | cut -d. -f1,2) ;;
+esac
+
+# We get a gimp palette, and an RMS cowfile... which looks like poor
+# RMS is covered in blood splatters, due to dithering.
+make -C extra
+mkdir -p $PKG/usr/share/gimp/$GIMPVER/palettes $PKG/usr/share/games/cows
+install -m0644 extra/*.gpl $PKG/usr/share/gimp/$GIMPVER/palettes
+install -m0644 extra/cows/*.cow $PKG/usr/share/games/cows
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/img2xterm/img2xterm.info b/games/img2xterm/img2xterm.info
new file mode 100644
index 0000000000..be681cf890
--- /dev/null
+++ b/games/img2xterm/img2xterm.info
@@ -0,0 +1,10 @@
+PRGNAM="img2xterm"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/rossy/img2xterm"
+DOWNLOAD="https://github.com/rossy/img2xterm/archive/v1.0.0/img2xterm-1.0.0.tar.gz"
+MD5SUM="a17d463d9513ab5420bb7891af615496"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/img2xterm/slack-desc b/games/img2xterm/slack-desc
new file mode 100644
index 0000000000..622f4f0879
--- /dev/null
+++ b/games/img2xterm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+img2xterm: img2xterm (display images on the terminal)
+img2xterm:
+img2xterm: img2xterm is a program that can display bitmap images on 256-colour
+img2xterm: terminals by converting them into Unicode block characters and xterm
+img2xterm: compatible control sequences. It can also convert images to cowfiles,
+img2xterm: for use with cowsay(6).
+img2xterm:
+img2xterm:
+img2xterm:
+img2xterm:
+img2xterm:
diff --git a/games/innoextract/innoextract.SlackBuild b/games/innoextract/innoextract.SlackBuild
index 115e82dc41..b00768c4df 100644
--- a/games/innoextract/innoextract.SlackBuild
+++ b/games/innoextract/innoextract.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for innoextract
 
 # Copyright 2013 Dugan Chen Canada
+# Copyright 2020-2021 Ruoh-Shoei LIN
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=innoextract
-VERSION=${VERSION:-1.7}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,8 +76,8 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release .. \
-	-DCMAKE_INSTALL_MANDIR=man
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_MANDIR=man ..
   make
   make install DESTDIR=$PKG
 cd ..
@@ -89,7 +90,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGELOG LICENSE README.md VERSION doc/ \
+  CHANGELOG LICENSE README.md VERSION CONTRIBUTING.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/innoextract/innoextract.info b/games/innoextract/innoextract.info
index bdc22333a0..acde52d6ed 100644
--- a/games/innoextract/innoextract.info
+++ b/games/innoextract/innoextract.info
@@ -1,10 +1,10 @@
 PRGNAM="innoextract"
-VERSION="1.7"
-HOMEPAGE="http://constexpr.org/innoextract/"
-DOWNLOAD="http://constexpr.org/innoextract/files/innoextract-1.7.tar.gz"
-MD5SUM="4c6fb595d42c7e411aae992472888be6"
+VERSION="1.9"
+HOMEPAGE="https://constexpr.org/innoextract/"
+DOWNLOAD="https://constexpr.org/innoextract/files/innoextract-1.9.tar.gz"
+MD5SUM="964f39bb3f8fd2313629e69ffd3dab9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ruoh-Shoei Lin"
-EMAIL="lin.ruohshoei@gmail.com"
+EMAIL="lin.ruohshoei+sbo at gmail.com"
diff --git a/games/ioquake3/ioquake3.SlackBuild b/games/ioquake3/ioquake3.SlackBuild
index 843784f784..c52a7f25ce 100644
--- a/games/ioquake3/ioquake3.SlackBuild
+++ b/games/ioquake3/ioquake3.SlackBuild
@@ -23,22 +23,16 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ioquake3
-VERSION=${VERSION:-r20200211}
+VERSION=${VERSION:-1.36_05180e3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Setting the arch here overrides the Makefiles
-# arch setting which causes the build to fail
-# on 32bit machines, so we change this to BARCH
-# here and let the Makefile set the ARCH.
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export BARCH=i586 ;;
-    arm*) export BARCH=arm ;;
-       *) export BARCH=$( uname -m ) ;;
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
   esac
-else
-  BARCH="$ARCH"
 fi
 
 CWD=$(pwd)
@@ -46,22 +40,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$BARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCH="x86"
-elif [ "$BARCH" = "i686" ]; then
+  BARCH="x86"
+elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCH="x86"
-elif [ "$BARCH" = "x86_64" ]; then
+  BARCH="x86"
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  ARCH="x86_64"
+  BARCH="x86_64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  ARCH="$BARCH"
+  BARCH="$ARCH"
 fi
 
 set -e
@@ -82,7 +76,7 @@ find -L . \
 make \
    release \
    copyfiles \
-   ARCH="$ARCH" \
+   ARCH="$BARCH" \
    COPYDIR="$PKG"/usr/share/games/quake3 \
    CFLAGS="$SLKCFLAGS" \
    USE_CODEC_VORBIS=1 \
@@ -106,8 +100,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # update quake3 files to newest point release (1.32b)
-chmod +x $CWD/linuxq3apoint-1.32b-3.x86.run
-$CWD/linuxq3apoint-1.32b-3.x86.run --tar xf
+sh $CWD/linuxq3apoint-1.32b-3.x86.run --tar xf
 install -m 644 baseq3/*.pk3 $PKG/usr/share/games/quake3/baseq3
 install -m 644 missionpack/*.pk3 $PKG/usr/share/games/quake3/missionpack
 
@@ -130,4 +123,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-$BARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/ioquake3/ioquake3.info b/games/ioquake3/ioquake3.info
index cfbc46e762..a3cca75cc5 100644
--- a/games/ioquake3/ioquake3.info
+++ b/games/ioquake3/ioquake3.info
@@ -1,9 +1,9 @@
 PRGNAM="ioquake3"
-VERSION="r20200211"
+VERSION="1.36_05180e3"
 HOMEPAGE="https://ioquake3.org/"
-DOWNLOAD="https://www.dropbox.com/s/1pwzisj5rsexn7d/ioquake3-r20200211.tar.gz \
+DOWNLOAD="https://www.dropbox.com/s/k84alghs7f6urwg/ioquake3-1.36_05180e3.tar.gz \
           http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run"
-MD5SUM="3d3ba4910adb990432f414df6fff7e43 \
+MD5SUM="c85b8539dc99d05c9650dbda3f65f6f0 \
         c71fdddccb20e8fc393d846e9c61d685"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/marathon-data/marathon b/games/marathon-data/marathon
index c71ef6fb56..36eda97fef 100644
--- a/games/marathon-data/marathon
+++ b/games/marathon-data/marathon
@@ -1,6 +1,23 @@
 #!/bin/sh
 
+# 20201026 bkw: if someone started the game without the wrapper
+# script (giving the path to the gamedata on the command line),
+# then tries to start the game again using this wrapper script,
+# it would fail to find its data files. Added ALEPHONE_DEFAULT_DATA
+# here to work around it. The issue was pointed out to me by
+# orbea, and lives here:
+# https://github.com/Aleph-One-Marathon/alephone/issues/24#issuecomment-715476894
+
 ALEPHONE_DATA="/usr/share/AlephOne/gamedata/Marathon"
-export ALEPHONE_DATA
+ALEPHONE_DEFAULT_DATA="$ALEPHONE_DATA"
+export ALEPHONE_DATA ALEPHONE_DEFAULT_DATA
+
+# work around another issue found by orbea:
+# https://github.com/Aleph-One-Marathon/alephone/pull/225
+# I can't reproduce this, it may only affect -current, but I can't see
+# any harm in adding the workaround here.
+
+SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0
+export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS
 
 exec alephone "$@"
diff --git a/games/marathon-data/marathon-data.SlackBuild b/games/marathon-data/marathon-data.SlackBuild
index f6d14b0c8f..f32dafeffd 100644
--- a/games/marathon-data/marathon-data.SlackBuild
+++ b/games/marathon-data/marathon-data.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=marathon-data
-VERSION=${VERSION:-20190331}
+VERSION=${VERSION:-20200904}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/marathon-data/marathon-data.info b/games/marathon-data/marathon-data.info
index 28c5e1810a..64b0b00acb 100644
--- a/games/marathon-data/marathon-data.info
+++ b/games/marathon-data/marathon-data.info
@@ -1,8 +1,8 @@
 PRGNAM="marathon-data"
-VERSION="20190331"
+VERSION="20200904"
 HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20190331/Marathon-20190331-Data.zip"
-MD5SUM="d76c48be507d92b2053e1987d76fdf7c"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20200904/Marathon-20200904-Data.zip"
+MD5SUM="f608af955110a0681f284e823debe752"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="alephone"
diff --git a/games/marathon-infinity-data/marathon-infinity b/games/marathon-infinity-data/marathon-infinity
index 660acc96f1..a7e1247db9 100644
--- a/games/marathon-infinity-data/marathon-infinity
+++ b/games/marathon-infinity-data/marathon-infinity
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 ALEPHONE_DATA="/usr/share/AlephOne/gamedata/Marathon Infinity"
-export ALEPHONE_DATA
+ALEPHONE_DEFAULT_DATA="$ALEPHONE_DATA"
+export ALEPHONE_DATA ALEPHONE_DEFAULT_DATA
+
+SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0
+export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS
 
 exec alephone "$@"
diff --git a/games/marathon-infinity-data/marathon-infinity-data.SlackBuild b/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
index 55e5316cf7..a8e2e86a4f 100644
--- a/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
+++ b/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=marathon-infinity-data
-VERSION=${VERSION:-20190331}
+VERSION=${VERSION:-20200904}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/marathon-infinity-data/marathon-infinity-data.info b/games/marathon-infinity-data/marathon-infinity-data.info
index 960f86cb74..65d2289201 100644
--- a/games/marathon-infinity-data/marathon-infinity-data.info
+++ b/games/marathon-infinity-data/marathon-infinity-data.info
@@ -1,8 +1,8 @@
 PRGNAM="marathon-infinity-data"
-VERSION="20190331"
+VERSION="20200904"
 HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20190331/MarathonInfinity-20190331-Data.zip"
-MD5SUM="5916e0eef75db5539d42d8586dff356e"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20200904/MarathonInfinity-20200904-Data.zip"
+MD5SUM="a64be0fff890c5712dd61efe5d264ba5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="alephone"
diff --git a/games/marathon2-data/marathon2 b/games/marathon2-data/marathon2
index d0e9c8ee3d..ad83f0a1b0 100644
--- a/games/marathon2-data/marathon2
+++ b/games/marathon2-data/marathon2
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 ALEPHONE_DATA="/usr/share/AlephOne/gamedata/Marathon 2"
-export ALEPHONE_DATA
+ALEPHONE_DEFAULT_DATA="$ALEPHONE_DATA"
+export ALEPHONE_DATA ALEPHONE_DEFAULT_DATA
+
+SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0
+export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS
 
 exec alephone "$@"
diff --git a/games/marathon2-data/marathon2-data.SlackBuild b/games/marathon2-data/marathon2-data.SlackBuild
index b9a5f28967..446dbf33d2 100644
--- a/games/marathon2-data/marathon2-data.SlackBuild
+++ b/games/marathon2-data/marathon2-data.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=marathon2-data
-VERSION=${VERSION:-20190331}
+VERSION=${VERSION:-20200904}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/marathon2-data/marathon2-data.info b/games/marathon2-data/marathon2-data.info
index 00ac793af8..371b43b353 100644
--- a/games/marathon2-data/marathon2-data.info
+++ b/games/marathon2-data/marathon2-data.info
@@ -1,8 +1,8 @@
 PRGNAM="marathon2-data"
-VERSION="20190331"
+VERSION="20200904"
 HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20190331/Marathon2-20190331-Data.zip"
-MD5SUM="7d13872a7ca82f16dd4a421176b9d2f9"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20200904/Marathon2-20200904-Data.zip"
+MD5SUM="b6878568d5b4c91dd6a79beb9d7f009a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="alephone"
diff --git a/games/meandmyshadow/README b/games/meandmyshadow/README
index 0de9d16730..586fe7f3f8 100644
--- a/games/meandmyshadow/README
+++ b/games/meandmyshadow/README
@@ -1,3 +1,5 @@
-A puzzle/plateform game with a player and its shadow.
+A puzzle/platform game with a player and its shadow.
 
-Optional: lua53
+Optional: lua53 can be used in place of lua52. If you have both
+installed, lua53 will be used unless you export LUAVER="5.2" in the
+environment.
diff --git a/games/meandmyshadow/meandmyshadow.SlackBuild b/games/meandmyshadow/meandmyshadow.SlackBuild
index 024f5951f1..417b463d70 100644
--- a/games/meandmyshadow/meandmyshadow.SlackBuild
+++ b/games/meandmyshadow/meandmyshadow.SlackBuild
@@ -22,6 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210214 bkw: Modified by SlackBuilds.org to allow building on a
+# system that has both lua and lua52 (or lua53) installed.
+
 PRGNAM=meandmyshadow
 VERSION=${VERSION:-0.5a}
 BUILD=${BUILD:-1}
@@ -56,6 +59,23 @@ fi
 
 set -e
 
+# 20210214 bkw: cmake can't be told to ignore lua-5.1 when both 5.1
+# and 5.2 are installed, so help it out a little. LUAVER is used in
+# the cmake command, below.
+if [ -z "$LUAVER" ]; then
+  if [ -x /usr/bin/lua5.3 ]; then
+    LUAVER=5.3
+  elif [ -x /usr/bin/lua5.2 ]; then
+    LUAVER=5.2
+  fi
+fi
+
+case "$LUAVER" in
+  5.[23]) ;; # OK
+  *) echo "$0: No supported lua version found, install lua52 or lua53." 2>&1
+     exit 0 ;;
+esac
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -75,6 +95,10 @@ sed -i 's/\r//' docs/ThemeDescription.md
 mkdir -p build
 cd build
   cmake -G "Unix Makefiles" \
+    -DLUA_FOUND=ON \
+    -DLUA_LIBRARY="/usr/lib$LIBDIRSUFFIX/liblua$LUAVER.so" \
+    -DLUA_INCLUDE_DIR="/usr/include/lua$LUAVER" \
+    -DLUA_MATH_LIBRARY="/usr/lib$LIBDIRSUFFIX/libm.so" \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DBINDIR=/usr/games \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/games/meandmyshadow/slack-desc b/games/meandmyshadow/slack-desc
index ab5c97000b..d4aac92bf0 100644
--- a/games/meandmyshadow/slack-desc
+++ b/games/meandmyshadow/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
              |-----handy-ruler------------------------------------------------------|
-meandmyshadow: meandmyshadow (puzzle/plateform game)
+meandmyshadow: meandmyshadow (puzzle/platform game)
 meandmyshadow:
-meandmyshadow: A puzzle/plateform game with a player and its shadow.
+meandmyshadow: A puzzle/platform game with a player and its shadow.
 meandmyshadow:
 meandmyshadow: Homepage: http://meandmyshadow.sourceforge.net/
 meandmyshadow:
diff --git a/games/mednaffe/README b/games/mednaffe/README
index ffa06d8dde..720c516061 100644
--- a/games/mednaffe/README
+++ b/games/mednaffe/README
@@ -6,10 +6,7 @@ Its main features are:
 
  * It is written in C.
  * Available for Linux and Windows.
- * The only dependency is GTK+2 (or GTK+3).
+ * The only dependency is GTK+3.
  * GPLv3 licensed.
 
 Note: Mednaffe only works with 1.21.1 or higher versions of mednafen.
-
-By default, mednaffe is built with GTK+2. If you prefer GTK+3, export
-GTK3=yes in the script's environment.
diff --git a/games/mednaffe/mednaffe.SlackBuild b/games/mednaffe/mednaffe.SlackBuild
index 21f1dfe683..b0063819fb 100644
--- a/games/mednaffe/mednaffe.SlackBuild
+++ b/games/mednaffe/mednaffe.SlackBuild
@@ -6,8 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210222 bkw: update for v0.9.1. Upstream dropped support for GTK+2,
+# so got rid of GTKVER environment variable.
+
 PRGNAM=mednaffe
-VERSION=${VERSION:-0.8.8}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,19 +53,10 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-if [ "${GTK3:-no}" = "yes" ]; then
-  GTKOPT="--enable-gtk3"
-  GTKVER=3
-else
-  GTKOPT="--disable-gtk3"
-  GTKVER=2
-fi
-
-# --docdir is ignored, have to use nonstandard docsdir in make install.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  $GTKOPT \
+  --docdir="/usr/doc/$PRGNAM-$VERSION" \
   --bindir=/usr/games \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -72,13 +66,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG docsdir="/usr/doc/$PRGNAM-$VERSION"
+make install-strip DESTDIR=$PKG
 
 # docs already installed, just add this:
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed "s,@GTKVER@,$GTKVER," $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/mednaffe/mednaffe.info b/games/mednaffe/mednaffe.info
index 5bb00ceed2..280e2cc7c2 100644
--- a/games/mednaffe/mednaffe.info
+++ b/games/mednaffe/mednaffe.info
@@ -1,8 +1,8 @@
 PRGNAM="mednaffe"
-VERSION="0.8.8"
+VERSION="0.9.1"
 HOMEPAGE="https://github.com/AmatCoder/mednaffe"
-DOWNLOAD="https://github.com/AmatCoder/mednaffe/releases/download/0.8.8/mednaffe-0.8.8.tar.gz"
-MD5SUM="8beab613db597d53bcc8cd4e62f281eb"
+DOWNLOAD="https://github.com/AmatCoder/mednaffe/releases/download/0.9.1/mednaffe-0.9.1.tar.gz"
+MD5SUM="45e094397c227fc018a1e0f758fd139b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/mednaffe/slack-desc b/games/mednaffe/slack-desc
index 3d6e3a71bf..9815a8a62b 100644
--- a/games/mednaffe/slack-desc
+++ b/games/mednaffe/slack-desc
@@ -10,7 +10,7 @@ mednaffe: mednaffe (frontend for mednafen)
 mednaffe:
 mednaffe: Mednaffe is a GUI front-end for the mednafen emulator.
 mednaffe:
-mednaffe: This package was built with GTK+@GTKVER@.
+mednaffe:
 mednaffe:
 mednaffe:
 mednaffe:
diff --git a/games/megaglest/README b/games/megaglest/README
index d054764324..141c565845 100644
--- a/games/megaglest/README
+++ b/games/megaglest/README
@@ -5,6 +5,3 @@ is setup in one of 16 naturally looking settings, which (like the
 unit models) are crafted with great appreciation for detail.
 
 Optional dependencies: libircclient, miniupnpc, vlc, p7zip
-
-Note to parallel builders: don't user more than 2 jobs or build
-will break.
diff --git a/games/megaglest/megaglest.SlackBuild b/games/megaglest/megaglest.SlackBuild
index e72f00d757..b6a644667c 100644
--- a/games/megaglest/megaglest.SlackBuild
+++ b/games/megaglest/megaglest.SlackBuild
@@ -22,6 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210215 bkw: modified by SlackBuilds.org: This build was broken for
+# *3 years* and nobody ever complained...
+# - Add -std=c++11 to CXXFLAGS.
+# - Force cmake to use lua 5.1. This fixes the build on systems where
+#   both lua and (lua52 and/or lua53) are installed.
+# - Add -j1 to the 'make install' because the xvfb-run script fails if
+#   a 2nd instance is started (and get rid of parallel build warning
+#   in README).
+
 PRGNAM=megaglest
 VERSION=${VERSION:-3.13.0}
 BUILD=${BUILD:-1}
@@ -82,17 +91,20 @@ patch -p1 < $CWD/megaglest-underlink.patch
 mkdir build
 cd build
   cmake -G "Unix Makefiles" \
+    -DLUA_LIBRARY="/usr/lib$LIBDIRSUFFIX/liblua.so" \
+    -DLUA_INCLUDE_DIR="/usr/include/" \
+    -DLUA_MATH_LIBRARY="/usr/lib$LIBDIRSUFFIX/libm.so" \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DWANT_GIT_STAMP=OFF \
     -DMEGAGLEST_BIN_INSTALL_PATH:PATH="games/" \
     -DMEGAGLEST_MANPAGE_INSTALL_PATH:PATH="man/man6/" \
     -DWANT_USE_XercesC:BOOL=ON \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
     -DCMAKE_BUILD_TYPE=Release ..
 
   make VERBOSE=1
-  make install DESTDIR=$PKG
+  make -j1 install DESTDIR=$PKG
 cd -
 
 # Now install the game data
diff --git a/games/mgba/mgba.SlackBuild b/games/mgba/mgba.SlackBuild
index 302f61f1b5..3927ea4b1a 100644
--- a/games/mgba/mgba.SlackBuild
+++ b/games/mgba/mgba.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mgba
 
 # Copyright 2015 Dugan Chen Canada
-# Copyright 2019-2020 Ruoh-Shoei LIN
+# Copyright 2019-2021 Ruoh-Shoei LIN
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mgba
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,7 @@ cd build
     -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \
     -DCMAKE_INSTALL_LIBDIR:PATH=lib$LIBDIRSUFFIX \
     -DMANDIR=man \
-    -DUSE_LIBZIP=OFF \
+    -DUSE_DISCORD_RPC=OFF \
     -DBUILD_QT=${QT} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
@@ -97,7 +97,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 CHANGES LICENSE CONTRIBUTING.md PORTING.md README.md README_DE.md \
+cp CONTRIBUTING.md PORTING.md \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/mgba/mgba.info b/games/mgba/mgba.info
index 2827f7ead8..8fac518ec0 100644
--- a/games/mgba/mgba.info
+++ b/games/mgba/mgba.info
@@ -1,10 +1,10 @@
 PRGNAM="mgba"
-VERSION="0.8.3"
+VERSION="0.9.0"
 HOMEPAGE="https://mgba.io/"
-DOWNLOAD="https://github.com/mgba-emu/mgba/archive/0.8.3/mgba-0.8.3.tar.gz"
-MD5SUM="1143c7d96b7dcd032db10e7407f68761"
+DOWNLOAD="https://github.com/mgba-emu/mgba/archive/0.9.0/mgba-0.9.0.tar.gz"
+MD5SUM="8ec54054bf7270d78dab0eb0090626ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ruoh-Shoei LIN"
-EMAIL="lin[dot]ruohshoei [at] gmail [dot] com"
+EMAIL="lin.ruohshoei+sbo at gmail.com"
diff --git a/games/mininim/mininim.SlackBuild b/games/mininim/mininim.SlackBuild
index 67059dce1d..0a1bc046ab 100644
--- a/games/mininim/mininim.SlackBuild
+++ b/games/mininim/mininim.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201105 bkw: Minor nitpickey edits to the script, but no changes
+# to the package. 201701122309 is still the latest release. The newer
+# stuff from this year is "Pre-alpha" and "Pre-release".
+
 # 20170317 bkw: If I'd known about mininim before discovering sdlpop,
 # probably I would have submitted a build for mininim and never touched
 # sdlpop. As it stands, we have both (choice is good). mininim is a lot
@@ -53,12 +57,8 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
-# using \+ instead of \; for this find makes it run 10x as fast!
-find -L . \
- \( -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 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Slack 14.2's makeinfo chokes on this, I dunno what version upstream
 # uses.
diff --git a/games/ncursesoflife/README b/games/ncursesoflife/README
new file mode 100644
index 0000000000..28c038edea
--- /dev/null
+++ b/games/ncursesoflife/README
@@ -0,0 +1,5 @@
+ncursesoflife (console Conway's Game of Life)
+
+ncursesoflife is a simple Conway's Life simulator, with the ability
+to draw your own patterns and run the simulation one step at a time
+or continuously. It runs in a terminal and uses keyboard controls.
diff --git a/games/ncursesoflife/git2tarxz.sh b/games/ncursesoflife/git2tarxz.sh
new file mode 100644
index 0000000000..a607cc682c
--- /dev/null
+++ b/games/ncursesoflife/git2tarxz.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=ncursesoflife
+CLONE_URL=https://github.com/AftExploision/NcursesOfLife
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+#VERSION=1.30_beta+${DATE}_${GIT_SHA}
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/games/ncursesoflife/ncursesoflife.6 b/games/ncursesoflife/ncursesoflife.6
new file mode 100644
index 0000000000..6ea5f05031
--- /dev/null
+++ b/games/ncursesoflife/ncursesoflife.6
@@ -0,0 +1,97 @@
+.\" Man page generated from reStructuredText.
+.
+.TH NCURSESOFLIFE 6 "2020-11-12" "20141006_0ceeca7" "SlackBuilds.org"
+.SH NAME
+ncursesoflife \- console Conway's Game of Life simulator
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for ncursesoflife(1) man page. Convert with:
+.
+.\" rst2man.py ncursesoflife.rst > ncursesoflife.6
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.\" converting from pod:
+.
+.\" s/B<\([^>]*\)>/**\1**/g
+.
+.\" s/I<\([^>]*\)>/*\1*/g
+.
+.SH SYNOPSIS
+.sp
+ncursesoflife
+.SH DESCRIPTION
+.sp
+ncursesoflife is a simple Conway\(aqs Life simulator, with the ability
+to draw your own patterns and run the simulation one step at a time
+or continuously.
+.sp
+There are no command\-line options or arguments.
+.SH CONTROLS
+.sp
+SIM stage:
+.INDENT 0.0
+.TP
+.B \fBp\fP
+play/pause
+.TP
+.B \fBn\fP
+step
+.TP
+.B \fB+\fP
+faster
+.TP
+.B \fB\-\fP
+slower
+.TP
+.B \fBq\fP
+quit
+.UNINDENT
+.sp
+WHEN PAUSED:
+.INDENT 0.0
+.TP
+.B \fBw\fP \fBa\fP \fBs\fP \fBd\fP, \fBarrow keys\fP
+move
+.TP
+.B \fBspace\fP
+toggle cell
+.UNINDENT
+.sp
+Game starts out paused.  All SIM keystrokes will work when paused (step only works paused).
+.SH AUTHORS
+.sp
+ncursesoflife was written by AftExploision.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The ncursesoflife homepage: \fI\%https://github.com/AftExploision/NcursesOfLife\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/games/ncursesoflife/ncursesoflife.SlackBuild b/games/ncursesoflife/ncursesoflife.SlackBuild
new file mode 100644
index 0000000000..f308c97eca
--- /dev/null
+++ b/games/ncursesoflife/ncursesoflife.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for ncursesoflife
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=ncursesoflife
+VERSION=${VERSION:-20141006_0ceeca7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# compile binary, stripped, directly to $PKG
+sed -i "/^CFLAGS/s|-g|$SLKCFLAGS -Wl,-s|" makefile
+mkdir -p $PKG/usr/games
+make OUT=$PKG/usr/games/$PRGNAM
+
+# man page by SlackBuild author
+mkdir -p $PKG/usr/man/man6
+gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/ncursesoflife/ncursesoflife.info b/games/ncursesoflife/ncursesoflife.info
new file mode 100644
index 0000000000..bdd928664c
--- /dev/null
+++ b/games/ncursesoflife/ncursesoflife.info
@@ -0,0 +1,10 @@
+PRGNAM="ncursesoflife"
+VERSION="20141006_0ceeca7"
+HOMEPAGE="https://github.com/AftExploision/NcursesOfLife"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ncursesoflife-20141006_0ceeca7.tar.xz"
+MD5SUM="4da4cd38e00515c76a11f7be68a7c0a9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/ncursesoflife/ncursesoflife.rst b/games/ncursesoflife/ncursesoflife.rst
new file mode 100644
index 0000000000..97b8654062
--- /dev/null
+++ b/games/ncursesoflife/ncursesoflife.rst
@@ -0,0 +1,80 @@
+.. RST source for ncursesoflife(1) man page. Convert with:
+..   rst2man.py ncursesoflife.rst > ncursesoflife.6
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20141006_0ceeca7
+.. |date| date::
+
+.. converting from pod:
+.. s/B<\([^>]*\)>/**\1**/g
+.. s/I<\([^>]*\)>/*\1*/g
+
+=============
+ncursesoflife
+=============
+
+---------------------------------------
+console Conway's Game of Life simulator
+---------------------------------------
+
+:Manual section: 6
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+ncursesoflife
+
+DESCRIPTION
+===========
+
+ncursesoflife is a simple Conway's Life simulator, with the ability
+to draw your own patterns and run the simulation one step at a time
+or continuously.
+
+There are no command-line options or arguments.
+
+CONTROLS
+========
+
+SIM stage:
+
+**p**
+     play/pause
+
+**n**
+     step
+
+**+**
+     faster
+
+**-**
+     slower
+
+**q**
+     quit
+
+WHEN PAUSED:
+
+**w** **a** **s** **d**, **arrow keys**
+     move
+
+**space**
+     toggle cell
+
+Game starts out paused.  All SIM keystrokes will work when paused (step only works paused).  
+
+AUTHORS
+=======
+
+ncursesoflife was written by AftExploision.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The ncursesoflife homepage: https://github.com/AftExploision/NcursesOfLife
diff --git a/games/ncursesoflife/slack-desc b/games/ncursesoflife/slack-desc
new file mode 100644
index 0000000000..b11156d07f
--- /dev/null
+++ b/games/ncursesoflife/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+ncursesoflife: ncursesoflife (console Conway's Game of Life)
+ncursesoflife:
+ncursesoflife: ncursesoflife is a simple Conway's Life simulator, with the ability
+ncursesoflife: to draw your own patterns and run the simulation one step at a time
+ncursesoflife: or continuously. It runs in a terminal and uses keyboard controls.
+ncursesoflife:
+ncursesoflife:
+ncursesoflife:
+ncursesoflife:
+ncursesoflife:
+ncursesoflife:
diff --git a/games/nestopia/nestopia.SlackBuild b/games/nestopia/nestopia.SlackBuild
index cc656c658b..3bee82c738 100644
--- a/games/nestopia/nestopia.SlackBuild
+++ b/games/nestopia/nestopia.SlackBuild
@@ -61,7 +61,7 @@ autoreconf -vif
 GTK=${GTK:-no}
 case "$GTK" in
     [yY]|[yY][eE][sS]) GTK="--enable-gui" ;;
-    *) NO_UMFPACK="--disable-gui" ;;
+    *) GTK="--disable-gui" ;;
 esac
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/games/odamex/odamex.SlackBuild b/games/odamex/odamex.SlackBuild
index 343e24968b..539ae20d6a 100644
--- a/games/odamex/odamex.SlackBuild
+++ b/games/odamex/odamex.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw: update for v0.8.3.
 # 20191201 bkw: update for v0.8.1.
 
 # 20140910 bkw:
@@ -21,7 +22,7 @@
 # - include sample orasrv.cfg from 0.6.4 source (it's gone from 0.7.0)
 
 PRGNAM=odamex
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.8.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,6 +80,9 @@ sed -i \
   '/launchercfg_s.odamex_directory *= */s,wxGetCwd(),wxString::FromAscii("/usr/games"),' \
   odalaunch/src/dlg_main.cpp
 
+# 20201024 bkw: Not sure why make is exiting with nonzero status after
+# linking odalaunch. There are no error messages. Adding "-i" to the
+# make command line is a band-aid for this.
 mkdir -p build
 cd build
   cmake \
@@ -87,17 +91,22 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DwxWidgets_CONFIG_EXECUTABLE=$WXCONFIG \
     -DCMAKE_BUILD_TYPE=Release ..
-  make VERBOSE=1
+  make -i VERBOSE=1
 cd ..
 
 # cmake-based odamex lacks a 'make install' target, do it manually.
+# Actually, there is one in 0.8.3, but it doesn't work.
 mkdir -p $PKG/usr/games
 install -s -m0755 build/client/$PRGNAM $PKG/usr/games
 install -s -m0755 build/server/odasrv $PKG/usr/games
 install -s -m0755 build/odalaunch/odalaunch $PKG/usr/games
 
 mkdir -p $PKG/usr/share/games/doom
-install -m0644 $PRGNAM.wad $PKG/usr/share/games/doom
+
+# wad file has moved in the source tree, accomodate either version
+WAD="$PRGNAM.wad"
+[ -e "wad/$PRGNAM.wad" ] && WAD="wad/$PRGNAM.wad"
+install -m0644 $WAD $PKG/usr/share/games/doom
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/tech
 cp -a CHANGELOG LICENSE MAINTAINERS README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/odamex/odamex.info b/games/odamex/odamex.info
index e5a89c4968..2da96d07f2 100644
--- a/games/odamex/odamex.info
+++ b/games/odamex/odamex.info
@@ -1,8 +1,8 @@
 PRGNAM="odamex"
-VERSION="0.8.1"
+VERSION="0.8.3"
 HOMEPAGE="http://odamex.net/"
-DOWNLOAD="http://downloads.sourceforge.net/odamex/odamex-src-0.8.1.tar.bz2"
-MD5SUM="5fcc9549a595af5a1a3a9f8b21d0a033"
+DOWNLOAD="http://downloads.sourceforge.net/odamex/odamex-src-0.8.3.tar.bz2"
+MD5SUM="c096604173a0d48946f877483520dec1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3"
diff --git a/games/open-adventure/open-adventure.SlackBuild b/games/open-adventure/open-adventure.SlackBuild
index d33724b1f2..4ab94bbc9f 100644
--- a/games/open-adventure/open-adventure.SlackBuild
+++ b/games/open-adventure/open-adventure.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw: Update for v1.9.
 # 20191211 bkw: Update for v1.8.
 # 20181203 bkw: Update for v1.6.
 
@@ -15,7 +16,7 @@
 # - New dependencies in .info file :(
 
 PRGNAM=open-adventure
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,9 +69,17 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# As of v1.9, upstream carelessly checked a prebuilt binary into the repo.
+# Or maybe it was on purpose? Anyway don't use.
+make clean
+
 # It'd be nice if I could pass my own CFLAGS without editing the Makefile...
 sed -i "s,-O2,$SLKCFLAGS," Makefile
-make
+
+# 20201024 bkw: Parallel make causes ./make_dungeon.py to run
+# twice. This doesn't seem to hurt anything, but I can see how it
+# might someday. So -j1.
+make -j1
 make $EXE.6
 
 # no 'make install' target:
diff --git a/games/open-adventure/open-adventure.info b/games/open-adventure/open-adventure.info
index 11f158c55a..d14d9f11e2 100644
--- a/games/open-adventure/open-adventure.info
+++ b/games/open-adventure/open-adventure.info
@@ -1,10 +1,10 @@
 PRGNAM="open-adventure"
-VERSION="1.8"
+VERSION="1.9"
 HOMEPAGE="https://gitlab.com/esr/open-adventure"
-DOWNLOAD="https://gitlab.com/esr/open-adventure/-/archive/1.8/open-adventure-1.8.tar.bz2"
-MD5SUM="99a4af60e7b483b9d0cae107c44dbce5"
+DOWNLOAD="https://gitlab.com/esr/open-adventure/-/archive/1.9/open-adventure-1.9.tar.bz2"
+MD5SUM="aca1f7c1732eeadae8cd107d7f201af5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="PyYAML libedit"
+REQUIRES="python3-PyYAML libedit"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild
index 68c6bc6feb..ffa3e095a1 100644
--- a/games/pioneer/pioneer.SlackBuild
+++ b/games/pioneer/pioneer.SlackBuild
@@ -81,12 +81,23 @@ GLEW=OFF
 LUA=OFF
 
 pkg-config --exists glew && GLEW=ON
-pkg-config --exists lua5.2 && LUA=ON
+
+# 20210214 bkw: cmake can't easily be told to ignore lua 5.1 on a
+# system where both 5.1 and 5.2 are installed. In that case, we'll
+# use the bundled lua source. Note that there's no problem with 5.3,
+# as cmake seems to search for them in order.
+pkg-config --exists lua5.2 && ! pkg-config --exists lua && LUA=ON
 
 # Workaround 32-bit build failure
 # https://github.com/pioneerspacesim/pioneer/issues/4691
 patch -p1 < $CWD/alignment.patch
 
+# 20210214 bkw: prevent the build from writing to /root/, without
+# breaking ccache if it's in use.
+mkdir -p tmphome
+export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache}
+export HOME=$( pwd )/tmphome
+
 mkdir -p build
 cd build
   cmake \
diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild
index 2c79e3aaae..48a9237578 100644
--- a/games/ppsspp/ppsspp.SlackBuild
+++ b/games/ppsspp/ppsspp.SlackBuild
@@ -23,6 +23,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210218 bkw: modified by SlackBuilds.org. Use correct filenames
+# in the github URLs for the 'submodules'. This is needed because
+# we don't get to decide what user-agent the user downloads files
+# with. If the Content-Disposition header is honored (e.g. files
+# downloaded with a web browser), this build failed.
+
 PRGNAM=ppsspp
 VERSION=${VERSION:-1.10.3}
 BUILD=${BUILD:-1}
@@ -66,15 +72,15 @@ cd $PRGNAM-$VERSION
 
 # The submodules are in a separate archive. This is equivalent to
 # git submodule update --init --recursive
-tar -xvf $CWD/hrydgard-glslang-d0850f8.tar.gz \
+tar -xvf $CWD/glslang-d0850f8*.tar.gz \
     -C ext/glslang --strip-components=1
-tar -xvf $CWD/hrydgard-ppsspp-lang-1c64b8f.tar.gz \
+tar -xvf $CWD/ppsspp-lang-1c64b8f*.tar.gz \
     -C assets/lang --strip-components=1
-tar -xvf $CWD/KhronosGroup-SPIRV-Cross-a1f7c8d.tar.gz \
+tar -xvf $CWD/SPIRV-Cross-a1f7c8d*.tar.gz \
     -C ext/SPIRV-Cross --strip-components=1
-tar -xvf $CWD/Kingcom-armips-7885552.tar.gz \
+tar -xvf $CWD/armips-7885552*.tar.gz \
     -C ext/armips --strip-components=1
-tar -xvf $CWD/hrydgard-ppsspp-ffmpeg-55147e5.tar.gz \
+tar -xvf $CWD/ppsspp-ffmpeg-55147e5*.tar.gz \
     --exclude '*/Windows*' --exclude '*/android' \
     --exclude '*/ios' --exclude '*/blackberry'\
     --exclude '*/macosx' --exclude '*/wiiu' \
diff --git a/games/ppsspp/ppsspp.info b/games/ppsspp/ppsspp.info
index 2b9113f20c..3021609a00 100644
--- a/games/ppsspp/ppsspp.info
+++ b/games/ppsspp/ppsspp.info
@@ -2,17 +2,17 @@ PRGNAM="ppsspp"
 VERSION="1.10.3"
 HOMEPAGE="https://www.ppsspp.org/"
 DOWNLOAD="https://github.com/hrydgard/ppsspp/archive/v1.10.3/ppsspp-1.10.3.tar.gz \
-	  https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c/hrydgard-glslang-d0850f8.tar.gz \
-	  https://github.com/hrydgard/ppsspp-lang/archive/1c64b8fbd3cb6bd87935eb53f302f7de6f86e209/hrydgard-ppsspp-lang-1c64b8f.tar.gz \
-	  https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13/KhronosGroup-SPIRV-Cross-a1f7c8d.tar.gz \
-	  https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576/Kingcom-armips-7885552.tar.gz \
-	  https://github.com/hrydgard/ppsspp-ffmpeg/archive/55147e5f33f5ae4904f75ec082af809267122b94/hrydgard-ppsspp-ffmpeg-55147e5.tar.gz"
+          https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c/glslang-d0850f875ec392a130ccf00018dab458b546f27c.tar.gz \
+          https://github.com/hrydgard/ppsspp-lang/archive/1c64b8fbd3cb6bd87935eb53f302f7de6f86e209/ppsspp-lang-1c64b8fbd3cb6bd87935eb53f302f7de6f86e209.tar.gz \
+          https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13/SPIRV-Cross-a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz \
+          https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576/armips-7885552b208493a6a0f21663770c446c3ba65576.tar.gz \
+          https://github.com/hrydgard/ppsspp-ffmpeg/archive/55147e5f33f5ae4904f75ec082af809267122b94/ppsspp-ffmpeg-55147e5f33f5ae4904f75ec082af809267122b94.tar.gz"
 MD5SUM="66d6f34bba99f06e4cedf8d24fc9a205 \
-	781915370eb2b2c3c2f75d33a46154ae \
-	78e170cb8e40106dc1d428f896defdd9 \
-	9c0141380c98ccdff95a084ac07d1d48 \
-	4731977e287eee39ddcc247d75095758 \
-	d529fc6f45fd4bbec825c543dab9da65"
+        781915370eb2b2c3c2f75d33a46154ae \
+        78e170cb8e40106dc1d428f896defdd9 \
+        9c0141380c98ccdff95a084ac07d1d48 \
+        4731977e287eee39ddcc247d75095758 \
+        d529fc6f45fd4bbec825c543dab9da65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 python3"
diff --git a/games/prboom-plus/README b/games/prboom-plus/README
index 70ec066d88..b42063184f 100644
--- a/games/prboom-plus/README
+++ b/games/prboom-plus/README
@@ -4,14 +4,17 @@ PrBoom+ is a Doom source port developed from the original PrBoom
 project.
 
 Features uncapped framerate, widescreen aspect ratios, soundfont
-support, variable gamespeed, re-record, walkcam, chasecam, full full
-mouselook, fov and other features along with full compatibility with
-the original Doom/Doom2 engines.
-
-FluidSynth, needed for soundfont support, is an optional dependency.
+support, variable gamespeed, re-record, walkcam, chasecam, full
+mouselook, variable FOV, and other features along with full
+compatibility with the original Doom/Doom2 engines.
 
 The documentation refers to a directory into which an IWAD
 file (doom.wad, doom2.wad, tnt.wad, plutonia.wad, or the
-shareware doom1.wad) may be placed.  The IWAD directory is
+shareware doom1.wad) may be placed. The IWAD directory is
 /usr/share/games/doom. If you don't have any IWADs, install
 doom_shareware_data to play shareware Doom.
+
+Optional dependencies, autodetected:
+
+fluidsynth - for MIDI soundfont support.
+portmidi - for the PortMIDI backend. Most users won't need this.
diff --git a/games/prboom-plus/prboom-plus.SlackBuild b/games/prboom-plus/prboom-plus.SlackBuild
index ed96afa6b7..aa14bfb9c2 100644
--- a/games/prboom-plus/prboom-plus.SlackBuild
+++ b/games/prboom-plus/prboom-plus.SlackBuild
@@ -7,6 +7,14 @@
 # Original had no license. Modified version released under the WTFPL. See
 # http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210223 bkw: update for v2.6um. Upstream switched to cmake,
+# so we can't build previous versions any more. A note to myself:
+# SDL2 really is required. SDL2_(net|mixer|image) are technically
+# optional. But I'm keeping them listed as requirements because users
+# will get annoyed if they accidentally build a Doom engine that's
+# incapable of playing music, or joining multiplayer games, or using
+# HQ textures.
+
 # 20200416 bkw:
 # - take over maintenance
 # - i486 => i586
@@ -16,7 +24,7 @@
 # - game binaries in /usr/games
 
 PRGNAM=prboom-plus
-VERSION=${VERSION:-2.5.1.7um}
+VERSION=${VERSION:-2.6um}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,6 +57,17 @@ fi
 
 set -e
 
+# If modern cmake is missing, the error message from the old 14.2 cmake
+# doesn't really make it clear why it fails, so add this check to avoid
+# receiving "why won't this build?" emails. This stanza can go away after
+# 15.0 is released.
+if ! [ -x /opt/cmake-202x/bin/cmake ]; then
+  echo "*** Missing required dependency: cmame-202x. Aborting." 1>&2
+  exit 1
+fi
+
+export PATH=/opt/cmake-202x/bin:$PATH
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -60,28 +79,25 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 [ -d prboom2 ] && cd prboom2
-[ -x configure ] || sh bootstrap
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --bindir=/usr/games \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --build=$ARCH-slackware-linux \
-  --datarootdir=/usr \
-  --enable-gl
-
-make
-make install-strip DESTDIR=$PKG
-
-# Configure script insists on putting docs in /usr/share/doc, even when told not to.
-# Also, the version number in the doc dir is wrong...
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM-*/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+
+# upstream hardcoded paths, can't override on cmake command line.
+sed -i '/install/s,/bin,/games,' src/CMakeLists.txt
+sed -i '/^set(CMAKE_INSTALL_DOCDIR/d' CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_BINDIR=games \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 gzip $PKG/usr/man/man?/*.?
 
@@ -93,8 +109,7 @@ cp ICONS/$PRGNAM.desktop $PKG/usr/share/applications
 cp ICONS/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps
 cp ICONS/$PRGNAM.bash $PKG/usr/share/bash-completion/completions/$PRGNAM
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/prboom-plus/prboom-plus.info b/games/prboom-plus/prboom-plus.info
index a80ee5990d..277b1866e8 100644
--- a/games/prboom-plus/prboom-plus.info
+++ b/games/prboom-plus/prboom-plus.info
@@ -1,10 +1,10 @@
 PRGNAM="prboom-plus"
-VERSION="2.5.1.7um"
+VERSION="2.6um"
 HOMEPAGE="http://prboom-plus.sourceforge.net"
-DOWNLOAD="https://github.com/coelckers/prboom-plus/archive/v2.5.1.7um/prboom-plus-2.5.1.7um.tar.gz"
-MD5SUM="2c36f7902f837057c7e299adb20e81fb"
+DOWNLOAD="https://github.com/coelckers/prboom-plus/archive/v2.6um/prboom-plus-2.6um.tar.gz"
+MD5SUM="5e294659988c0208fefa292557d8b746"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2 SDL2_net SDL2_image SDL2_mixer"
+REQUIRES="cmake-202x SDL2 SDL2_net SDL2_image SDL2_mixer"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/prboom-plus/slack-desc b/games/prboom-plus/slack-desc
index bd3b0e71f3..196aeff751 100644
--- a/games/prboom-plus/slack-desc
+++ b/games/prboom-plus/slack-desc
@@ -13,7 +13,7 @@ prboom-plus: project.
 prboom-plus:
 prboom-plus: Features uncapped framerate, widescreen aspect ratios, FluidSynth
 prboom-plus: support, variable gamespeed, re-record, walkcam, chasecam, full
-prboom-plus: full mouselook, fov and other features along with full compatibility
-prboom-plus: with the original Doom/Doom2 engines.
+prboom-plus: mouselook, variable fov and other features along with full
+prboom-plus: compatibility with the original Doom/Doom2 engines.
 prboom-plus:
 prboom-plus: http://prboom-plus.sourceforge.net
diff --git a/games/puNES/puNES.SlackBuild b/games/puNES/puNES.SlackBuild
index 0dadc61885..de571c4741 100644
--- a/games/puNES/puNES.SlackBuild
+++ b/games/puNES/puNES.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for puNES
 
-# Copyright 2018-2019 Hunter Sezen California, USA
+# Copyright 2018-2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=puNES
-VERSION=${VERSION:-0.105}
+VERSION=${VERSION:-0.106}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/puNES/puNES.info b/games/puNES/puNES.info
index 1cc2e1dd6d..01f63cf542 100644
--- a/games/puNES/puNES.info
+++ b/games/puNES/puNES.info
@@ -1,8 +1,8 @@
 PRGNAM="puNES"
-VERSION="0.105"
+VERSION="0.106"
 HOMEPAGE="https://github.com/punesemu/puNES"
-DOWNLOAD="https://github.com/punesemu/puNES/archive/v0.105/puNES-0.105.tar.gz"
-MD5SUM="5c75d2071ac69a2f67d6c735b982e632"
+DOWNLOAD="https://github.com/punesemu/puNES/archive/v0.106/puNES-0.106.tar.gz"
+MD5SUM="e85ba4a99e933abee5df72f98bbbc7a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/games/qtads/README b/games/qtads/README
index d96aefa0ce..d04031da8f 100644
--- a/games/qtads/README
+++ b/games/qtads/README
@@ -1,15 +1,12 @@
 qtads (a multimedia interpreter for TADS games)
 
 QTads is a so called "interpreter" for games created with the Text
-Adventure Development System, or "Tads" for short, a C-like object
+Adventure Development System, or "TADS" for short, a C-like object
 oriented programming language for authoring Interactive Fiction
 (similar to the Infocom or Legend Entertainment games, like
 "Zork"). Yes, we are talking about text adventures here.
 
-Both Tads 2 (*.gam) as well as Tads 3 (*.t3) games
-are supported. You can find a selection of games at
-http://www.ifarchive.org/if-archive/games/tads/
+Both TADS 2 (*.gam) and TADS 3 (*.t3) games are supported. You can
+find a selection of games at:
 
-By default, Qt4 is used for the user interface. If you prefer Qt5,
-install libraries/qt5 and run this script with QT5=yes in the
-environment.
+http://www.ifarchive.org/if-archive/games/tads/
diff --git a/games/qtads/qtads.SlackBuild b/games/qtads/qtads.SlackBuild
index 3081bb9e17..f48847df29 100644
--- a/games/qtads/qtads.SlackBuild
+++ b/games/qtads/qtads.SlackBuild
@@ -6,14 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Both qt4 and qt5 are supported by upstream, so this script allows for
-# both. Not sure why anyone really cares (I'm pretty much GUI-insensitive,
-# plus I hate waiting for qt5 to build), but eventually Pat will probably
-# replace qt4 with qt5 in Slackware. When that happens, this script will
-# still be usable.
+# 20201020 bkw: updated for v3.0.0. Sadly the qt4 UI is gone in this
+# release, so qt5 is now a hard dep. SDL2_sound is no longer needed, but
+# it's replaced with fluidsynth.
 
 PRGNAM=qtads
-VERSION=${VERSION:-2.1.7}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -30,19 +28,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
+# No SLKCFLAGS: qmake-qt5 uses the CFLAGS qt5 was built with.
+# No need for LIBDIRSUFFIX either, qtads doesn't use /usr/lib(64).
 
 set -e
 
@@ -50,44 +37,35 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-if [ "${QT5:-no}" = "yes" ]; then
-  [ "$QT5DIR" = "" ] && source /etc/profile.d/qt5.sh
-  # qt5 uses the CFLAGS qt5 was built with.
-  qmake-qt5
-else
-  qmake
-  # qt4 needs CFLAGS forced. easier to do it this way than deal with qmake:
-  sed -i "s,-O2,$SLKCFLAGS," Makefile
-fi
+# In case the user just installed qt5 and hasn't logged out & back in:
+[ "$QT5DIR" = "" ] && source /etc/profile.d/qt5.sh
+
+qmake-qt5 PREFIX=/usr BINDIR=/usr/games DOCDIR=/usr/doc/$PRGNAM-$VERSION
+
+# Hardcoded share/ in man path.
+sed -i 's,/usr/share/man,/usr/man,g' Makefile
 
 # Setting CC/CXX shows the actual compile commands. Using gold speeds
 # up linking enough to be worth the effort.
 make CC=gcc CXX=g++ LINK="g++ -fuse-ld=gold"
-mkdir -p $PKG/usr/games
-
-# No 'make install' target, but things are laid out nicely in the source.
-install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/games/$PRGNAM
-mkdir -p $PKG/usr/share
-mv share/man $PKG/usr
-gzip -9 $PKG/usr/man/man6/$PRGNAM.6
-mv share/* $PKG/usr/share
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HTML_TADS_LICENSE NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# for use in the slack-desc:
-ldd $PRGNAM | grep -q Qt5 && QTVER=5 || QTVER=4
+# INSTALL_ROOT, *not* DESTDIR here!
+make install INSTALL_ROOT=$PKG
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+# 'make install' doesn't install the GPL.
+cp -a LICENSE.TXT $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed "s,@QTVER@,$QTVER," $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/qtads/qtads.info b/games/qtads/qtads.info
index 9cf5ea117c..486be6ef74 100644
--- a/games/qtads/qtads.info
+++ b/games/qtads/qtads.info
@@ -1,10 +1,10 @@
 PRGNAM="qtads"
-VERSION="2.1.7"
+VERSION="3.0.0"
 HOMEPAGE="https://github.com/realnc/qtads"
-DOWNLOAD="https://github.com/realnc/qtads/releases/download/2.1.7/qtads-2.1.7.tar.bz2"
-MD5SUM="32139431f08ce157eb385f1894c18f24"
+DOWNLOAD="https://github.com/realnc/qtads/releases/download/v3.0.0/qtads-3.0.0-source.tar.xz"
+MD5SUM="bbe7ee79d776f7f656b0ca7acd4d815b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL_sound"
+REQUIRES="SDL2 qt5 fluidsynth"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/qtads/slack-desc b/games/qtads/slack-desc
index dffec7d40a..a976f829d9 100644
--- a/games/qtads/slack-desc
+++ b/games/qtads/slack-desc
@@ -14,6 +14,6 @@ qtads: oriented programming language for authoring Interactive Fiction
 qtads: (similar to the Infocom or Legend Entertainment games, like
 qtads: "Zork"). Yes, we are talking about text adventures here.
 qtads:
-qtads: This package built for Qt@QTVER@.
+qtads:
 qtads:
 qtads:
diff --git a/games/qxw/README b/games/qxw/README
index 8f8a6c2c6a..8ff3528602 100644
--- a/games/qxw/README
+++ b/games/qxw/README
@@ -12,3 +12,9 @@ file to your Qxw SlackBuild directory (where this file is).  It will
 automatically be added to the SBo package.
 
 This Slackbuild is suitable for Slackware 14.0 and upwards.
+
+This updated version is a maintenance release.
+
+** Ignore the
+'/bin/sh: dpkg-buildflags: command not found'
+warnings, it will build fine on Slackware**
diff --git a/games/qxw/qxw.SlackBuild b/games/qxw/qxw.SlackBuild
index e0262ac7c3..b1b691abae 100644
--- a/games/qxw/qxw.SlackBuild
+++ b/games/qxw/qxw.SlackBuild
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # Slackware build script for <Qxw>
-# Written by Nick Warne <nick@linicks.net>
+# Written by Nick Warne <warne.nick@gmail.com>
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
 PRGNAM=qxw
-VERSION=${VERSION:-20190909}
+VERSION=${VERSION:-20200708}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 QXWGUIDE=${QXWGUIDE:-qxw-guide}
diff --git a/games/qxw/qxw.info b/games/qxw/qxw.info
index 75f744c2ad..f57469ed27 100644
--- a/games/qxw/qxw.info
+++ b/games/qxw/qxw.info
@@ -1,10 +1,10 @@
 PRGNAM="qxw"
-VERSION="20190909"
+VERSION="20200708"
 HOMEPAGE="https://www.quinapalus.com/qxw.html"
-DOWNLOAD="https://www.quinapalus.com/qxw-20190909.tar.gz"
-MD5SUM="09f2bdec2b168768d9f7053d1e093ae4"
+DOWNLOAD="https://www.quinapalus.com/qxw-20200708.tar.gz"
+MD5SUM="ea0d24690b78e96d750191be4d1345f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Nick Warne"
-EMAIL="nick@linicks.net"
+EMAIL="warne.nick@gmail.com"
diff --git a/games/qzdoom/README b/games/qzdoom/README
index 23eed5a9c2..ae6406d25c 100644
--- a/games/qzdoom/README
+++ b/games/qzdoom/README
@@ -2,6 +2,9 @@ qzdoom (software-rendered engine for Doom and related games)
 
 QZDoom is a continuation of dpJudas's truecolor software rendering,
 for ZDoom, merged with and forked from GZDoom. It supports Doom,
-Doom II, Heretic, Hexen, Strife, and a most other IWAD games.
+Doom II, Heretic, Hexen, Strife, and most other IWAD games.
 
 See README_SBo.txt for optional runtime dependencies.
+
+Starting with qzdoom-2.1.0 BUILD=2, it's now safe to install gzdoom
+and qzdoom on the same Slackware system.
diff --git a/games/qzdoom/doinst.sh b/games/qzdoom/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/qzdoom/doinst.sh
+++ b/games/qzdoom/doinst.sh
@@ -1,3 +1,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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/qzdoom/qzdoom.SlackBuild b/games/qzdoom/qzdoom.SlackBuild
index 9a4cac5913..d33020ff03 100644
--- a/games/qzdoom/qzdoom.SlackBuild
+++ b/games/qzdoom/qzdoom.SlackBuild
@@ -9,9 +9,30 @@
 # Heavily based on gzdoom.SlackBuild, since gzdoom and qzdoom are synced
 # up regularly.
 
+# 20201027 bkw: BUILD=2
+# - Updated download URL.
+# - Install .pk3 files somewhere else, so they don't conflict with gzdoom.
+# - Use upstream icon (also scaled versions in /usr/share/icons).
+# - Make fluidsynth MIDI work again.
+# - Fix <unknown version> in the window title.
+# - Remove extraneous article from README & slack-desc ("a most" => "most").
+
+# Note about "new" releases:
+
+# qzdoom now belongs to a different github user, so the URL is
+# updated... but there's still no new release of it. If you check the
+# repo, you'll see the same releases as gzdoom (e.g. g4.4.2). These
+# are *not* qzdoom, they're gzdoom (try downloading the tarballs from
+# the qzdoom and gzdoom repos with the same version number and diffing
+# them). So only releases (tags) that begin with "q" are really
+# qzdoom, and 2.1.0 is still the latest.
+
+# TL;DR: Please don't email me saying there's a new release unless the
+# version number starts with "q".
+
 PRGNAM=qzdoom
 VERSION=${VERSION:-2.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -43,44 +64,68 @@ fi
 
 set -e
 
+SRCVER=q$VERSION
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-q$VERSION
-tar xvf $CWD/$PRGNAM-q$VERSION.tar.gz
-cd $PRGNAM-q$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
-find -L . \
- \( -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 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold"
+# 20201027 bkw: dirty hack to get fluidsynth 2.x to work. qzdoom's
+# fluidsynth support stopped working when fluidsynth got updated
+# to 2.x.
+sed -i '/libfluidsynth\.so/s,\.1,.2,' \
+       src/sound/mididevices/music_fluidsynth_mididevice.cpp
+
+# 20201027 bkw: fix the '<unknown version>' in the window title.
+( echo "#define GIT_DESCRIPTION \"$VERSION\""
+  echo "#define GIT_HASH \"release\""
+  echo "#define GIT_TIME __DATE__" ) > src/gitinfo.h
+
+# 20201027 bkw: change SHARE_DIR to qzdoom, to avoid stepping on or
+# accidentally loading the *.pk3 stuff from gzdoom. This won't stop
+# qzdoom from finding the IWADs in /usr/share/games/doom since this
+# path is also searched.
 
+SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold"
+SD=/usr/share/games/$PRGNAM
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
+    -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -DSHARE_DIR=\\\"$SD\\\"" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DSHARE_DIR=\\\"$SD\\\"" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DINSTALL_PATH=games \
+    -DINSTALL_DOCS_PATH=doc/$PRGNAM-$VERSION \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DINSTALL_PK3_PATH=$SD \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install/strip DESTDIR=$PKG VERBOSE=1
 cd ..
 
-# no easy way to coerce the docs to go where they should, so:
-mkdir -p $PKG/usr/doc/
-mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
-
-# icon is the same as gzdoom's, .desktop written by SlackBuild author.
-mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+# .desktop written by SlackBuild author.
+mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
+# New-school desktop-ey icons.
+for i in 16 22 32 48 64 128 256; do
+  SIZE=${i}x${i}
+  DIR=$PKG/usr/share/icons/hicolor/$SIZE/apps
+  mkdir -p $DIR
+  convert src/posix/zdoom.xpm -resize $SIZE $DIR/$PRGNAM.png
+done
+
+# Old-school windowmanagerish icon.
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/64x64/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# docs already installed.
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/qzdoom/qzdoom.info b/games/qzdoom/qzdoom.info
index 7b81200484..312b3b00c8 100644
--- a/games/qzdoom/qzdoom.info
+++ b/games/qzdoom/qzdoom.info
@@ -1,7 +1,7 @@
 PRGNAM="qzdoom"
 VERSION="2.1.0"
 HOMEPAGE="https://qzdoom.drdteam.org/"
-DOWNLOAD="https://github.com/raa-eruanna/qzdoom/archive/q2.1.0/qzdoom-q2.1.0.tar.gz"
+DOWNLOAD="https://github.com/madame-rachelle/qzdoom/archive/q2.1.0/qzdoom-q2.1.0.tar.gz"
 MD5SUM="170bb4b75d6b00030224bf250074c659"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/qzdoom/slack-desc b/games/qzdoom/slack-desc
index f78128c5bb..3ac2e45583 100644
--- a/games/qzdoom/slack-desc
+++ b/games/qzdoom/slack-desc
@@ -10,7 +10,7 @@ qzdoom: qzdoom (software-rendered engine for Doom and related games)
 qzdoom:
 qzdoom: QZDoom is a continuation of dpJudas's truecolor software rendering
 qzdoom: for ZDoom, merged with and forked from GZDoom. It supports Doom,
-qzdoom: Doom II, Heretic, Hexen, Strife, and a most other IWAD games.
+qzdoom: Doom II, Heretic, Hexen, Strife, and most other IWAD games.
 qzdoom:
 qzdoom:
 qzdoom:
diff --git a/games/scummvm/scummvm.info b/games/scummvm/scummvm.info
index dbc0117305..bb2af9ad60 100644
--- a/games/scummvm/scummvm.info
+++ b/games/scummvm/scummvm.info
@@ -1,7 +1,7 @@
 PRGNAM="scummvm"
 VERSION="2.1.2"
 HOMEPAGE="https://www.scummvm.org/"
-DOWNLOAD="https://www.scummvm.org/frs/scummvm/2.1.2/scummvm-2.1.2.tar.xz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/scummvm-2.1.2.tar.xz"
 MD5SUM="dd680a1f0f3a6745bf3a8033167ee778"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/solarus/README b/games/solarus/README
index f54102fae4..8e3dd64aef 100644
--- a/games/solarus/README
+++ b/games/solarus/README
@@ -1,8 +1,8 @@
 Solarus is a free and open-source game engine, licensed under GPL v3.
 It is written from scratch in C++ and uses SDL2 (it's not an emulator).
-Development began in 2006. The goal of the engine is to allow people to
-create their own Action-RPG games (also called Zelda-like games). It is
-totally independent from Nintendo.
+Development began in 2006. The goal of the engine is to allow people
+to create their own Action-RPG games (also called Zelda-like games). It
+is totally independent from Nintendo.
 
 Solarus will require game data like zsdx.
 
diff --git a/games/solarus/fullscreen.patch b/games/solarus/fullscreen.patch
new file mode 100644
index 0000000000..efc4d6a4c9
--- /dev/null
+++ b/games/solarus/fullscreen.patch
@@ -0,0 +1,30 @@
+From cf67a03567030893993dc2d75a2a515cada371a4 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 23 Oct 2020 09:50:33 -0700
+Subject: [PATCH] Workaround SDL_WINDOW_FULLSCREEN_DESKTOP issues.
+
+With some window managers the fullscreen for solarus will be
+lost when changing workspaces.
+
+Setting SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0 in the environment
+works around this issue, but its more convenient doing it
+directly in solarus.
+---
+ src/graphics/Video.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/graphics/Video.cpp b/src/graphics/Video.cpp
+index b88cdc884..dd41bf20c 100644
+--- a/src/graphics/Video.cpp
++++ b/src/graphics/Video.cpp
+@@ -674,6 +674,7 @@ void set_default_video_mode() {
+   Debug::check_assertion(context.default_video_mode != nullptr,
+                          "Default video mode was not initialized");
+ 
++  SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");
+   set_fullscreen(false);
+   set_video_mode(*context.default_video_mode);
+ }
+-- 
+GitLab
+
diff --git a/games/solarus/solarus.SlackBuild b/games/solarus/solarus.SlackBuild
index 4a6847bc47..a46b54ddf3 100644
--- a/games/solarus/solarus.SlackBuild
+++ b/games/solarus/solarus.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=solarus
 VERSION=${VERSION:-1.6.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,16 +69,20 @@ 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 {} \;
 
-# cmake: Fix compatiblity with cmake-3.5.2.
-# https://gitlab.com/solarus-games/solarus/-/merge_requests/1353
-patch -p1 < $CWD/cmake.patch
-
 if pkg-config --exists Qt5Core; then
   GUI=ON
 else
   GUI=OFF
 fi
 
+# cmake: Fix compatiblity with cmake-3.5.2.
+# https://gitlab.com/solarus-games/solarus/-/merge_requests/1353
+patch -p1 < $CWD/cmake.patch
+
+# Workaround SDL_WINDOW_FULLSCREEN_DESKTOP issues.
+# https://gitlab.com/solarus-games/solarus/-/merge_requests/1355
+patch -p1 -i $CWD/fullscreen.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -90,6 +94,7 @@ cd build
     -DSOLARUS_LIBRARY_INSTALL_DESTINATION:PATH=lib${LIBDIRSUFFIX} \
     -DSOLARUS_DEFAULT_QUEST=/usr/share/games/$PRGNAM/zsdx \
     -DSOLARUS_GUI=$GUI \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/games/srb2/README b/games/srb2/README
index 61de91f456..73f6f2db87 100644
--- a/games/srb2/README
+++ b/games/srb2/README
@@ -12,3 +12,7 @@ installed. I'm not 100% sure what libgme does for srb2: it's a "game
 music emulation" library, but the game music doesn't sound different to
 me when srb2 is built with libgme, and I don't see any config settings
 to enable it. I haven't played the entire game yet though...
+
+Note for users upgrading from version 2.1.x to 2.2.x: I had to
+delete my old config (rm -rf ~/.srb2) to get the game to run without
+segfaulting.
diff --git a/games/srb2/srb2.SlackBuild b/games/srb2/srb2.SlackBuild
index 26fb5abb25..356c8bfb5c 100644
--- a/games/srb2/srb2.SlackBuild
+++ b/games/srb2/srb2.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=srb2
-VERSION=${VERSION:-2.1.21}
+VERSION=${VERSION:-2.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,23 +61,24 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Assets (actually WAD files) aren't found in the source, have to download
-# them separately. The build actually checks for them & refuses to compile
-# if they're missing, which is kinda unfair since it doesn't ship with
-# the damn things... To save 208MB of space in $TMP, we symlink the files.
-# Can't just touch them, since the md5sums of the files get hardcoded
-# into the binary (and it'll refuse to run if they don't match).
-DATAFILES="srb2.srb zones.dta player.dta rings.dta music.dta patch.dta"
-for i in $DATAFILES; do
-  ln -s $CWD/$i assets/$i
-done
+# Assets (actually WAD and pk3 aka zip files) aren't found in the
+# source, have to download them separately. The build actually checks
+# for them & refuses to compile if they're missing, which is kinda
+# unfair since it doesn't ship with the damn things... so we have to
+# extract them from the 'full' zip file. Can't just touch them, since
+# the md5sums of the files get hardcoded into the binary (and it'll
+# refuse to run if they don't match).
+( cd assets
+  mkdir installer
+  cd installer
+  unzip $CWD/SRB2-v$VERSION-Full.zip '*.dta' '*.pk3'
+)
 
 # As shipped, the path /usr/games/SRB2 is hardcoded in various places
 # in the source (no cmake variable to change it). It should be in
 # /usr/share/games, not /usr/games, so sed-fest:
 sed -i 's,usr/games,usr/share/games,g' \
-       src/sdl/i_system.c   src/sdl/i_ttf.c \
-       src/sdl12/i_system.c src/sdl12/i_ttf.c
+       src/sdl/i_system.c src/sdl/i_ttf.c
 
 mkdir -p build
 cd build
@@ -96,21 +97,24 @@ cd ..
 mkdir -p $PKG/usr/games $PKG/usr/share/games/SRB2 \
          $PKG/usr/share/pixmaps $PKG/usr/share/applications \
          $PKG/usr/doc/$PRGNAM-$VERSION
-install -s -m0755 build/bin/$PRGNAM-$VERSION $PKG/usr/games
-ln -s $PRGNAM-$VERSION $PKG/usr/games/$PRGNAM
+# as of 2.2.8 the binary's name changed.
+install -s -m0755 build/bin/lsdl$PRGNAM-$VERSION $PKG/usr/games
+ln -s lsdl$PRGNAM-$VERSION $PKG/usr/games/lsdl$PRGNAM
+ln -s lsdl$PRGNAM-$VERSION $PKG/usr/games/$PRGNAM
 install -m0644 assets/LICENSE* assets/README* $PKG/usr/doc/$PRGNAM-$VERSION
 install -m0644 $PRGNAM.png $PKG/usr/share/pixmaps
 
-# Install data files from $CWD, not the symlinks in assets/
 echo -n "Copying data files: "
-for i in $DATAFILES; do
-  echo -n "$i "
-  cat $CWD/$i > $PKG/usr/share/games/SRB2/$i
-done
+( cd assets/installer
+  for i in *; do
+    echo -n "$i "
+    cat $i > $PKG/usr/share/games/SRB2/$i
+  done
+)
 echo
 
-# desktop file is a modified version of debian/srb2.desktop. I took out
-# the absolute paths.
+# desktop file is a modified version of debian/srb2.desktop. I fixed
+# the absolute paths and got it to validate.
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 # dev and modding docs in doc/, config files for cwiid and various doom
diff --git a/games/srb2/srb2.desktop b/games/srb2/srb2.desktop
index 240596a7df..7675458e95 100644
--- a/games/srb2/srb2.desktop
+++ b/games/srb2/srb2.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Sonic Robo Blast 2
 Comment=A free 3D Sonic the Hedgehog fangame closely inspired by the original Sonic games on the Sega Genesis.
-Exec=srb2
-Icon=srb2
+Exec=/usr/games/srb2
+Icon=/usr/share/pixmaps/srb2.png
 Terminal=false
 Type=Application
 StartupNotify=false
diff --git a/games/srb2/srb2.info b/games/srb2/srb2.info
index bffae6cbe0..08c0c3587a 100644
--- a/games/srb2/srb2.info
+++ b/games/srb2/srb2.info
@@ -1,20 +1,10 @@
 PRGNAM="srb2"
-VERSION="2.1.21"
+VERSION="2.2.8"
 HOMEPAGE="https://www.srb2.org/"
-DOWNLOAD="https://github.com/STJr/SRB2/archive/SRB2_release_2.1.21/SRB2-SRB2_release_2.1.21.tar.gz \
-          http://alam.srb2.org/SRB2/2.1.21-Final/Resources/music.dta \
-          http://alam.srb2.org/SRB2/2.1.21-Final/Resources/patch.dta \
-          http://alam.srb2.org/SRB2/2.1.21-Final/Resources/player.dta \
-          http://alam.srb2.org/SRB2/2.1.21-Final/Resources/rings.dta \
-          http://alam.srb2.org/SRB2/2.1.21-Final/Resources/srb2.srb \
-          http://alam.srb2.org/SRB2/2.1.21-Final/Resources/zones.dta"
-MD5SUM="69c97da9638e3daedec5a8c7be76b5ab \
-        2a4b6ae74a84e990d6e6c81ad0c1309f \
-        dbbf8bc6121618ee3be2d5b14650429b \
-        cfca0f1c73023cbbd8f844f45480f799 \
-        85901ad4bf94637e5753d2ac2c03ea26 \
-        c1b9577687f8a795104aef4600720ea7 \
-        303838c6c534d9540288360fa49cca60"
+DOWNLOAD="https://github.com/STJr/SRB2/archive/SRB2_release_2.2.8/SRB2-SRB2_release_2.2.8.tar.gz \
+          https://github.com/STJr/SRB2/releases/download/SRB2_release_2.2.8/SRB2-v2.2.8-Full.zip"
+MD5SUM="24485b3fac77cc2de5ff164f29da81f1 \
+        46df8c6d29c1bca8c82af434e8f64313"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_mixer"
diff --git a/games/starfighter/starfighter.SlackBuild b/games/starfighter/starfighter.SlackBuild
index 3803209f9c..7bb9b55a3a 100644
--- a/games/starfighter/starfighter.SlackBuild
+++ b/games/starfighter/starfighter.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for starfighter
 
-# Copyright 2016-2020 Tim Dickson, Scotland   dickson.tim at googlemail.com
+# Copyright 2016-2021 Tim Dickson, Scotland   dickson.tim at googlemail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 
 PRGNAM=starfighter
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/starfighter/starfighter.info b/games/starfighter/starfighter.info
index 1604cc215a..d66a8c86bd 100644
--- a/games/starfighter/starfighter.info
+++ b/games/starfighter/starfighter.info
@@ -1,8 +1,8 @@
 PRGNAM="starfighter"
-VERSION="2.3.3"
+VERSION="2.4"
 HOMEPAGE="https://github.com/pr-starfighter/starfighter/"
-DOWNLOAD="https://github.com/pr-starfighter/starfighter/releases/download/v2.3.3/starfighter-2.3.3-src.tar.gz"
-MD5SUM="ec37d907a939a429acd5f000448e8e32"
+DOWNLOAD="https://github.com/pr-starfighter/starfighter/releases/download/v2.4/starfighter-2.4-src.tar.gz"
+MD5SUM="ab7d7c3d122225c19e5647792ba374bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_image SDL2_mixer SDL2_ttf"
diff --git a/games/steam/steam.SlackBuild b/games/steam/steam.SlackBuild
index ef0dcbe2b1..3de919e31b 100644
--- a/games/steam/steam.SlackBuild
+++ b/games/steam/steam.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2016 Talos Thoren
 # All rights reserved.
-# Copyright 2019,20 Christoph Willing, Brisbane, Australia
+# Copyright 2019-21 Christoph Willing, Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=steam
-VERSION=${VERSION:-1.0.0.66}
+VERSION=${VERSION:-1.0.0.69}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/steam/steam.info b/games/steam/steam.info
index 109df93bd8..e61d6d06ad 100644
--- a/games/steam/steam.info
+++ b/games/steam/steam.info
@@ -1,8 +1,8 @@
 PRGNAM="steam"
-VERSION="1.0.0.66"
-HOMEPAGE="http://store.steampowered.com/"
-DOWNLOAD="http://repo.steampowered.com/steam/archive/precise/steam_1.0.0.66.tar.gz"
-MD5SUM="f587a070e94f69a4d962ebe2ebf4768a"
+VERSION="1.0.0.69"
+HOMEPAGE="https://store.steampowered.com/"
+DOWNLOAD="https://repo.steampowered.com/steam/archive/precise/steam_1.0.0.69.tar.gz"
+MD5SUM="9099e348686ac5d50f6a8823e40c421d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL python3 zenity"
diff --git a/games/stella/README b/games/stella/README
index ca5936c93b..a9d24f71a8 100644
--- a/games/stella/README
+++ b/games/stella/README
@@ -1,2 +1,6 @@
 Stella is a multi-platform Atari 2600 VCS emulator released under the
 GNU General Public License (GPL).
+
+Version note: 6.4 is the last version that can be compiled on Slackware
+14.2. Do not ask for an upgrade to 6.5 or later until after Slackware
+15.0 is released.
diff --git a/games/stella/stella.SlackBuild b/games/stella/stella.SlackBuild
index 13480555d7..503512ab5d 100644
--- a/games/stella/stella.SlackBuild
+++ b/games/stella/stella.SlackBuild
@@ -8,6 +8,11 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20210224 bkw: Note to self: do not attempt to upgrade past 6.4, on
+# Slackware 14.2. Our g++ *and* clang++ are now too old.
+
+# 20201103 bkw: update for 6.4.
+# 20201027 bkw: update for 6.3.
 # 20200804 bkw: update for 6.2.1.
 # 20200327 bkw:
 # - update for 6.1.
@@ -46,7 +51,7 @@
 # - StartupNotify=false in .desktop
 
 PRGNAM=stella
-VERSION=${VERSION:-6.2.1}
+VERSION=${VERSION:-6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/stella/stella.info b/games/stella/stella.info
index 58ae6c20e1..f28829c3e8 100644
--- a/games/stella/stella.info
+++ b/games/stella/stella.info
@@ -1,8 +1,8 @@
 PRGNAM="stella"
-VERSION="6.2.1"
+VERSION="6.4"
 HOMEPAGE="https://stella-emu.github.io/"
-DOWNLOAD="https://github.com/stella-emu/stella/releases/download/6.2.1/stella-6.2.1-src.tar.xz"
-MD5SUM="fdc7f812cc7f5c63db54bf3f71365c02"
+DOWNLOAD="https://github.com/stella-emu/stella/releases/download/6.4/stella-6.4-src.tar.xz"
+MD5SUM="a6509ba4c1c45e0d1d9b017ff3c4e545"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
diff --git a/games/stone_soup/README b/games/stone_soup/README
index 5357759a51..7ccc57b260 100644
--- a/games/stone_soup/README
+++ b/games/stone_soup/README
@@ -1,4 +1,4 @@
-Dungeon Crawl Stone Soup is a game of dungeon exploration, combat and magic,
-involving characters of diverse skills, worshipping deities of great power and
-caprice. To win, you'll need to be a master of tactics and strategy, and
-prevail against overwhelming odds.
+Dungeon Crawl Stone Soup is a game of dungeon exploration, combat and
+magic, involving characters of diverse skills, worshipping deities of
+great power and caprice. To win, you'll need to be a master of tactics
+and strategy, and prevail against overwhelming odds.
diff --git a/games/stone_soup/stone_soup.SlackBuild b/games/stone_soup/stone_soup.SlackBuild
index cdec0b4e3b..c37a855380 100644
--- a/games/stone_soup/stone_soup.SlackBuild
+++ b/games/stone_soup/stone_soup.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Dungeon Crawl Stone Soup
 
-# Copyright 2020, SlackBuilds.org Project, David Melik, Spokane, WA, USA
+# Copyright 2021, SlackBuilds.org Project, David Melik, Spokane, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=stone_soup
-VERSION=${VERSION:-0.25.0}
+VERSION=${VERSION:-0.26.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -106,10 +106,12 @@ cp $CWD/stone_soup_icon-32x32.png $PKG/usr/share/pixmaps
 cp $CWD/stone_soup.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CREDITS.txt INSTALL.md LICENSE $PKG/usr/share/games/crawl/docs/* \
+cp -a LICENSE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+ln -sf /usr/share/games/crawl/docs $PKG/usr/doc/$PRGNAM-$VERSION/docs
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/games/stone_soup/stone_soup.info b/games/stone_soup/stone_soup.info
index b5b53e7b12..acc0ab6a14 100644
--- a/games/stone_soup/stone_soup.info
+++ b/games/stone_soup/stone_soup.info
@@ -1,10 +1,10 @@
 PRGNAM="stone_soup"
-VERSION="0.25.0"
+VERSION="0.26.0"
 HOMEPAGE="http://crawl.develz.org/"
-DOWNLOAD="http://crawl.develz.org/release/0.25/stone_soup-0.25.0-nodeps.tar.xz"
-MD5SUM="7239d444005dc18137235d31546350ef"
+DOWNLOAD="https://github.com/crawl/crawl/releases/download/0.26.0/stone_soup-0.26.0-nodeps.tar.xz"
+MD5SUM="7d1db2ddad8dc5e7b1ceaa90ead3e48b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua PyYAML SDL2_image"
+REQUIRES="lua python3-PyYAML SDL2_image"
 MAINTAINER="David Melik"
 EMAIL="dchmelik@gmail.com"
diff --git a/games/sumeria/README b/games/sumeria/README
new file mode 100644
index 0000000000..a0aaf75900
--- /dev/null
+++ b/games/sumeria/README
@@ -0,0 +1,6 @@
+sumeria (hamurabi-like game)
+
+This is the good old "Govern Ancient Sumeria", also known as
+"Hamurabe", with a 1983 ecology re-write. (The more grain you leave
+in stores, the more rats eat and hence breed; the more rats there are
+the more likely is the plague to strike -- etc...).
diff --git a/games/sumeria/slack-desc b/games/sumeria/slack-desc
new file mode 100644
index 0000000000..c1845da55c
--- /dev/null
+++ b/games/sumeria/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+sumeria: sumeria (hamurabi-like game)
+sumeria:
+sumeria: This is the good old "Govern Ancient Sumeria", also known as
+sumeria: "Hamurabe", with a 1983 ecology re-write. (The more grain you leave
+sumeria: in stores, the more rats eat and hence breed; the more rats there are
+sumeria: the more likely is the plague to strike -- etc...).
+sumeria:
+sumeria:
+sumeria:
+sumeria:
+sumeria:
diff --git a/games/sumeria/sumeria.SlackBuild b/games/sumeria/sumeria.SlackBuild
new file mode 100644
index 0000000000..9a86e1bc5d
--- /dev/null
+++ b/games/sumeria/sumeria.SlackBuild
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Slackware build script for sumeria
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# VERSION came from the server timestamp of the source file.
+
+PRGNAM=sumeria
+VERSION=${VERSION:-20020219}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr/games $OUTPUT
+cd $PKG/usr/games
+gcc -include stdlib.h -Wl,-s -o $PRGNAM $CWD/$PRGNAM.c -lm
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/sumeria/sumeria.info b/games/sumeria/sumeria.info
new file mode 100644
index 0000000000..dc9c8f380e
--- /dev/null
+++ b/games/sumeria/sumeria.info
@@ -0,0 +1,10 @@
+PRGNAM="sumeria"
+VERSION="20020219"
+HOMEPAGE="https://www.mipmip.org/C_games/"
+DOWNLOAD="https://www.mipmip.org/C_games/sumeria.c"
+MD5SUM="7ff853d65672e9b4420c5db6962abee3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/tome-sx/tome-sx.SlackBuild b/games/tome-sx/tome-sx.SlackBuild
index c12eed96ff..e40eb39ef1 100644
--- a/games/tome-sx/tome-sx.SlackBuild
+++ b/games/tome-sx/tome-sx.SlackBuild
@@ -23,11 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tome-sx
-VERSION=${VERSION:-c1fe5a0ad25317a4bdf27ddba1522fd896389873}
+VERSION=${VERSION:-20160915_c1fe5a0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCPRGNAM=ToME-SX
+GITVER="$( echo $VERSION | cut -d_ -f2 )"
+
+SRCNAM=ToME-SX
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,9 +63,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCPRGNAM-$VERSION
-tar xvf $CWD/$SRCPRGNAM-$VERSION.tar.gz
-cd $SRCPRGNAM-$VERSION
+rm -rf $SRCNAM-$GITVER*
+tar xvf $CWD/$SRCNAM-$GITVER*.tar.gz
+cd $SRCNAM-$GITVER*
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/games/tome-sx/tome-sx.info b/games/tome-sx/tome-sx.info
index ca5a8d8c71..a4a0526f72 100644
--- a/games/tome-sx/tome-sx.info
+++ b/games/tome-sx/tome-sx.info
@@ -1,5 +1,5 @@
 PRGNAM="tome-sx"
-VERSION="c1fe5a0ad25317a4bdf27ddba1522fd896389873"
+VERSION="20160915_c1fe5a0"
 HOMEPAGE="https://github.com/AmyBSOD/ToME-SX"
 DOWNLOAD="https://github.com/AmyBSOD/ToME-SX/archive/c1fe5a0ad25317a4bdf27ddba1522fd896389873/ToME-SX-c1fe5a0ad25317a4bdf27ddba1522fd896389873.tar.gz"
 MD5SUM="79101bc283ed4f4af733800f824d3f4f"
diff --git a/games/trackballs/README b/games/trackballs/README
index 497414136d..9c19f1b577 100644
--- a/games/trackballs/README
+++ b/games/trackballs/README
@@ -1,23 +1,17 @@
-Trackballs is a marble game inspired by the 80s Atari classic Marble
-Madness.
+trackballs (3d marble game)
+
+Trackballs is a game inspired by the 80s Atari classic Marble Madness.
 
 By steering a marble ball through a labyrinth filled with sharp objects,
 pools of acid, and other obstacles, the player collects points. When
 the destination is reached you continue on to the next, more difficult
 level... unless the time runs out.
 
-This Slackware package can include the music and/or extra levels available
-at the trackballs home page: http://trackballs.sourceforge.net
-
-To add the music, download the file "trackballs-music-1.4.tar.bz2"
-and save it in the same directory as the SlackBuild script. If using
-a newer version of the music than 1.4, set MUSICVER in the environment
-before running trackballs.SlackBuild.
+The music and extra levels from older versions of trackballs are
+now included in the package, so you don't have to download them
+separately.
 
-To add extra levels, download the level collections you want and place
-them in the levels/ subdirectory before running trackballs.SlackBuild. The
-script can handle levels in tar or zip format. Note that some of the
-add-on levels offered on the web site are now included with the game
-source (specificallly, "Box O' Fun", "Child of Tales", and "Castles"
-are part of the main game now, and don't need to be added). Also note
-that the "Six Levels" pack doesn't work with this version of the game.
+Note: I didn't update this for many years, because newer releases
+require newer video hardware (with OpenGL 3.3 support). If you're
+unable to run the game because of old hardware, let me know (email
+address in the .info file).
diff --git a/games/trackballs/patches/abs.diff b/games/trackballs/patches/abs.diff
deleted file mode 100644
index 597971906d..0000000000
--- a/games/trackballs/patches/abs.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur trackballs-1.1.4/src/glHelp.cc trackballs-1.1.4.patched/src/glHelp.cc
---- trackballs-1.1.4/src/glHelp.cc	2007-04-07 09:15:09.000000000 -0400
-+++ trackballs-1.1.4.patched/src/glHelp.cc	2017-06-21 11:58:32.035646783 -0400
-@@ -129,7 +129,6 @@
-   // why is this removed? should it not be done???
-   glDeleteTextures(1,&texture);  
- }
--inline Real abs(Real v) {return v>0.0?v:-v;}
- double mousePointerPhase=0.0;
- 
- void tickMouse(Real td) {
-diff -Naur trackballs-1.1.4/src/menuMode.cc trackballs-1.1.4.patched/src/menuMode.cc
---- trackballs-1.1.4/src/menuMode.cc	2007-04-07 09:16:26.000000000 -0400
-+++ trackballs-1.1.4.patched/src/menuMode.cc	2017-06-21 11:58:36.201646790 -0400
-@@ -163,7 +163,6 @@
-   case MENU_EDITOR: GameMode::activate(EditMode::editMode); break;
-   }
- }
--inline Real abs(Real v) {return v>0.0?v:-v;}
- 
- void MenuMode::idle(Real td) {
-   int w,h,i,x,y;
diff --git a/games/trackballs/patches/trackballs-1.1.4-guile20.patch b/games/trackballs/patches/trackballs-1.1.4-guile20.patch
deleted file mode 100644
index 79a9174ce0..0000000000
--- a/games/trackballs/patches/trackballs-1.1.4-guile20.patch
+++ /dev/null
@@ -1,310 +0,0 @@
---- trackballs-1.1.4/src/game.cc	2007-05-25 12:24:42.000000000 +0200
-+++ trackballs-1.1.4.new/src/game.cc	2011-05-18 12:51:33.350253294 +0200
-@@ -65,7 +65,7 @@
-   /* Load the bootup script */
-   char scmname[256];
-   snprintf(scmname,sizeof(scmname),"%s/levels/boot.scm",SHARE_DIR);
--  gh_eval_file(scmname);
-+  scm_c_primitive_load(scmname);
- 
-   player1 = new Player(gamer);
-   loadLevel(name);
-@@ -110,7 +110,7 @@
- 
-   if(map) delete map;
-   map = new Map(mapname);
--  gh_eval_file(scmname);
-+  scm_c_primitive_load(scmname);
- 
-   if(player1)
-     player1->timeLeft = startTime;
---- trackballs-1.1.4/src/guile.cc.x	2007-05-25 16:40:36.000000000 +0200
-+++ trackballs-1.1.4.new/src/guile.cc.x	2011-05-18 12:55:59.574253365 +0200
-@@ -1,88 +1,88 @@
- /* cpp arguments: guile.cc -DLOCALEDIR="/usr/local/share/locale" -DHAVE_CONFIG_H -I. -I.. -DSHARE_DIR="/usr/local/share/trackballs" -DPACKAGE="trackballs" -DVERSION="1.1.4" -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I./ -I../ */
-- scm_c_define_gsubr (s_player, 0, 0, 0, (SCM (*)()) player); ;
-- scm_c_define_gsubr (s_new_mr_black, 2, 0, 0, (SCM (*)()) new_mr_black); ;
-- scm_c_define_gsubr (s_new_baby, 2, 0, 0, (SCM (*)()) new_baby); ;
-- scm_c_define_gsubr (s_add_teleport, 5, 0, 0, (SCM (*)()) add_teleport); ;
-- scm_c_define_gsubr (s_add_bird, 6, 0, 0, (SCM (*)()) add_bird); ;
-- scm_c_define_gsubr (s_add_flag, 5, 0, 0, (SCM (*)()) add_flag); ;
-- scm_c_define_gsubr (s_add_colormodifier, 7, 0, 0, (SCM (*)()) add_colormodifier); ;
-- scm_c_define_gsubr (s_add_heightmodifier, 7, 3, 0, (SCM (*)()) add_heightmodifier); ;
-- scm_c_define_gsubr (s_add_cactus, 3, 0, 0, (SCM (*)()) add_cactus); ;
-- scm_c_define_gsubr (s_add_spike, 4, 0, 0, (SCM (*)()) add_spike); ;
-- scm_c_define_gsubr (s_add_sidespike, 5, 0, 0, (SCM (*)()) add_sidespike); ;
-- scm_c_define_gsubr (s_add_goal, 4, 0, 0, (SCM (*)()) add_goal); ;
-- scm_c_define_gsubr (s_sign, 6, 1, 0, (SCM (*)()) sign); ;
-- scm_c_define_gsubr (s_add_modpill, 5, 0, 0, (SCM (*)()) add_modpill); ;
-- scm_c_define_gsubr (s_forcefield, 8, 0, 0, (SCM (*)()) forcefield); ;
-- scm_c_define_gsubr (s_fun_switch, 4, 0, 0, (SCM (*)()) fun_switch); ;
-- scm_c_define_gsubr (s_new_pipe, 7, 0, 0, (SCM (*)()) new_pipe); ;
-- scm_c_define_gsubr (s_pipe_connector, 4, 0, 0, (SCM (*)()) pipe_connector); ;
-- scm_c_define_gsubr (s_diamond, 2, 1, 0, (SCM (*)()) diamond); ;
-- scm_c_define_gsubr (s_fountain, 6, 0, 0, (SCM (*)()) fountain); ;
-- scm_c_define_gsubr (s_set_position, 3, 1, 0, (SCM (*)()) set_position); ;
-- scm_c_define_gsubr (s_get_position_x, 1, 0, 0, (SCM (*)()) get_position_x); ;
-- scm_c_define_gsubr (s_get_position_y, 1, 0, 0, (SCM (*)()) get_position_y); ;
-- scm_c_define_gsubr (s_get_position_z, 1, 0, 0, (SCM (*)()) get_position_z); ;
-- scm_c_define_gsubr (s_set_modtime, 3, 0, 0, (SCM (*)()) set_modtime); ;
-- scm_c_define_gsubr (s_set_acceleration, 2, 0, 0, (SCM (*)()) set_acceleration); ;
-- scm_c_define_gsubr (s_set_horizon, 2, 0, 0, (SCM (*)()) set_horizon); ;
-- scm_c_define_gsubr (s_set_primary_color, 4, 1, 0, (SCM (*)()) set_primary_color); ;
-- scm_c_define_gsubr (s_set_secondary_color, 4, 1, 0, (SCM (*)()) set_secondary_color); ;
-- scm_c_define_gsubr (s_set_specular_color, 4, 1, 0, (SCM (*)()) set_specular_color); ;
-- scm_c_define_gsubr (s_set_flag, 3, 0, 0, (SCM (*)()) set_flag); ;
-- scm_c_define_gsubr (s_set_wind, 3, 0, 0, (SCM (*)()) set_wind); ;
-- scm_c_define_gsubr (s_set_speed, 2, 0, 0, (SCM (*)()) set_speed); ;
-- scm_c_define_gsubr (s_set_texture, 2, 0, 0, (SCM (*)()) set_texture); ;
-- scm_c_define_gsubr (s_set_fountain_strength, 2, 0, 0, (SCM (*)()) set_fountain_strength); ;
-- scm_c_define_gsubr (s_set_fountain_velocity, 4, 0, 0, (SCM (*)()) set_fountain_velocity); ;
-- scm_c_define_gsubr (s_score_on_death, 2, 0, 0, (SCM (*)()) score_on_death); ;
-- scm_c_define_gsubr (s_time_on_death, 2, 0, 0, (SCM (*)()) time_on_death); ;
-- scm_c_define_gsubr (s_default_on_death, 3, 0, 0, (SCM (*)()) default_on_death); ;
-- scm_c_define_gsubr (s_add_cyclic_platform, 8, 0, 0, (SCM (*)()) add_cyclic_platform); ;
-- scm_c_define_gsubr (s_animator, 7, 0, 0, (SCM (*)()) animator); ;
-- scm_c_define_gsubr (s_set_onoff, 2, 0, 0, (SCM (*)()) set_onoff); ;
-- scm_c_define_gsubr (s_animator_value, 1, 0, 0, (SCM (*)()) animator_value); ;
-- scm_c_define_gsubr (s_set_animator_direction, 2, 0, 0, (SCM (*)()) set_animator_direction); ;
-- scm_c_define_gsubr (s_set_animator_position, 2, 0, 0, (SCM (*)()) set_animator_position); ;
-- scm_c_define_gsubr (s_day, 0, 0, 0, (SCM (*)()) day); ;
-- scm_c_define_gsubr (s_night, 0, 0, 0, (SCM (*)()) night); ;
-- scm_c_define_gsubr (s_fog, 0, 1, 0, (SCM (*)()) fog); ;
-- scm_c_define_gsubr (s_thick_fog, 0, 0, 0, (SCM (*)()) thick_fog); ;
-- scm_c_define_gsubr (s_fog_color, 3, 0, 0, (SCM (*)()) fog_color); ;
-- scm_c_define_gsubr (s_set_bonus_level, 1, 0, 0, (SCM (*)()) set_bonus_level); ;
-- scm_c_define_gsubr (s_set_track_name, 1, 0, 0, (SCM (*)()) set_track_name); ;
-- scm_c_define_gsubr (s_set_author, 1, 0, 0, (SCM (*)()) set_author); ;
-- scm_c_define_gsubr (s_start_time, 1, 0, 0, (SCM (*)()) start_time); ;
-- scm_c_define_gsubr (s_set_time, 1, 0, 0, (SCM (*)()) set_time); ;
-- scm_c_define_gsubr (s_get_time, 0, 0, 0, (SCM (*)()) get_time); ;
-- scm_c_define_gsubr (s_add_time, 1, 0, 0, (SCM (*)()) add_time); ;
-- scm_c_define_gsubr (s_set_score, 1, 0, 0, (SCM (*)()) set_score); ;
-- scm_c_define_gsubr (s_get_score, 0, 0, 0, (SCM (*)()) get_score); ;
-- scm_c_define_gsubr (s_add_score, 1, 0, 0, (SCM (*)()) add_score); ;
-- scm_c_define_gsubr (s_set_start_position, 2, 0, 0, (SCM (*)()) set_start_position); ;
-- scm_c_define_gsubr (s_snow, 1, 0, 0, (SCM (*)()) snow); ;
-- scm_c_define_gsubr (s_rain, 1, 0, 0, (SCM (*)()) rain); ;
-- scm_c_define_gsubr (s_difficulty, 0, 0, 0, (SCM (*)()) difficulty); ;
-- scm_c_define_gsubr (s_use_grid, 1, 0, 0, (SCM (*)()) use_grid); ;
-- scm_c_define_gsubr (s_map_is_transparent, 1, 0, 0, (SCM (*)()) map_is_transparent); ;
-- scm_c_define_gsubr (s_jump, 1, 0, 0, (SCM (*)()) jump); ;
-- scm_c_define_gsubr (s_scale_oxygen, 1, 0, 0, (SCM (*)()) scale_oxygen); ;
-- scm_c_define_gsubr (s_set_cell_flag, 6, 0, 0, (SCM (*)()) set_cell_flag); ;
-- scm_c_define_gsubr (s_set_cell_velocity, 6, 0, 0, (SCM (*)()) set_cell_velocity); ;
-- scm_c_define_gsubr (s_set_cell_heights, 8, 1, 0, (SCM (*)()) set_cell_heights); ;
-- scm_c_define_gsubr (s_set_cell_water_heights, 8, 1, 0, (SCM (*)()) set_cell_water_heights); ;
-- scm_c_define_gsubr (s_set_cell_colors, 8, 1, 0, (SCM (*)()) set_cell_colors); ;
-- scm_c_define_gsubr (s_set_cell_wall_colors, 8, 1, 0, (SCM (*)()) set_cell_wall_colors); ;
-- scm_c_define_gsubr (s_play_effect, 1, 0, 0, (SCM (*)()) play_effect); ;
-- scm_c_define_gsubr (s_camera_angle, 2, 0, 0, (SCM (*)()) camera_angle); ;
-- scm_c_define_gsubr (s_restart_time, 1, 0, 0, (SCM (*)()) restart_time); ;
-- scm_c_define_gsubr (s_clear_song_preferences, 0, 0, 0, (SCM (*)()) clear_song_preferences); ;
-- scm_c_define_gsubr (s_force_next_song, 0, 0, 0, (SCM (*)()) force_next_song); ;
-- scm_c_define_gsubr (s_set_song_preference, 2, 0, 0, (SCM (*)()) set_song_preference); ;
-- scm_c_define_gsubr (s_trigger, 4, 0, 0, (SCM (*)()) trigger); ;
-- scm_c_define_gsubr (s_smart_trigger, 5, 0, 0, (SCM (*)()) smart_trigger); ;
-- scm_c_define_gsubr (s_on_event, 3, 0, 0, (SCM (*)()) on_event); ;
-- scm_c_define_gsubr (s_get_event_callback, 2, 0, 0, (SCM (*)()) get_event_callback); ;
-+ scm_c_define_gsubr (s_player, 0, 0, 0, (void *) player); ;
-+ scm_c_define_gsubr (s_new_mr_black, 2, 0, 0, (void *) new_mr_black); ;
-+ scm_c_define_gsubr (s_new_baby, 2, 0, 0, (void *) new_baby); ;
-+ scm_c_define_gsubr (s_add_teleport, 5, 0, 0, (void *) add_teleport); ;
-+ scm_c_define_gsubr (s_add_bird, 6, 0, 0, (void *) add_bird); ;
-+ scm_c_define_gsubr (s_add_flag, 5, 0, 0, (void *) add_flag); ;
-+ scm_c_define_gsubr (s_add_colormodifier, 7, 0, 0, (void *) add_colormodifier); ;
-+ scm_c_define_gsubr (s_add_heightmodifier, 7, 3, 0, (void *) add_heightmodifier); ;
-+ scm_c_define_gsubr (s_add_cactus, 3, 0, 0, (void *) add_cactus); ;
-+ scm_c_define_gsubr (s_add_spike, 4, 0, 0, (void *) add_spike); ;
-+ scm_c_define_gsubr (s_add_sidespike, 5, 0, 0, (void *) add_sidespike); ;
-+ scm_c_define_gsubr (s_add_goal, 4, 0, 0, (void *) add_goal); ;
-+ scm_c_define_gsubr (s_sign, 6, 1, 0, (void *) sign); ;
-+ scm_c_define_gsubr (s_add_modpill, 5, 0, 0, (void *) add_modpill); ;
-+ scm_c_define_gsubr (s_forcefield, 8, 0, 0, (void *) forcefield); ;
-+ scm_c_define_gsubr (s_fun_switch, 4, 0, 0, (void *) fun_switch); ;
-+ scm_c_define_gsubr (s_new_pipe, 7, 0, 0, (void *) new_pipe); ;
-+ scm_c_define_gsubr (s_pipe_connector, 4, 0, 0, (void *) pipe_connector); ;
-+ scm_c_define_gsubr (s_diamond, 2, 1, 0, (void *) diamond); ;
-+ scm_c_define_gsubr (s_fountain, 6, 0, 0, (void *) fountain); ;
-+ scm_c_define_gsubr (s_set_position, 3, 1, 0, (void *) set_position); ;
-+ scm_c_define_gsubr (s_get_position_x, 1, 0, 0, (void *) get_position_x); ;
-+ scm_c_define_gsubr (s_get_position_y, 1, 0, 0, (void *) get_position_y); ;
-+ scm_c_define_gsubr (s_get_position_z, 1, 0, 0, (void *) get_position_z); ;
-+ scm_c_define_gsubr (s_set_modtime, 3, 0, 0, (void *) set_modtime); ;
-+ scm_c_define_gsubr (s_set_acceleration, 2, 0, 0, (void *) set_acceleration); ;
-+ scm_c_define_gsubr (s_set_horizon, 2, 0, 0, (void *) set_horizon); ;
-+ scm_c_define_gsubr (s_set_primary_color, 4, 1, 0, (void *) set_primary_color); ;
-+ scm_c_define_gsubr (s_set_secondary_color, 4, 1, 0, (void *) set_secondary_color); ;
-+ scm_c_define_gsubr (s_set_specular_color, 4, 1, 0, (void *) set_specular_color); ;
-+ scm_c_define_gsubr (s_set_flag, 3, 0, 0, (void *) set_flag); ;
-+ scm_c_define_gsubr (s_set_wind, 3, 0, 0, (void *) set_wind); ;
-+ scm_c_define_gsubr (s_set_speed, 2, 0, 0, (void *) set_speed); ;
-+ scm_c_define_gsubr (s_set_texture, 2, 0, 0, (void *) set_texture); ;
-+ scm_c_define_gsubr (s_set_fountain_strength, 2, 0, 0, (void *) set_fountain_strength); ;
-+ scm_c_define_gsubr (s_set_fountain_velocity, 4, 0, 0, (void *) set_fountain_velocity); ;
-+ scm_c_define_gsubr (s_score_on_death, 2, 0, 0, (void *) score_on_death); ;
-+ scm_c_define_gsubr (s_time_on_death, 2, 0, 0, (void *) time_on_death); ;
-+ scm_c_define_gsubr (s_default_on_death, 3, 0, 0, (void *) default_on_death); ;
-+ scm_c_define_gsubr (s_add_cyclic_platform, 8, 0, 0, (void *) add_cyclic_platform); ;
-+ scm_c_define_gsubr (s_animator, 7, 0, 0, (void *) animator); ;
-+ scm_c_define_gsubr (s_set_onoff, 2, 0, 0, (void *) set_onoff); ;
-+ scm_c_define_gsubr (s_animator_value, 1, 0, 0, (void *) animator_value); ;
-+ scm_c_define_gsubr (s_set_animator_direction, 2, 0, 0, (void *) set_animator_direction); ;
-+ scm_c_define_gsubr (s_set_animator_position, 2, 0, 0, (void *) set_animator_position); ;
-+ scm_c_define_gsubr (s_day, 0, 0, 0, (void *) day); ;
-+ scm_c_define_gsubr (s_night, 0, 0, 0, (void *) night); ;
-+ scm_c_define_gsubr (s_fog, 0, 1, 0, (void *) fog); ;
-+ scm_c_define_gsubr (s_thick_fog, 0, 0, 0, (void *) thick_fog); ;
-+ scm_c_define_gsubr (s_fog_color, 3, 0, 0, (void *) fog_color); ;
-+ scm_c_define_gsubr (s_set_bonus_level, 1, 0, 0, (void *) set_bonus_level); ;
-+ scm_c_define_gsubr (s_set_track_name, 1, 0, 0, (void *) set_track_name); ;
-+ scm_c_define_gsubr (s_set_author, 1, 0, 0, (void *) set_author); ;
-+ scm_c_define_gsubr (s_start_time, 1, 0, 0, (void *) start_time); ;
-+ scm_c_define_gsubr (s_set_time, 1, 0, 0, (void *) set_time); ;
-+ scm_c_define_gsubr (s_get_time, 0, 0, 0, (void *) get_time); ;
-+ scm_c_define_gsubr (s_add_time, 1, 0, 0, (void *) add_time); ;
-+ scm_c_define_gsubr (s_set_score, 1, 0, 0, (void *) set_score); ;
-+ scm_c_define_gsubr (s_get_score, 0, 0, 0, (void *) get_score); ;
-+ scm_c_define_gsubr (s_add_score, 1, 0, 0, (void *) add_score); ;
-+ scm_c_define_gsubr (s_set_start_position, 2, 0, 0, (void *) set_start_position); ;
-+ scm_c_define_gsubr (s_snow, 1, 0, 0, (void *) snow); ;
-+ scm_c_define_gsubr (s_rain, 1, 0, 0, (void *) rain); ;
-+ scm_c_define_gsubr (s_difficulty, 0, 0, 0, (void *) difficulty); ;
-+ scm_c_define_gsubr (s_use_grid, 1, 0, 0, (void *) use_grid); ;
-+ scm_c_define_gsubr (s_map_is_transparent, 1, 0, 0, (void *) map_is_transparent); ;
-+ scm_c_define_gsubr (s_jump, 1, 0, 0, (void *) jump); ;
-+ scm_c_define_gsubr (s_scale_oxygen, 1, 0, 0, (void *) scale_oxygen); ;
-+ scm_c_define_gsubr (s_set_cell_flag, 6, 0, 0, (void *) set_cell_flag); ;
-+ scm_c_define_gsubr (s_set_cell_velocity, 6, 0, 0, (void *) set_cell_velocity); ;
-+ scm_c_define_gsubr (s_set_cell_heights, 8, 1, 0, (void *) set_cell_heights); ;
-+ scm_c_define_gsubr (s_set_cell_water_heights, 8, 1, 0, (void *) set_cell_water_heights); ;
-+ scm_c_define_gsubr (s_set_cell_colors, 8, 1, 0, (void *) set_cell_colors); ;
-+ scm_c_define_gsubr (s_set_cell_wall_colors, 8, 1, 0, (void *) set_cell_wall_colors); ;
-+ scm_c_define_gsubr (s_play_effect, 1, 0, 0, (void *) play_effect); ;
-+ scm_c_define_gsubr (s_camera_angle, 2, 0, 0, (void *) camera_angle); ;
-+ scm_c_define_gsubr (s_restart_time, 1, 0, 0, (void *) restart_time); ;
-+ scm_c_define_gsubr (s_clear_song_preferences, 0, 0, 0, (void *) clear_song_preferences); ;
-+ scm_c_define_gsubr (s_force_next_song, 0, 0, 0, (void *) force_next_song); ;
-+ scm_c_define_gsubr (s_set_song_preference, 2, 0, 0, (void *) set_song_preference); ;
-+ scm_c_define_gsubr (s_trigger, 4, 0, 0, (void *) trigger); ;
-+ scm_c_define_gsubr (s_smart_trigger, 5, 0, 0, (void *) smart_trigger); ;
-+ scm_c_define_gsubr (s_on_event, 3, 0, 0, (void *) on_event); ;
-+ scm_c_define_gsubr (s_get_event_callback, 2, 0, 0, (void *) get_event_callback); ;
-  s_mod_speed = scm_permanent_object (scm_c_define ("*mod-speed*", scm_long2num(0))); ;
-  s_mod_jump = scm_permanent_object (scm_c_define ("*mod-jump*", scm_long2num(1))); ;
-  s_mod_spike = scm_permanent_object (scm_c_define ("*mod-spike*", scm_long2num(2))); ;
---- trackballs-1.1.4/src/guile.h	2007-05-17 17:09:28.000000000 +0200
-+++ trackballs-1.1.4.new/src/guile.h	2011-05-18 12:46:26.197253216 +0200
-@@ -21,7 +21,6 @@
- #ifndef GUILE_H
- #define GUILE_H
- 
--#include <guile/gh.h>
- #include <libguile.h>
- 
- void initGuileInterface();
-diff -up trackballs-1.1.4/share/levels/fourSeasons_2.scm~ trackballs-1.1.4/share/levels/fourSeasons_2.scm
---- trackballs-1.1.4/share/levels/fourSeasons_2.scm~	2004-02-08 21:21:36.000000000 +0100
-+++ trackballs-1.1.4/share/levels/fourSeasons_2.scm	2011-05-18 14:40:43.959255037 +0200
-@@ -23,7 +23,7 @@
- 
- 
- (if (> (difficulty) *easy*)
--	(begin
-+	(let ()
- 	  (define enemy-1 (new-mr-black 198.5 175.5))
- 	  (if (= (difficulty) *hard*) (set-modtime enemy-1 *mod-spike* -1.))
- 	  (set-acceleration enemy-1 2.0)
-diff -up trackballs-1.1.4/share/levels/frg5.scm~ trackballs-1.1.4/share/levels/frg5.scm
---- trackballs-1.1.4/share/levels/frg5.scm~	2006-10-18 19:59:14.000000000 +0200
-+++ trackballs-1.1.4/share/levels/frg5.scm	2011-05-18 14:47:09.175255141 +0200
-@@ -26,16 +26,11 @@
- 
- (diamond 190.0 182.0)
- 
-+(define speed .3)
- (cond
-- ((= (difficulty) *easy*)
--         (define speed .4)
-- )
-- ((= (difficulty) *normal*)
--         (define speed .3)
-- )
-- ((= (difficulty) *hard*)
--         (define speed .2)
-- )
-+ ((= (difficulty) *easy*) (set! speed .4))
-+ ((= (difficulty) *normal*) (set! speed .3))
-+ ((= (difficulty) *hard*) (set! speed .2))
- )
- 
- (add-cyclic-platform 204 191 204 191 4.9 6.4 1. speed)
-diff -up trackballs-1.1.4/share/levels/frg9.scm~ trackballs-1.1.4/share/levels/frg9.scm
---- trackballs-1.1.4/share/levels/frg9.scm~	2006-10-30 21:23:38.000000000 +0100
-+++ trackballs-1.1.4/share/levels/frg9.scm	2011-05-18 14:47:04.903255137 +0200
-@@ -65,16 +65,11 @@
- (add-flag 208 219 30 0 1.5)
- (add-flag 209 216 30 0 1.5)
- 
-+(define speed .4)
- (cond
-- ((= (difficulty) *easy*)
--         (define speed .6)
-- )
-- ((= (difficulty) *normal*)
--         (define speed .4)
-- )
-- ((= (difficulty) *hard*)
--         (define speed .2)
-- )
-+ ((= (difficulty) *easy*) (set! speed .6))
-+ ((= (difficulty) *normal*) (set! speed .4))
-+ ((= (difficulty) *hard*) (set! speed .2))
- )
- 
- (add-cyclic-platform 220 238 220 238 3.0 5.0 1. speed)
-diff -up trackballs-1.1.4/share/levels/hxtst.scm~ trackballs-1.1.4/share/levels/hxtst.scm
---- trackballs-1.1.4/share/levels/hxtst.scm~	2003-03-29 23:59:44.000000000 +0100
-+++ trackballs-1.1.4/share/levels/hxtst.scm	2011-05-18 14:41:57.399255057 +0200
-@@ -26,7 +26,7 @@
- 
- ;; This would create a forcefield and a switch turning it on/off
- (if (= (difficulty) *hard*)
--	(begin
-+	(let ()
- 	  (define ff (forcefield 251.5 250.5 0.0 
- 							 2.0 0.0 0.0 
- 							 0.5 *ff-kill*))
-diff -up trackballs-1.1.4/share/levels/lv1.scm~ trackballs-1.1.4/share/levels/lv1.scm
---- trackballs-1.1.4/share/levels/lv1.scm~	2007-05-25 16:58:49.000000000 +0200
-+++ trackballs-1.1.4/share/levels/lv1.scm	2011-05-18 14:37:40.552254989 +0200
-@@ -39,7 +39,7 @@
- 
- ;; This creates a forcefield and a switch turning it on/off
- (if (= (difficulty) *hard*)
--    (begin
-+    (let ()
-       (define ff (forcefield 251.5 250.5 0.0 
- 			     2.0 0.0 0.0 
- 			     0.5 *ff-kill*))
-diff -up trackballs-1.1.4/src/mmad.cc~ trackballs-1.1.4/src/mmad.cc
---- trackballs-1.1.4/src/mmad.cc~	2011-05-18 12:58:04.000000000 +0200
-+++ trackballs-1.1.4/src/mmad.cc	2011-05-18 14:54:00.999255250 +0200
-@@ -38,6 +38,7 @@ char *SHARE_DIR_DEFAULT=SHARE_DIR;
- #include "hofMode.h"
- #include <SDL/SDL_image.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <settingsMode.h>
- #include <settings.h>
- #include <setupMode.h>
-@@ -554,6 +555,9 @@ int main(int argc,char **argv) {
-   char guileLoadPath[256+16];/*longest effective share directory plus"GUILE_LOAD_PATH="*/
-   program_name = argv[0];
- 
-+  /* Disable guile deprecated warning, unless explicitly requested */
-+  setenv("GUILE_WARN_DEPRECATED", "no", 0);
-+
-   /*** Autmatic detection of SHARE_DIR ***/
-   effectiveShareDir[0]=0;
-   /* From environment variable */
diff --git a/games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch b/games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch
deleted file mode 100644
index 21c9a58c20..0000000000
--- a/games/trackballs/patches/trackballs-1.1.4-remove-old-sdl-workarounds.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -up trackballs-1.1.4/src/gameMode.cc~ trackballs-1.1.4/src/gameMode.cc
---- trackballs-1.1.4/src/gameMode.cc~	2006-08-06 14:01:39.000000000 +0200
-+++ trackballs-1.1.4/src/gameMode.cc	2011-05-18 15:51:03.320256212 +0200
-@@ -26,9 +26,8 @@ using namespace std;
- 
- GameMode *GameMode::current;
- 
--GameMode::GameMode() { keyUpReceived=1; }
--GameMode::~GameMode() {
--}
-+GameMode::GameMode() {}
-+GameMode::~GameMode() {}
- void GameMode::activate(GameMode* gm) { 
-   if(current) current->deactivated();
-   current = gm; 
-@@ -36,7 +35,6 @@ void GameMode::activate(GameMode* gm) { 
- }
- void GameMode::display(){}
- void GameMode::key(int){}
--void GameMode::keyUp(int){ keyUpReceived=1; }
- void GameMode::special(int key,int x,int y){}
- void GameMode::idle(Real td){}
- void GameMode::mouse(int state,int x,int y){}
-diff -up trackballs-1.1.4/src/gameMode.h~ trackballs-1.1.4/src/gameMode.h
---- trackballs-1.1.4/src/gameMode.h~	2006-08-06 14:01:20.000000000 +0200
-+++ trackballs-1.1.4/src/gameMode.h	2011-05-18 15:49:50.760256145 +0200
-@@ -33,7 +33,6 @@ class GameMode {
- 
-   virtual void display();
-   virtual void key(int);
--  virtual void keyUp(int);
-   virtual void special(int,int,int);
-   virtual void idle(Real dt);
-   virtual void doExpensiveComputations();
-@@ -44,9 +43,6 @@ class GameMode {
- 
-   static void activate(GameMode*);
-   static GameMode *current;
-- protected:
--  int keyUpReceived;
-- private:
- };
- 
- #endif
-diff -up trackballs-1.1.4/src/mainMode.cc~ trackballs-1.1.4/src/mainMode.cc
---- trackballs-1.1.4/src/mainMode.cc~	2007-05-25 12:23:50.000000000 +0200
-+++ trackballs-1.1.4/src/mainMode.cc	2011-05-18 15:45:44.458256059 +0200
-@@ -464,11 +464,6 @@ void MainMode::activated() {
-   camFocus[1] = Game::current->map->startPosition[1] - 5;
-   time = 0.0;
-   flash = 0.0;
--
--  /* Fix for an apparanet bug in my SDL + Xorg combination... */
--  SDL_WM_ToggleFullScreen(screen);
--  SDL_WM_ToggleFullScreen(screen);
--
- }
- void MainMode::deactivated() { free(viewportData); viewportData=NULL; }
- void MainMode::playerLoose() { Game::current->gamer->playerLoose(); gameStatus=statusGameOver; }
-diff -up trackballs-1.1.4/src/mmad.cc~ trackballs-1.1.4/src/mmad.cc
---- trackballs-1.1.4/src/mmad.cc~	2011-05-18 14:55:38.000000000 +0200
-+++ trackballs-1.1.4/src/mmad.cc	2011-05-18 16:11:33.817256492 +0200
-@@ -411,7 +411,6 @@ void innerMain(void *closure,int argc,ch
-   /* Initialize random number generator */
-   int seed=(int) getSystemTime();
-   srand(seed);
--  int keyUpReceived=1;
- 
-   while(is_running) {
- 
-@@ -469,9 +468,6 @@ void innerMain(void *closure,int argc,ch
- 	    if(GameMode::current) GameMode::current->mouseDown(e->button,e->x,e->y);
- 	    break;
- 	  case SDL_KEYUP:
--	    /* Prevent repeated keys */
--	    keyUpReceived=1;
--
- 	    /* Use Caps lock key to determine if mouse should be hidden+grabbed */
- 	    if(event.key.keysym.sym == SDLK_CAPSLOCK) {	  
- 	      if(SDL_GetModState() & KMOD_CAPS) {
-@@ -481,12 +477,12 @@ void innerMain(void *closure,int argc,ch
- 		SDL_WM_GrabInput(SDL_GRAB_ON);
- 		SDL_ShowCursor(SDL_DISABLE);
- 	      }
--	    } else
--	      GameMode::current->keyUp(event.key.keysym.sym);
-+	    }
-+	    break;
- 	  case SDL_KEYDOWN:
--
- 	    /* Always quit if the 'q' key is pressed */
--	    if(event.key.keysym.sym == 'q' && SDL_GetModState() & KMOD_CTRL) exit(0);
-+	    if(event.key.keysym.sym == 'q' && SDL_GetModState() & KMOD_CTRL)
-+	      exit(0);
- 
- 	    /* Change between fullscreen/windowed mode if the 'f' key
- 	       is pressed */
-@@ -525,14 +521,13 @@ void innerMain(void *closure,int argc,ch
- 		((EditMode*)GameMode::current)->askQuit();
- 	      } else if((GameMode::current && GameMode::current == MenuMode::menuMode))
- 		is_running=0;
--	      else { GameMode::activate(MenuMode::menuMode); while(SDL_PollEvent(&event)) {} }
--
-+	      else {
-+	        GameMode::activate(MenuMode::menuMode);
-+	        while(SDL_PollEvent(&event)) {}
-+              }
- 	    }
--	    else if(GameMode::current) {
--	      /* Prevent repeated keys */
--	      if(!keyUpReceived) break;
--	      keyUpReceived=0;
- 
-+	    else if(GameMode::current) {
- 	      GameMode::current->key(event.key.keysym.sym);
- 	    }
- 
diff --git a/games/trackballs/slack-desc b/games/trackballs/slack-desc
index 95df12983a..392c4ea247 100644
--- a/games/trackballs/slack-desc
+++ b/games/trackballs/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-trackballs: trackballs (marble game)
+trackballs: trackballs (3d marble game)
 trackballs:
-trackballs: Trackballs is a marble game inspired by the 80s Atari classic
-trackballs: Marble Madness.
+trackballs: Trackballs is a game inspired by the 80s Atari classic Marble Madness.
 trackballs:
 trackballs: By steering a marble ball through a labyrinth filled with sharp
 trackballs: objects, pools of acid, and other obstacles, the player collects
-trackballs: points. When the destination is reached you continue on to the
-trackballs: next, more difficult level... unless the time runs out.
+trackballs: points. When the destination is reached you continue on to the next,
+trackballs: more difficult level... unless the time runs out.
+trackballs:
 trackballs:
 trackballs:
diff --git a/games/trackballs/trackballs.SlackBuild b/games/trackballs/trackballs.SlackBuild
index 810a670593..9cf79deaf9 100644
--- a/games/trackballs/trackballs.SlackBuild
+++ b/games/trackballs/trackballs.SlackBuild
@@ -6,11 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210222 bkw: update for v1.3.2
+# 20201024 bkw: update for v1.3.1
 # 20170621 bkw: fix build on -current
 
 PRGNAM=trackballs
-VERSION=${VERSION:-1.1.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -52,43 +54,31 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply two patches from redhat: one to fix building and running with guile-2.0.x,
-# another to fix "Esc" behaviour. Also abs.diff, which fixes the build for
-# gcc 7 from -current.
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-# Make icons honor DESTDIR (thanks to Johannes for this fix)
-sed -i 's/ $(iconsdir)/ $(DESTDIR)$(iconsdir)/g' share/icons/Makefile.in
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DTRACKBALLS_BIN_DIR=/usr/games \
+    -DTRACKBALLS_MAN_DIR=/usr/man \
+    -DTRACKBALLS_DOC_DIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
 
 gzip $PKG/usr/man/man6/$PRGNAM.6
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README AUTHORS COPYING ChangeLog FAQ TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a README* AUTHORS* COPYING* FAQ* TODO* NEWS* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
+# Compatibility icon for old-school window managers.
 mkdir -p $PKG/usr/share/pixmaps
 cat share/icons/$PRGNAM-64x64.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
@@ -96,53 +86,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Include the music, if we find the music tarball
-MUSICFILE=$CWD/$PRGNAM-music-${MUSICVER}.tar.${MUSICEXT}
-if [ -e "$MUSICFILE" ]; then
-  tar xvf "$MUSICFILE"
-  chown root:root $PRGNAM-music/*.ogg
-  chmod 0644 $PRGNAM-music/*.ogg
-  cp -a $PRGNAM-music/*.ogg $PKG/usr/share/$PRGNAM/music
-  cat $PRGNAM-music/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.music
-fi
-
-# Include extra levels, if we find any. This is more complex than it
-# should need to be, but some of the level archives create a top-level
-# directory and some don't...
-levels_included=""
-if [ -e $CWD/levels/ ]; then
-  for file in $CWD/levels/*; do
-    found=0
-    rm -rf tmplevels
-    mkdir -p tmplevels
-
-    case "$file" in
-      *.tar.gz|*.tar.bz2)
-        tar xvfzC "$file" tmplevels
-        found=1
-        ;;
-      *.zip)
-        ( cd tmplevels ; unzip "$file" )
-        found=1
-        ;;
-      *) # break
-        ;;
-    esac
-
-  if [ "$found" = "1" ]; then
-    levels_included="$levels_included\n$( basename $file )"
-    find tmplevels -type f -print0 | xargs -0 chmod 644
-    find tmplevels -type f -print0 | xargs -0 chown root:root
-    find tmplevels -type f -exec cp -a '{}' $PKG/usr/share/$PRGNAM/levels \;
-  fi
-  done
-
-  if [ -n "$levels_included" ]; then
-    echo -e "This package includes the following extra level packs:\n" \
-            "$levels_included" > \
-            $PKG/usr/doc/$PRGNAM-$VERSION/README.extra_levels
-  fi
-fi
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/trackballs/trackballs.info b/games/trackballs/trackballs.info
index c51e5bd3ef..85727281de 100644
--- a/games/trackballs/trackballs.info
+++ b/games/trackballs/trackballs.info
@@ -1,10 +1,10 @@
 PRGNAM="trackballs"
-VERSION="1.1.4"
-HOMEPAGE="http://trackballs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/trackballs/trackballs-1.1.4.tar.gz"
-MD5SUM="84e2e8bb68842a636da91673751279a0"
+VERSION="1.3.2"
+HOMEPAGE="https://trackballs.github.io/"
+DOWNLOAD="https://github.com/trackballs/trackballs/archive/v1.3.2/trackballs-1.3.2.tar.gz"
+MD5SUM="85b128afca8b55d8e7ae02c21fa0427e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="SDL2_mixer SDL2_image SDL2_ttf"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/unvanquished/90-mmap_min_addr.conf b/games/unvanquished/90-mmap_min_addr.conf
new file mode 100644
index 0000000000..5ec0f225c5
--- /dev/null
+++ b/games/unvanquished/90-mmap_min_addr.conf
@@ -0,0 +1,5 @@
+# 90-mmap_min_addr.conf
+
+# Part of SlackBuilds.org games/unvanquished. See its README for details.
+
+vm.mmap_min_addr = 65536
diff --git a/games/unvanquished/README b/games/unvanquished/README
index 75a25dae15..22a39fc7cd 100644
--- a/games/unvanquished/README
+++ b/games/unvanquished/README
@@ -1,4 +1,11 @@
+unvanquished (FPS/RTS Game - Aliens vs. Humans)
+
 Unvanquished is a fast-paced, futuristic FPS with RTS elements,
 pitting technologically advanced humans against hordes of highly
 adaptable aliens. The player can choose from either team, providing
 a fresh gameplay experience on both sides of the conflict.
+
+Note: this package sets the sysctl variable 'vm.mmap_min_addr' to 65536.
+For more information, see:
+https://sysctl-explorer.net/vm/mmap_min_addr/
+https://wiki.debian.org/mmap_min_addr
diff --git a/games/unvanquished/doinst.sh b/games/unvanquished/doinst.sh
index 790741ddfe..5a7175642d 100644
--- a/games/unvanquished/doinst.sh
+++ b/games/unvanquished/doinst.sh
@@ -2,6 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+[ -x /sbin/sysctl ] && /sbin/sysctl -p etc/sysctl.d/90-mmap_min_addr.conf >/dev/null 2>&1
+
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
diff --git a/games/unvanquished/unvanquished.SlackBuild b/games/unvanquished/unvanquished.SlackBuild
index 0ddd97b02b..5048dd33d5 100644
--- a/games/unvanquished/unvanquished.SlackBuild
+++ b/games/unvanquished/unvanquished.SlackBuild
@@ -22,9 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210216 bkw: modified by SlackBuilds.org, BUILD=2:
+# - add -fpermissive to get it to compile
+# - include the complete game data (*.pk3 files) so the game actually runs
+# - add sysctl stuff to let the game actually start up
+# Apparently this build never worked and nobody noticed.
+
 PRGNAM=unvanquished
 VERSION=${VERSION:-0.50.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=Unvanquished
@@ -101,7 +107,7 @@ mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_CGAME=OFF \
     -DBUILD_SGAME=OFF \
@@ -144,9 +150,10 @@ ln -sf $PKG/etc/$PRGNAM/config/server.cfg \
 ln -sf $PKG/etc/$PRGNAM/config/maprotation.cfg \
        $PKG/var/lib/$PRGNAM-server/config/maprotation.cfg
 
-# Copy the data-game
+# Copy the game data
 mkdir -p $PKG/usr/share/games/$PRGNAM/pkg
-cp $CWD/$PRGNAM\_$VERSION.pk3 $PKG/usr/share/games/$PRGNAM/pkg
+unzip $CWD/${PRGNAM}_$VERSION.zip '*/pkg/*'
+cp -a ${PRGNAM}_$VERSION/pkg/* $PKG/usr/share/games/$PRGNAM/pkg
 
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
@@ -158,6 +165,12 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a GPL.txt README.md COPYING.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20210216 bkw: sysctl is needed per
+# https://github.com/Unvanquished/Unvanquished/issues/944
+# It actually makes the game start up.
+mkdir -p $PKG/etc/sysctl.d
+cat $CWD/90-mmap_min_addr.conf > $PKG/etc/sysctl.d/90-mmap_min_addr.conf
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/games/unvanquished/unvanquished.info b/games/unvanquished/unvanquished.info
index f349cdf0ff..1a59696c92 100644
--- a/games/unvanquished/unvanquished.info
+++ b/games/unvanquished/unvanquished.info
@@ -2,16 +2,16 @@ PRGNAM="unvanquished"
 VERSION="0.50.0"
 HOMEPAGE="http://www.unvanquished.net/"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/unvanquished/v0.50.0.tar.gz \
-          http://ponce.cc/slackware/sources/repo/unvanquished/unvanquished_0.50.0.pk3 \
+          https://github.com/Unvanquished/Unvanquished/releases/download/v0.50.0/unvanquished_0.50.0.zip \
           http://ponce.cc/slackware/sources/repo/unvanquished/linux32-4.tar.bz2"
 MD5SUM="d9279452fb1a6747f830660b444e7b20 \
-        36860685567cd7e4198726e1a4b0ce40 \
+        591662c094a39be954af2e9167e1f075 \
         dd2cb5419bac9a1b81a8a996312e33ff"
 DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/unvanquished/v0.50.0.tar.gz \
-                 http://ponce.cc/slackware/sources/repo/unvanquished/unvanquished_0.50.0.pk3 \
+                 https://github.com/Unvanquished/Unvanquished/releases/download/v0.50.0/unvanquished_0.50.0.zip \
                  http://ponce.cc/slackware/sources/repo/unvanquished/linux64-4.tar.bz2"
 MD5SUM_x86_64="d9279452fb1a6747f830660b444e7b20 \
-               36860685567cd7e4198726e1a4b0ce40 \
+               591662c094a39be954af2e9167e1f075 \
                2ba12c71625919ddc282172b74fa4887"
 REQUIRES="GeoIP SDL2 libwebp speex OpenAL opusfile lua PyYAML Jinja2"
 MAINTAINER="Dimitris Zlatanidis"
diff --git a/games/uqm/README b/games/uqm/README
index 3717c399ea..491e8dc2ae 100644
--- a/games/uqm/README
+++ b/games/uqm/README
@@ -1,5 +1,20 @@
+uqm (port of the 3DO/PC game - Star Control II)
+
 The Ur-Quan Masters is a port of the 3DO version of the PC game "Star
 Control II". It runs on modern operating systems and is 100% free.
 
-You may also want the optional uqm_voice and uqm_3domusic packages, for
-a more festive gaming experience.
+You may also want the optional uqm_voice, uqm_3domusic and/or
+uqm_remixes packages, for a more festive gaming experience.
+
+Optional dependencies:
+
+SDL2 - Recommended. Although uqm still supports SDL-1.2, the
+release packages for other OSes (Windows and Mac) are built using
+SDL2. Autodetected, can be disabled with SDL2=no [*] in the environment.
+
+OpenAL - Not recommended. OpenAL support in uqm is still experimental.
+Not autodetected: use OPENAL=yes in the environment, to enable.
+
+[*] In addition, for SDL-1.2 builds, OpenGL can be disabled by setting
+    OPENGL=no in the environment. If you don't know why you might do
+    this, you almost certainly don't need to!
diff --git a/games/uqm/config.state.in b/games/uqm/config.state.in
new file mode 100644
index 0000000000..f1775ca235
--- /dev/null
+++ b/games/uqm/config.state.in
@@ -0,0 +1,14 @@
+CHOICE_debug_VALUE='nodebug'
+CHOICE_graphics_VALUE='@GFX@'
+CHOICE_sound_VALUE='@SND@'
+CHOICE_mikmod_VALUE='internal'
+CHOICE_ovcodec_VALUE='standard'
+CHOICE_netplay_VALUE='full'
+CHOICE_joystick_VALUE='enabled'
+CHOICE_ioformat_VALUE='stdio_zip'
+CHOICE_accel_VALUE='asm'
+CHOICE_threadlib_VALUE='sdl'
+INPUT_install_prefix_VALUE='/usr'
+INPUT_install_bindir_VALUE='$prefix/bin'
+INPUT_install_libdir_VALUE='$prefix/libexec'
+INPUT_install_sharedir_VALUE='$prefix/share'
diff --git a/games/uqm/icons/128.png b/games/uqm/icons/128.png
new file mode 100644
index 0000000000..27553420d0
--- /dev/null
+++ b/games/uqm/icons/128.png
diff --git a/games/uqm/icons/16.png b/games/uqm/icons/16.png
new file mode 100644
index 0000000000..7e4fa3d323
--- /dev/null
+++ b/games/uqm/icons/16.png
diff --git a/games/uqm/icons/32.png b/games/uqm/icons/32.png
new file mode 100644
index 0000000000..441a81f67b
--- /dev/null
+++ b/games/uqm/icons/32.png
diff --git a/games/uqm/icons/48.png b/games/uqm/icons/48.png
new file mode 100644
index 0000000000..4cd791e688
--- /dev/null
+++ b/games/uqm/icons/48.png
diff --git a/games/uqm/slack-desc b/games/uqm/slack-desc
index 1194f203c0..b5cc6c9e55 100644
--- a/games/uqm/slack-desc
+++ b/games/uqm/slack-desc
@@ -10,10 +10,10 @@ uqm: uqm (port of the 3DO/PC game - Star Control II)
 uqm:
 uqm: The Ur-Quan Masters is a port of the 3DO version of the PC game "Star
 uqm: Control II". It runs on modern operating systems and is 100% free.
+uqm: This package contains the game executable and documentation, as
+uqm: well as the game content (graphics, sound, etc).
 uqm:
-uqm: This package contains the game executable and documentation, as well
-uqm: as the game content (graphics, sound, etc).
+uqm: This package includes game content version @CONTVER@.
 uqm:
-uqm: You may also want the optional uqm_voice and uqm_3domusic packages,
-uqm: for a more festive gaming experience.
+uqm: Build options: Graphics=@RENDER@, Audio=@AUDIO@
 uqm:
diff --git a/games/uqm/uqm.1 b/games/uqm/uqm.1
deleted file mode 100644
index 98412c254a..0000000000
--- a/games/uqm/uqm.1
+++ /dev/null
@@ -1,771 +0,0 @@
-.TH "UQM" "1" "The Ur\-Quan Masters" "http://sc2.sourceforge.net"
-
-.SH NAME
-\fBuqm\fR - \fIThe Ur\-Quan Masters\fR, a modern, free port of the
-classic PC game \fIStar Control II\fR (aka \fIstarcon2\fR).
-.SH SYNOPSIS
-\fBuqm\fR \fI[options]\fR
-.SH DESCRIPTION
-Welcome to the sixth release of the Ur\-Quan Masters port.  This
-document will tell you everything you need to play, even if you've
-never played the original.
-
-For those of you who have played the original, read the first section
-(starting the game and bug reports) and the last sections (Super Melee
-and control summary), and you'll be good to go.
-
-.SH "STARTING THE GAME"
-
-Simply invoke the \fBuqm\fR executable.
-This will use the default settings.  The defaults and how to
-change them are listed under \fBCOMMAND LINE OPTIONS\fR, below.
-
-After a splash screen, you will see the main menu, which has five
-options:
-
-.IP "\fINew Game\fR"
-Begins a new Full Game.  This is a galaxy\-spanning space
-adventure full of diplomacy, exploration, combat, high treason,
-and low cunning.  The introductory cutscenes will set the scene;
-the \fBTHE STORY SO FAR\fR section below provides more extensive
-backstory for the curious.
-
-.IP "\fILoad Game\fR"
-Restores a Full Game session that was saved earlier.
-
-.IP "\fISuper Melee!\fR"
-Puts the game in Super Melee mode, where you may
-hone your space combat skills or challenge your friends to fleet
-battles.  See the \fBSUPER MELEE\fR section below for details on this
-section.
-
-.IP "\fISetup\fR"
-Lets you configure many options to customize your play
-experience.  Most options will take effect once you exit the setup
-menu; a few specially marked options require you to restart UQM.
-Setup options are preserved across sessions.  The options are
-described under \fBCOMMAND LINE OPTIONS\fR, below.
-
-.IP "\fIQuit\fR"
-Exits the program.
-
-.SH "COMMAND LINE OPTIONS"
-
-The default options for an UQM install are 3DO music, 640x480 windowed
-mode, and pure SDL graphics drivers.  You may pass various command line
-options to customize your experience. Most of these options are
-also accessible from the in\-game \fBSetup\fR menu.
-.PP
-\fINote:\fR Options set on the command line do not get saved permanently
-in the config directory. To permanently change a setting, it must be
-changed via the in\-game \fBSetup\fR menu.
-
-.IP "\fB\-r\fB \fIresolution\fR, \fB\-\-res\fB \fIresolution\fR"
-Sets the screen resolution (default \fI640x480\fR).  Unless OpenGL is
-supported, the only valid values are \fI640x480\fR and \fI320x240\fR;
-setting any other value will automatically enable \fB\-\-opengl\fR if
-compiled in (otherwise, the \fB\-r\fR option will be ignored).
-.PP
-\fINote:\fR The in\-game \fBSetup\fR menu normally only allows
-\fI320x240\fR, \fI640x480\fR, \fI800x600\fR, and \fI1024x768\fR. To
-permanently set some other resolution in the config file, set it with
-the \fB\-o\fR and \fB\-r\fR options, then enter and immediately exit
-the \fBSetup\fR menu. From then on, starting \fBuqm\fR with no parameters
-will enable OpenGL and set the resolution to your custom value.
-
-.IP "\fB\-f\fR, \fB\-\-fullscreen\fR"
-Uses full screen mode.  Pretty straightforward.  Usually good to
-combine with \fB\-r\fR \fI320x240\fR unless you're using a scaler.
-
-.IP "\fB\-o\fR, \fB\-\-opengl\fR"
-Use OpenGL drivers.  This produces higher\-quality graphics, and may be
-faster as well \-\- but it also may not work on older cards.  It also
-permits use of any screen resolution.
-
-.IP "\fB\-c\fR \fImode\fR, \fB\-\-scale\fR \fImode\fR"
-Graphics scaling mode (\fIbilinear\fR, \fIbiadapt\fR, \fIbiadv\fR,
-\fItriscan\fR, \fIhq or \fInone\fR).
-Default is \fInone\fR. Try these to get smoother graphics with cost on
-performance.
-
-.IP "\fB\-b\fR \fImode\fR, \fB\-\-meleezoom\fR \fImode\fR"
-Melee zooming mode (\fIpc\fR or \fI3do\fR); \fIstep\fR is an alias for \fIpc\fR and \fIsmooth\fR
-is an alias for \fI3do\fR. Default is \fI3do\fR. Slower machine owners can set it
-to \fIpc\fR to get better performance in melee.
-
-.IP "\fB\-s\fR, \fB\-\-scanlines\fR"
-Simulates interlaced displays (by drawing every other line with darker colors).
-
-.IP "\fB\-g\fR \fIvalue\fR, \fB\-\-gamma\fR \fIvalue\fR"
-Sets gamma correction (default: \fI1.0\fR).
-1.0 causes no change (unless your graphics card
-is originally set to a different value). Higher than 1.0 makes the
-image brighter, lower than 1.0 makes it darker.
-
-.IP "\fB\-p\fR, \fB\-\-fps\fR"
-Print fps (frames per second) information in the status window.
-
-.IP "\fB\-C\fR \fIdir\fR, \fB\-\-configdir\fR \fIdir\fR"
-Set the directory where the game will store the config data.
-Default: \fI~/.uqm\fR
-
-.IP "\fB\-n\fR \fIdir\fR, \fB\-\-contentdir\fR \fIdir\fR"
-Set the directory where the game will seek its data. Default:
-\fI/usr/share/uqm/content\fR
-
-.IP "\fB\-l\fR \fIfile\fR, \fB\-\-logfile\fR \fIfile\fR"
-Set a file to receive the diagnostic information that would otherwise go 
-to the console.
-
-.IP "\fB\-h\fR, \fB\-\-help\fR"
-Display a help message.
-
-.IP "\fB\-M\fR \fIlevel\fR, \fB\-\-musicvol\fR \fIlevel\fR"
-Set music volume (0\-100).
-
-.IP "\fB\-S\fR \fIlevel\fR, \fB\-\-sfxvol\fR \fIlevel\fR"
-Set sound effects volume (0\-100).
-
-.IP "\fB\-T\fR \fIlevel\fR, \fB\-\-speechvol\fR \fIlevel\fR"
-Set speech volume (0\-100). If set to 0, the game runs in 'no speech'
-mode and the oscilloscope reacts to the music.
-
-.IP "\fB\-m\fR \fItype\fR, \fB\-\-music\fR \fItype\fR"
-Set the soundtrack type (default: \fI3do\fR). Valid values for \fItype\fR are
-\fI3do\fR (use the 3DO remixed soundtrack for songs that were in fact remixed),
-and \fIpc\fR (use the .MOD based PC soundtrack everywhere).
-
-.IP "\fB\-q\fR \fIquality\fR, \fB\-\-audioquality\fR \fIquality\fR"
-Can be \fIhigh\fR, \fImedium\fR, or \fIlow\fR.  Specifies how nice the audio
-sounds.  Slower machines should lower the audio quality.
-
-.IP "\fB\-\-addon\fR \fIname\fR"
-Replace \fIname\fR with the name of an add\-on to enable in the game. See
-the section \fBADD\-ONS\fB below for details.
-
-.IP "\fB\-\-sound\fR \fImixer\fR"
-Can be \fIopenal\fR, \fImixsdl\fR or \fInone\fR. Specifies which driver/mixer
-to use. \fIopenal\fR is only available when it has been compiled in.
-It may produce higher\-quality sound and will probably be faster,
-but it is not very stable on linux platforms, and may not work
-well with some sound cards.
-Use \fInone\fR as a last resort if you cannot get other drivers to work,
-or if you have no soundcard.
-
-.IP "\fB\-\-stereosfx\fR"
-Enables positional sound effects in melee. Currently works only when
-using \fB\-\-sound openal\fR.
-
-.IP "\fB\-n\fR, \fB\-\-nosubtitles\fR"
-Disables subtitles.
-
-.IP "\fB\-\-cscan\fR \fIpc\fR"
-Use PC style planet information when scanning (text).  Default.
-
-.IP "\fB\-\-cscan\fR \fI3do\fR"
-Use 3DO style planet information when scanning (pictograms).
-
-.IP "\fB\-\-menu\fR \fIpc\fR"
-Use PC style menus (text) and 'CREW'/'BATT' in melee instead of icons.
-Default.
-
-.IP "\fB\-\-menu\fR \fI3do\fR"
-Use 3DO style menus (pictograms).
-
-.IP "\fB\-\-font\fR \fIpc\fR"
-Use PC style fonts and colors.
-Default.
-
-.IP "\fB\-\-font\fR \fI3do\fR"
-Use 3DO style fonts and colors.
-
-.IP "\fB\-\-scroll\fR \fIpc\fR"
-Scroll voice\-over/subtitles 1 page at a time when using left/right arrow keys
-Default.
-
-.IP "\fB\-\-scroll\fR \fI3do\fR"
-Scroll voice\-over/subtitles smoothly while holding down left/right arrow keys
-
-.IP "\fB\-i\fR \fI3do\fR, \fB\-\-intro\fR \fI3do\fR"
-Use the 3DO intro and ending movies (if you have them).
-The default.
-
-.IP "\fB\-i\fR \fIpc\fR, \fB\-\-intro\fR \fIpc\fR"
-Use the PC intro and ending sequences and slide shows. These will be also
-played if you do not have 3DO movies, regardless of \fB\-i\fR option.
-
-.IP "\fB\-\-shield\fR \fIpc\fR"
-Use PC style static slave shield graphic.
-Default.
-
-.IP "\fB\-\-shield\fR \fI3do\fR"
-Use 3DO style throbbing slave shield graphic. This somewhat increases the
-load on CPU while in orbit. Do not use if your CPU cannot handle that.
-
-
-.SH "NOT OFFICIALLY SUPPORTED OPTIONS"
-
-The following options may not exist in all builds and can change without
-notice at any time.
-
-.IP "\fB\-\-accel\fR \fItype\fR"
-Can be \fInone\fB, \fIdetect\fB, \fImmx\fB, \fI3dnow\fB, \fIsse\fB
-(also \fIaltivec\fB if/when
-added; or other platforms). Specifies which platform accelerations
-to use for graphics and sound, if any. All specific platform code can
-only be used when compiled in.
-
-.IP "\fB\-\-netport1\fR \fIport\fR"
-.IP "\fB\-\-netport2\fR \fIport\fR"
-Specifies the default port that the bottom or top player respectively
-will connect to or accept incoming connections on. If this parameter
-is not specified, \fI21837\fR will be used.  This value can be changed later
-in the SuperMelee Net menu. Your firewall needs to be set up to allow
-TCP connections from/to the used port.
-
-.IP "\fB\-\-nethost1\fR \fIhost\fR"
-.IP "\fB\-\-nethost2\fR \fIhost\fR"
-Specifies the default name or ip number of the host to connect to for
-the bottom or player. If this parameter is not specified, UQM will
-not attempt an outgoing connection, but instead listen for an incoming
-connection.
-
-.IP "\fB\-\-netdelay\fR \fIframes\fR"
-Set the default input delay (in frames).  See the \fBSUPER MELEE\fR section
-for details.
-
-.SH "THE STORY SO FAR"
-For the past decade, Earth and the rest of the Alliance of Free Stars
-has fought the Ur\-Quan and their Hierarchy of Battle Thralls.  In the
-course of the War, the Earthlings discovered a factory world of the
-\fBPrecursors\fR \- an impossibly advanced that disappeared tens of
-thousands of years ago.  This colony, Unzervalt (aka Vela I), lost all
-contact with Earth shortly after landfall.
-
-You are Captain Zelnick, a human that was born on Unzervalt and who
-possesses a remarkable knack for Precursor technology.  You were the
-one who worked out how to activate the Precursor installation.
-
-It was a factory for building starships.  However, Unzervalt is
-mineral\-poor, and there were not enough materials available to
-construct a complete vessel.  Your task is to command this craft, the
-Vindicator, and return to Earth to tell them of the abandoned colony.
-Also, if the War with the Ur\-Quan continues, you must fight for Earth
-and the Alliance as best you can.
-
-There is a great deal more to this story.  Asking Starbase Commander
-Hayes for background information will give you most of it.
-
-.SH "INTERPLANETARY EXPLORATION"
-
-When in a Solar system, use the thrust and steering controls to move
-about the system.  Intersecting a planet will move you to the
-planetary system; flying over a planet or moon will then put you into
-orbit.  From there you can talk to the inhabitants, or, if the planet
-is uninhabited, send a lander down to gather minerals, investigate
-energy readings, or capture life forms.
-
-.SH "PLANET LANDING"
-
-To land on a planet, you need to achieve orbit, then fill a planet
-lander with crew and send them down.  You will usually want to scan
-the planet first.  Mineral scans will indicate easily harvestable
-mineral ores and other resources.  Energy scans will indicate unusual
-installations, which will effectively always be worth investigating.
-Biological scans will show where life forms are on the surface.
-
-Minerals are necessary for building up and maintaining your flagship,
-so harvest them wherever you can.  There are nine varieties, each
-color coded:
-
-\fBCOMMON ELEMENTS\fR (\fIcarbon\fR, \fInitrogen\fR) are cyan. Worth 1 resource unit
-(RU) per unit.
-
-\fBCORROSIVES\fR (\fIchlorine\fR, \fIiodine\fR) are red.  2 RU per unit.
-
-\fBBASE METALS\fR (\fIiron\fR, \fItin\fR) are grey.  These are common, and usually worth
-harvesting, but not terribly valuable.  3 RU per unit.
-
-\fBNOBLE GASSES\fR (\fIargon\fR, \fIxenon\fR) are blue.  4 RU per unit.
-
-\fBRARE EARTHS\fR (\fIlanthanum\fR, \fIytterbium\fR) are green.  5 RU per unit.
-
-\fBPRECIOUS ELEMENTS\fR (\fIgold\fR, \fIsilver\fR) are yellow.  6 RU per unit.
-
-\fBRADIOACTIVES\fR (\fIuranium\fR, \fIastatine\fR) are orange.  8 RU per unit.
-
-\fBEXOTICS\fR (\fIantimatter\fR, \fImagnetic monopoles\fR) are purple, and a princely 25
-RU per cargo unit.
-
-Minerals may be unloaded at Earth Starbase by talking to Commander
-Hayes, which will give you RU that you may spend to upgrade your
-flagship.
-
-However, there are many hazards on planetary surfaces.  Life forms are
-often hostile, and need to be subdued with your stunner or evaded.
-Earthquakes (expanding circles) can hurt your crew, lightning may
-crisp them, or lava flows and hotspots can fry them.  Be careful,
-especially on hotter or more seismically and atmospherically active
-worlds.  If your crew level starts dropping dramatically, flee quickly
-with the ESCAPE key!
-
-Stunned life forms may be captured and analyzed by your planet
-landers.  The information you gain from this may not be immediately
-useful, but it will eventually come in handy.
-
-Landing on a planet costs fuel, and the heavier the planet, the more
-fuel it requires. Make sure you don't spend so much fuel exploring
-planets that you can't get back to Sol!
-
-.SH "INTERSTELLAR TRAVEL"
-
-When you leave a solar system, you will push up into HyperSpace.  In
-HyperSpace you can travel great distances quickly, but you must
-continuously thrust to move.  Otherwise, you will gradually slow to a
-stop.
-
-While you can fly about in HyperSpace just like you do in a star
-system, the Galaxy is LARGE, and you will usually want to use the
-Auto\-Pilot.  To use the Auto\-Pilot, select "Starmap" on the menu.
-This will show you a map of the quadrant (the galactic Core is in the
-upper right corner).  To fly to a location, move the cursor there and
-press Enter.  Then press Space to engage the Auto\-Pilot.
-
-.SH DIPLOMACY
-
-When you encounter an alien starship, you will usually get a picture
-of their task force and a chance to choose between conversation and
-fighting.  If you choose to fight, you will transition immediately to
-space combat (below).  Otherwise, you will talk first.  If talks go
-poorly, space combat will likely ensue.
-
-If the task force shows ships streaming off in all directions, you
-have reached a fortified world, and there are an unlimited number of
-starships facing you.  You cannot win such a fight \- if combat ensues,
-you will need to warp out.
-
-.SH "SPACE COMBAT"
-
-When combat begins, you are prompted to select a ship from your task
-force.  A one\-on\-one space combat then begins, and continues until
-either the enemy fleet is destroyed (in which case you salvage the
-wrecks and continue the game), your flagship is destroyed (ending the
-game), or your flagship warps out of combat (consuming 5 fuel units
-but ending the encounter).
-
-Each ship has two major stats: Crew and Combat Battery.  Crew are
-effectively hit points.  Getting hit by weapons kills crew, and if all
-crew are eliminated, the craft is destroyed.  Firing weapons typically
-requires energy from the combat batteries, which is replaced over
-time.  The precise speed of energy regeneration and cost of weapons
-fire varies by ship.
-
-Space flight is \fImostly\fR inertial (you'll drift if you stop
-thrusting), but each ship has a maximum velocity that can only be
-exceeding by "gravity whipping" around the planet.  Don't hit the
-planet unless you want to take LOTS of damage.
-
-Each ship has a primary and secondary weapon mode, unique to that
-race's craft.  The descriptions of those follow.
-
-.SH "SHIP DESCRIPTIONS"
-
-.IP "Androsynth Guardian"
-Primary weapon: Fires homing acid bubble clouds.
-.br
-Secondary weapon: Transforms into the 'Blazer', a comet that does
-considerable damage by ramming its opponents.
-
-.IP "Ariloulaleelay Skiff"
-Primary weapon: Auto\-aiming, short\-range laser
-.br
-Secondary weapon: Random teleport
-.br
-Note: The Skiff is inertia\-less, and stops instantly when thrust is
-removed.
-
-.IP "Chenjesu Broodhome"
-Primary weapon: Crystal Shard.  Will travel until the fire button is
-released, then shatters.
-.br
-Secondary weapon: De\-energizing Offensive Guided Interceptor.
-Launches an autonomous DOGI that rams the opponent to drain their
-combat batteries.
-
-.IP "Chmmr Avatar"
-Primary weapon: Immensely powerful short\-range laser
-.br
-Secondary weapon: Tractor beam.
-.br
-Note: Has three orbiting "ZapSats" that attack anything that gets in
-range.
-
-.IP "Druuge Mauler"
-Primary weapon: Long range, high\-recoil cannon
-.br
-Secondary weapon: Sets one crew on fire to gain combat energy.
-
-.IP "Earthling Cruiser"
-Primary weapon: Homing nuclear missile
-.br
-Secondary weapon: Point\-defense laser
-
-.IP "Ilwrath Avenger"
-Primary weapon: Short\-range flamethrower
-.br
-Secondary weapon: Cloaking device
-
-.IP "Kohr\-Ah Marauder "
-Primary weapon: Spinning blades that stop and home when the fire
-button is released
-.br
-Secondary weapon: Fiery Ring of Inevitable and Eternal Destruction
-(F.R.I.E.D.), a short\-range corona of energy that blocks shots and
-inflicts lots of damage
-
-.IP "Melnorme Trader"
-Primary weapon: Charged shot.  The longer the fire button is held, the
-stronger the shot.
-.br
-Secondary weapon: Confusion beam that scrambles enemy controls.
-
-.IP "Mmrnmhrm X\-Form"
-Primary weapon:  Lasers (X\-form) or homing missiles (Y\-form).
-.br
-Secondary weapon:  Switch between X\-Form and Y\-Form.
-
-.IP "Mycon Podship"
-Primary weapon:  Homing Plasmoid.
-.br
-Secondary weapon:  Regenerate 4 crew.
-
-.IP "Orz Nemesis"
-Primary weapon:  Howitzer cannon.
-.br
-Secondary weapon: Secondary with left and right arrows rotates the
-primary cannon.  Secondary with Primary launches space marines that
-invade the enemy ship and kill their crew.
-
-.IP "Pkunk Fury"
-Primary weapon:  Three\-way cannon
-.br
-Secondary weapon: Fling insults at opponent.  This is the only way the
-Pkunk can regenerate combat energy.
-.br
-Note: On occasion, a destroyed Fury will be resurrected with full fuel
-and power.
-
-.IP "Shofixti Scout"
-Primary weapon:  Energy Dart.
-.br
-Secondary weapon: Glory Device.  When pressed three times, the ship
-will self\-destruct, inflicting vast damage on nearby vessels.
-
-.IP "Slylandro Probe"
-Primary weapon:  Lighting weapon.
-.br
-Secondary weapon: Absorb a nearby asteroid and convert to combat
-power.  This is the only way the Probe can recharge.
-.br
-Note: The Probe is inertia\-less and always in motion.  Pressing thrust
-will reverse its direction.
-
-.IP "Spathi Eluder"
-Primary weapon:  Simple forward cannon.
-.br
-Secondary weapon: Backward Utilized Tracking Torpedo (B.U.T.T.), a
-homing missile fired from the rear of the vessel.
-
-.IP "Supox Blade"
-Primary weapon: Forward firing glob weapon
-.br
-Secondary weapon: Secondary + left or right will cause you to drift
-laterally, while Secondary + thrust will make you fly backwards.  This
-cancels your current velocity, so be careful!
-
-.IP "Syreen Penetrator"
-Primary weapon: Particle Beam Stiletto.
-.br
-Secondary weapon: "Syreen Call" \- psychic attack that induces enemy
-crew to jump ship, where you (or your opponent) may capture them to
-add to your complement
-
-.IP "Thraddash Torch"
-Primary weapon:  Straightforward blaster cannon.
-.br
-Secondary weapon: Afterburner.  The afterburner exhaust does more
-damage then the blaster, so use it as a weapon!
-
-.IP "Umgah Drone"
-Primary weapon:  Anti\-Matter cone.  Does not require combat batteries to use.
-.br
-Secondary weapon:  Fly backwards suddenly and at high speed.
-.br
-Note: The Drone only recharges batteries if you do not fire for a long
-time, and then the energy all returns in one lump.
-
-.IP "Ur\-Quan Dreadnought"
-Primary weapon:  Fusion Blast.
-.br
-Secondary weapon: Launches autonomous fighters to harrass the enemy.
-When they run low on fuel, they will fly back to the Dreadnought.
-Catch them before they expire.  Each fighter requires one crew to
-pilot it, so take care not to weaken the core ship.
-
-.IP "Utwig Jugger"
-Primary weapon: Six\-shot cannon.  Requires no combat battery energy to fire.
-.br
-Secondary weapon: Force shield.  Absorbing hits re\-energizes your
-batteries.  When the batteries are exhausted, the shield is
-permanently disabled until combat ends.
-
-.IP "VUX Intruder"
-Primary weapon: Gigawatt laser.
-.br
-Secondary weapon: Limpet mines that track enemy ships and slow them
-down dramatically if they hit.
-
-.IP "Yehat Terminator"
-Primary weapon: Twin autocannons.
-.br
-Secondary weapon: Force shield.
-
-.IP "Zoq\-Fot\-Pik Stinger"
-Primary weapon: Anti\-matter spray gun.
-.br
-Secondary weapon: "Tongue attack", a point\-blank range attack that
-does grievous damage.
-
-.SH "SUPER MELEE"
-
-Super Melee mode is pure combat.  It's designed to let you hone your
-skills for the full game, or to challenge your friends to fleet
-matches.  Selecting "Super Melee!" from the main menu will bring you
-to the super melee main screen.
-
-This screen is dominated by the fleet design screen.  Move the cursor
-over a ship slot and press ENTER to change the ship assignment, or
-press DELETE to remove the ship.  You may select the fleet name and
-press ENTER to edit the fleet name to something of your choice.  The
-number next to the fleet name lists the fleet strength; this is simply
-the sum of the point values of all ships in the fleet.
-
-The right hand side of the screen has buttons for managing the battle.
-Each side has four buttons associated with it: LOAD, SAVE, CONTROL,
-and NET.  The LOAD and SAVE buttons let you load and save fleets.  A
-variety of fleets of various strengths are pre\-defined, and you may
-add your own by saving fleets you design.  
-
-The CONTROL button has one of five settings.  HUMAN CONTROL puts the
-fleet under the control of a human player.  (The precise controls for
-that player are set in the Setup menu, but the bottom player's
-controls are always the same as the full game's controls.)  Then there
-are three levels of computer control: 
-
-\fBWEAK CYBORG\fR is not a particularly good shot, and will only use
-special weapons if the ship absolutely requires the special weapon
-to function at all (Pkunk, Slylandro).  This difficulty level only
-appears in the full game when fighting crippled ships.
-
-\fBGOOD CYBORG\fR will actually use its special weapon, but it's still
-not much of a threat.  The Good cyborg provides a gentle
-introduction to Star Control combat if you are unfamiliar with the
-gameplay.  However, you will soon wish to switch to...
-
-\fBAWESOME CYBORG\fR.  The AI will fully exploit each ship's abilities,
-and is also a tolerably good shot, compensating for inertia and
-choosing its shots.  Enemies you meet in the full game are almost
-always piloted at this level.  If a battle is giving you trouble
-in the full game, this is the setting you want.
-
-The last control option is \fBNETWORK CONTROL\fR, which will be set if that
-side is controlled by a non\-local opponent.  To set up a network game,
-push the NET button on the side you wish to be under your opponent's
-control.
-
-In order to connect, you must agree on a port (the default is \fB21837\fR,
-which should not require any change) and set a net delay in frames.
-To compensate for network lag, a keypress or keyrelease will only take
-effect after this many frames. While higher values make your ship
-seem to respond more sluggishly, they give the keypress information
-more time to reach the remote party.  If the game stutters, this is
-because it is waiting for this keypress information to arrive, which
-is an indication that the input delay is too low.  Super Melee runs at
-24 frames per second, each frame delayed will delay the input by about
-42ms.  The delay used is the maximum of the desired value for both
-parties.  The default is 2. Values lower than 4 are typically
-acceptable in terms of responsiveness.  Future versions may
-automatically decide on the best value to use.
-
-Once the port and delay are set, one player must select the first
-option (Wait for incoming connection), while the other enters his
-opponent's hostname or IP address into the Host field and then pushes
-"Connect."  Once the connection is established, the control scheme for
-the remote player will flip to NETWORK CONTROL to register the
-connection.  To disconnect, change it away back to one of the HUMAN or
-CYBORG options.  Once connected, you are both free to edit your fleets
-to provide a properly balanced battle.
-
-Once all fleets are in readiness, press the BATTLE button in the
-center right.  (In a network game, both players must select it with no
-intervening fleet edits.  Moving away from BATTLE or having your
-opponent change their fleet will cancel your readiness state, and you
-will need to reselect the BATTLE button.)  When all players are ready,
-the battle begins.
-
-The ship selection screen is much as it would be in the full game,
-with two notable exceptions: a question mark in the upper right allows
-you to select a new ship randomly from those remaining, and a red X
-allows you to exit the combat entirely.  (It is also possible to exit
-the melee at any time by pressing F10, just as one can exit anything.)
-If nobody quits, the combat will continue until one side has been
-completely destroyed.  At this point, both fleets are shown so that
-one may compare initial and remaining fleet strengths.  Press a key to
-return to the melee menu.
-
-To return to the main menu after finishing with Super Melee mode, push
-the QUIT button in the lower right.
-
-.SH "GENERAL GAME CONTROLS SUMMARY"
-.nf
-F1 or PAUSE                  Pause game
-F10                          Exit game
-.fi
-
-.SH "FULL GAME CONTROLS SUMMARY"
-
-.nf
-	Space flight
-
-UP                           Thrust
-LEFT and RIGHT:              Steer
-SPACE or RIGHT SHIFT:        Main menu
-
-	Menus
-
-Arrow Keys:                  Scroll through selections
-ENTER or RIGHT CTRL:         Make selection
-SPACE or RIGHT SHIFT:        Up one level
-
-	Conversations
-
-LEFT and RIGHT:              Rewind/Forward
-UP and DOWN:                 Scroll through selections
-ENTER or RIGHT CTRL:         Make selection
-SPACE or RIGHT SHIFT:        Skip, Show/Hide summary
-
-	Star Map
-
-Arrow Keys:                  Move the crosshair
-ENTER or RIGHT CTRL:         Select destination
-SPACE or RIGHT SHIFT:        Main menu
-Keypad +:                    Zoom in
-Keypad \-:                    Zoom out
-/ (not on the keypad):       Begin search.
-                             (Type star or constellation name to 
-                              find matches)
-TAB:                         Jump to next match.
-
-	Space Combat
-
-UP:                          Thrust
-LEFT and RIGHT:              Steer
-RIGHT CTRL or ENTER:         Fire Primary Weapon
-RIGHT SHIFT:                 Fire Secondary Weapon
-ESCAPE:                      Emergency Warp Escape
-
-
-	Planet Exploration
-
-UP:                          Forward
-LEFT and RIGHT:              Steer
-RIGHT CTRL or ENTER:         Fire stun bolt
-RIGHT SHIFT or ESCAPE:       Blast off
-.fi
-
-.SH "MELEE CONTROLS SUMMARY"
-
-.nf
-	Top Player
-
-W:                           Thrust
-A and D:                     Steer
-V:                           Fire Primary Weapon
-B:                           Fire Secondary Weapon
-
-	Bottom Player
-
-UP or ENTER:                 Thrust
-LEFT and RIGHT:              Steer
-RIGHT CTRL or ENTER:         Fire Primary Weapon
-RIGHT SHIFT:                 Fire Secondary Weapon
-.fi
-
-These controls are configurable from the Setup Menu.  You may define
-up to six "Input Templates" and assign a template to either or both
-players.  Some commonly used key configurations are pre\-defined, as
-well as popular variants.  To change key bindings, select the binding
-you wish to change and press ENTER.  At the dialog box, press the key
-(or joystick gesture) that you wish to assign to this action.
-
-
-.SH "SAVED GAMES"
-
-The saved games are kept in your personal directory for uqm data.
-This directory is automatically created the first time you start the
-game. On Unix systems this personal uqm data is stored in \fB~/.uqm\fB.
-
-You will generally only need this if you intend to transfer savegames
-to another computer. Note that currently games saved on an PowerPC Mac
-will not work on a PC (or an Intel Mac), and vice versa.  AMD64 and
-Intel savegames may be safely transferred.
-
-.SH "ADD\-ONS"
-
-As of version 0.3, The Ur\-Quan Masters has basic support for add\-on
-packages.  Though it is not very elaborate yet, you can install some
-content add\-ons.
-
-Inside the directory where the content is installed, in the content/packages/
-directory, there is a directory 'addons/'. In this directory, you can
-create new directories with .zip files to be used in addition to the
-standard content .zip files.
-When you specify the command\-line option '\-\-addon <addon>', the .zip files
-inside the directory content/packages/addons/<addon> will be included
-in the game. '\-\-addon' may be specified more than once to enable multiple
-add\-ons.
-
-.SH "BUG REPORTS"
-
-After several years of enthusiastic testing, UQM has dramatically
-improved its stability, but it is still beta software, and bugs
-certainly still lurk.  Upon finding a problem, we'd like you to report
-it, but before you do, please do the following:
-
-\- Try to isolate what causes it: "Crashes with a null dereference
-about half the time when firing and taunting with a Pkunk" is better
-than "Melee doesn't work."  If the game crashes, notice what error
-is produced; if the game hangs, check to see if the game\-exit key
-(F12) works.
-
-\- Go to the bug database at http://bugs.uqm.stack.nl/
-and post a report of the problem there. Search the database first if
-it has been already posted; if we get many duplicate reports, processing
-them eats our time from actual development. If it's been reported, and
-you have more information, feel free to confirm that you've reproduced it
-by adding a comment to the report. If ten people have already confirmed it,
-though, it's probably best to treat it as duly reported.
-
-\- Whenever possible, for bugs that only occur under certain conditions,
-include a save game with your bug report that duplicates the bug.
-In the case of a crash, a stack trace can be very helpful for us too.
-If you don't know what a stack trace is, don't worry about it.
-
-\- If your issue is more like "support request" than bug report and you
-want help from other users, then posting it to our forum might be
-more appropriate: http://uqm.stack.nl/forum/
-
-.SH "SEE ALSO"
-The full documentation in \fB/usr/doc/uqm-0.6.3\fR
-.br
-The official Ur-Quan Masters web site at \fBhttp://sc2.sourceforge.net/\fR
diff --git a/games/uqm/uqm.SlackBuild b/games/uqm/uqm.SlackBuild
index 28c298ab39..b59c0ab660 100644
--- a/games/uqm/uqm.SlackBuild
+++ b/games/uqm/uqm.SlackBuild
@@ -6,13 +6,26 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210304 bkw: update for v0.8.0. script changed a good bit, can't
+# build older versions. Note to self: don't mix engine and content
+# versions without testing thoroughly! 0.7.0 engine seemed to work
+# with 0.8.0 content, but crashed when trying to enter the setup menu!
+
+# 20201025 bkw: update build for new content pack 0.8.0. This mostly
+# has fixes for typos in the in-game text strings. The game engine
+# hasn't changed, so VERSION now has both versions. Also, moved
+# the binary to /usr/games where it belongs.
+
 PRGNAM=uqm
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CONTENT=${PRGNAM}_content
-CONTVER=${CONTVER:-0.7.0}
+# Extract the tarball and content versions. If there's no + in
+# VERSION, both these will end up equal to VERSION. Otherwise use a +
+# to separate source and content versions (e.g. 0.7.0+0.8.0).
+SRCVER=$(  echo $VERSION | sed 's,+.*,,' )
+CONTVER=$( echo $VERSION | sed 's,.*+,,' )
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,68 +56,81 @@ fi
 
 set -e
 
+# Starting with 0.8.0, we have options to use SDL2 and
+# OpenAL. Upstream made SDL2 the default, so we'll use it if
+# available (autodetect). However, OpenAL is labelled 'experimental'
+# and disabled by default, so we'll require OPENAL=yes to enable it
+# (if present).
+
+if pkg-config --exists sdl2; then
+  SDL2DEF=yes
+else
+  SDL2DEF=no
+fi
+
+SDL2=${SDL2:-$SDL2DEF}
+OPENGL=${OPENGL:-yes}
+
+case "$SDL2-$OPENGL" in
+  yes-*)  GFX=sdl2   ;; # SDL2 builds always support OpenGL
+  no-no)  GFX=pure   ;;
+  no-yes) GFX=opengl ;;
+  *) echo "*** Invalid SDL2 and/or OPENGL values, use only 'yes' or 'no'" 1>&2
+     exit 1 ;;
+esac
+
+case "${OPENAL:-no}" in
+  yes) SND=openal ;;
+  no)  SND=mixsdl ;;
+  *) echo "*** Invalid OPENAL value $OPENAL, use only 'yes' or 'no'" 1>&2
+     exit 1 ;;
+esac
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-source.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER-src.tgz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
-find -L . \
- \( -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 {} \;
-
-# uqm uses a custom build.sh to configure and build the source.
-# It's not a bad system, but it's interactive only, meaning I have
-# to script answers to the build.sh prompts, hence build_config().
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# Previously this script ran the interactive config, piping responses to it.
+# This is a cleaner way to do it.
 # WARNING: If you're updating this SlackBuild for a new version of
-# uqm, check and make sure the build.sh options haven't changed!
+# uqm, check and make sure the config.state options haven't changed!
+sed -e "s,@GFX@,$GFX," \
+    -e "s,@SND@,$SND," \
+       $CWD/config.state.in \
+       > config.state
+
+# reprocess_config creates build.vars based on choices in config.state
+sh build.sh uqm reprocess_config
 
+# For the other options in config.state, we take the defaults.
 # It'd be more efficient to require a system-wide libmikmod instead of
 # using the included (statically linked) one, but it's not that big
 # a library, and this way we don't have any external dependencies.
 
-build_config() {
-   echo 1     # Top-level menu option 1: Build type...
-   echo 1     # type 1 = release
-   echo 2     # Top-level menu option 2: OpenGL support...
-   echo 2     # 1 = Don't include, 2 = Include OpenGL graphics support
-   echo 4     # Top-level menu option 4: Tracker music support
-   echo 1     # 1 = included libmikmod, 2 = system libmikmod
-   echo 11    # Top-level menu option 11: Installation paths...
-              # (N.B. option 11 was option 10 in uqm 0.6.2)
-   echo 1     # Option 1 = Installation prefix
-   echo /usr  # New value:
-   echo 3     # Option 3 = Location for non-sharable data
-              # New value:
-   echo \$prefix/libexec
-   echo       # ENTER; back to top-level menu
-   echo       # ENTER at top-level menu = done
-}
-
-
-if [ ! -e $CWD/$PRGNAM-$CONTVER-content.uqm ]; then
-    echo "Error: $CONTENT not found! Please download the $CONTENT"
-    echo "       first (see the README), before attempting to build this."
-    exit 1
-fi
-
+# Use our flags.
+sed -i "s/-O3/$SLKCFLAGS/" build.vars
 
-build_config | sh build.sh uqm config
-sed -i -e "s/-O3/$SLKCFLAGS/" -e '/LDFLAGS/s,-lz,-lz -lm,' build.vars
+# Actually compile the thing.
 sh build.sh uqm
 
-strip $PRGNAM
+# "sh build.sh uqm install" would install it, but it doesn't look like
+# DESTDIR works (?). Manual install does.
+
+# Real game binary lives in libexec.
 mkdir -p $PKG/usr/libexec/$PRGNAM
-cp -a $PRGNAM $PKG/usr/libexec/$PRGNAM
+install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/libexec/$PRGNAM
 
-mkdir -p $PKG/usr/bin
-cat $PRGNAM-wrapper > $PKG/usr/bin/$PRGNAM
-chmod 0755 $PKG/usr/bin/$PRGNAM
+# Shell script wrapper tells the real binary where to find the content.
+mkdir -p $PKG/usr/games
+install -oroot -groot -m0755 $PRGNAM-wrapper $PKG/usr/games/$PRGNAM
 
+# Include (mostly) empty content and addons dirs in the package.
 mkdir -p $PKG/usr/share/$PRGNAM/content/{addons,packages}
 cp content/version $PKG/usr/share/$PRGNAM/content
 
@@ -112,15 +138,42 @@ cp content/version $PKG/usr/share/$PRGNAM/content
 cat $CWD/$PRGNAM-$CONTVER-content.uqm > \
     $PKG/usr/share/$PRGNAM/content/packages/$PRGNAM-$CONTVER-content.uqm
 
-# Man page created for SBo (it's basically the README + roff markup)
-mkdir -p $PKG/usr/man/man1
-gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+# Use upstream's man page (used to ship our own).
+mkdir -p $PKG/usr/man/man6
+gzip -9c doc/users/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 
-# .desktop and icon borrowed from Debian
+# .desktop borrowed from Debian
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+# icons converted from "src/res/darwin/The Ur-Quan Masters.icns",
+# with icns2png.
+for i in $CWD/icons/*.png; do
+  size="$( basename $i .png )"
+  dir="$PKG/usr/share/icons/hicolor/${size}x${size}/apps"
+  mkdir -p "$dir"
+  cat $i > $dir/$PRGNAM.png
+done
+
+# old-style icon
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# dynamic slack-desc (for my own sanity!)
+ldd $PKG/usr/libexec/$PRGNAM/$PRGNAM > ldd.out
+if grep -q libSDL2 ldd.out; then
+  RENDER="SDL-2.0"
+elif grep -q libGL ldd.out; then
+  RENDER="SDL-1.2 (OpenGL)"
+else
+  RENDER="SDL-1.2 (software rendering)"
+fi
+
+if grep -q "libopenal" ldd.out; then
+  AUDIO="OpenAL"
+else
+  AUDIO="SDL"
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $PRGNAM.lsm AUTHORS BUGS COPYING ChangeLog Contributing README WhatsNew \
@@ -128,7 +181,10 @@ cp $PRGNAM.lsm AUTHORS BUGS COPYING ChangeLog Contributing README WhatsNew \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@CONTVER@,$CONTVER," \
+    -e "s,@RENDER@,$RENDER," \
+    -e "s,@AUDIO@,$AUDIO," \
+    $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/uqm/uqm.desktop b/games/uqm/uqm.desktop
index 8fdd54b012..537a785519 100644
--- a/games/uqm/uqm.desktop
+++ b/games/uqm/uqm.desktop
@@ -13,7 +13,7 @@ Comment[de]=Ein interstellar Abenteuerspiel
 Comment[en]=An interstellar adventure game
 Comment[es]=Una aventura interestelar
 Comment[fr]=Une aventure interstellaire
-Exec=uqm
+Exec=/usr/games/uqm
 Icon=uqm
 StartupNotify=true
 Terminal=false
diff --git a/games/uqm/uqm.info b/games/uqm/uqm.info
index 0e0b3ae4f1..ea9e8be1f4 100644
--- a/games/uqm/uqm.info
+++ b/games/uqm/uqm.info
@@ -1,10 +1,10 @@
 PRGNAM="uqm"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="http://sc2.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.7.0-source.tgz \
-  http://downloads.sourceforge.net/sc2/uqm-0.7.0-content.uqm"
-MD5SUM="f9018ea0493d7dac6a9e1006b00af7df \
-  2f36dcb15274dbbcb5e266f2ed84d5b2"
+DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.8.0-src.tgz \
+          http://downloads.sourceforge.net/sc2/uqm-0.8.0-content.uqm"
+MD5SUM="63c4c300736aa3ac9b841e31b9a76389 \
+        6cbc9d51fa63e07c0f4d1d061136d816"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/uqm/uqm.xpm b/games/uqm/uqm.xpm
deleted file mode 100644
index fb472c6347..0000000000
--- a/games/uqm/uqm.xpm
+++ /dev/null
@@ -1,138 +0,0 @@
-/* XPM */
-static char *ur-quan-icon-std-3[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 100 2",
-"   c black",
-".  c #0D350C",
-"X  c #0B390B",
-"o  c #142F12",
-"O  c #1E2713",
-"+  c #2F1D16",
-"@  c #3E1B0F",
-"#  c #3D1A10",
-"$  c #2B251D",
-"%  c #342111",
-"&  c #2C2D24",
-"*  c #2F3026",
-"=  c #32342B",
-"-  c #373732",
-";  c #3B3D39",
-":  c #064A06",
-">  c #044E04",
-",  c #084108",
-"<  c #035802",
-"1  c #036202",
-"2  c #036D02",
-"3  c #027802",
-"4  c #3D413C",
-"5  c #3E433E",
-"6  c #414540",
-"7  c #434843",
-"8  c #484D47",
-"9  c #4F544E",
-"0  c #595C55",
-"q  c #605C5A",
-"w  c #695A5E",
-"e  c #7F5567",
-"r  c #038303",
-"t  c #018A01",
-"y  c #029100",
-"u  c #019800",
-"i  c #009B00",
-"p  c #009E00",
-"a  c #00A200",
-"s  c #00A800",
-"d  c #00AE00",
-"f  c #01B200",
-"g  c #01B700",
-"h  c #01BB00",
-"j  c #00BE00",
-"k  c #33B70D",
-"l  c #00C300",
-"z  c #00C600",
-"x  c #01C701",
-"c  c #00CA00",
-"v  c #00D000",
-"b  c #00D400",
-"n  c #00D800",
-"m  c #00DE00",
-"M  c #1FCB10",
-"N  c #18D40F",
-"B  c #00E100",
-"V  c #00E500",
-"C  c #00EC00",
-"Z  c #0EE30B",
-"A  c #01F101",
-"S  c #03F102",
-"D  c #01F401",
-"F  c #29C010",
-"G  c #40B110",
-"H  c #4FB114",
-"J  c #5CAA0D",
-"K  c #5AAE13",
-"L  c #61A90D",
-"P  c #CB4002",
-"I  c #CE4102",
-"U  c #CC4902",
-"Y  c #DA4703",
-"T  c #DC4C03",
-"R  c #DC4F04",
-"E  c #DE5306",
-"W  c #DE6D02",
-"Q  c #E15C0A",
-"!  c #E47D01",
-"~  c #E6793C",
-"^  c #A5BA7F",
-"/  c #B8E332",
-"(  c #BDE438",
-")  c #EC9101",
-"_  c #EC9C01",
-"`  c #E7A601",
-"'  c #EBB601",
-"]  c #ECBC02",
-"[  c #CFD41A",
-"{  c #DFC809",
-"}  c #C7E742",
-"|  c #D4E84C",
-" . c #D7E755",
-".. c #D5E55B",
-"X. c #9BAC93",
-"o. c #99AB98",
-"O. c #9EB589",
-"+. c #D1D0D5",
-"@. c #D3D1D7",
-"#. c None",
-/* pixels */
-"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.#.#.# + #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.; * Q Y = #.#.o > < < < < < > < % = #.#.#.#.#.",
-"#.#.#.#.#.#.#.#.6 = 9 ~ ' Y + X u a L L L L L d d U P 6 #.#.#.#.",
-"#.#.#.#.#.#.#.5 . 2 q o.O.Q % , y p J ) ) ` { [ h a L P #.#.#.#.",
-"#.#.#.#.#.#.& : 2 p M O.@.w = . 2 p a d d d K  .} F x W @ 5 #.#.",
-"#.#.#.#.#.o > 3 u c V l 5 4 #.o 1 u d v c c x ( ..| N j y o #.#.",
-"#.#.#.#.* > 3 u l B h > - #.#.o 2 p s b n n n c ( ..| M p o #.#.",
-"#.#.#.- , r p c n s : 5 #.#.5 : u p d b v c v b c /  ./ u O #.#.",
-"#.#.#.o 3 f n N 8 o 6 #.#.7 3 a p a j n v x x l c x K ( p O #.#.",
-"#.#.5 < a n N w q ; & #.#.> a u a h b m c l x j c l H ( a O #.#.",
-"#.#.& t v n t w w 9 & $ > u p s j v n x j j x l c x H ( a O #.#.",
-"#.#.1 n n 3 O $ 5 0 5 y a p d c v c j h x b V C C C Z / p O #.#.",
-"#.#.2 m y $ #.#.* 5 y k p d c b k M x l b V D D D D D D y $ #.#.",
-"#.#.< r O #.#.#.= 3 a 9 0 k k H X.M c b C D V u y g j s , 8 #.#.",
-"#.#.o = #.#.#.& t a a j J ) ) J x c n A D A > O $ O . $ #.#.#.#.",
-"#.#.#.#.#.#.& < u a f x J _ _ ) x v C D C > 7 #.#.- @ % #.#.#.#.",
-"#.#.#.X 1 > < < t f c x J ) ) J b C D V , 7 #.#.; # Y P $ #.#.#.",
-"#.#.#.# J d s p y h m X.H k k H O.Z d o #.#.#.& & 0 e _ P # #.#.",
-"#.#.#.# U G a h x y v M x v B D k N 4 $ #.#.= > 3 8 X.O.Y @ #.#.",
-"#.#.#.O P ] F c c d t v m n D D Z q q 5 $ & X 3 p l O.+.; ; #.#.",
-"#.#.#.#.@ Y ] L x c h y h Z D t O 8 w 8 ; o 3 s v m k 5 #.#.#.#.",
-"#.#.#.#.#.@ ! ] L x b m t k r - #.- 8 0 7 2 a b B h > #.#.#.#.#.",
-"#.#.#.#.#.7 @ ) ] Z B A b . 6 #.#.#.O 9 3 p c B f : #.#.#.#.#.#.",
-"#.#.#.#.#.#.8 @ Y ` k Z N & #.#.#.& < r a c n u , #.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.+ P R K N * #.#.. < t h m m u O #.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.+ @ @ r = #.. 1 t f j d 2 o #.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.. : 1 : X * = #.#.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
-"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#."
-};
diff --git a/games/uqm_3domusic/README b/games/uqm_3domusic/README
index 9f6fa40df4..26ad6ef055 100644
--- a/games/uqm_3domusic/README
+++ b/games/uqm_3domusic/README
@@ -1,3 +1,5 @@
+uqm_3domusic (Ur-Quan Masters high-quality in-game music)
+
 The Ur-Quan Masters is a port of the 3DO version of the PC game "Star
 Control II". It runs on modern operating systems and is 100% free.
 
@@ -5,3 +7,8 @@ This package contains optional game content that provides high-quality
 in-game music. You don't need this package to play the game. Without
 this package, there will still be music during the game; it just doesn't
 sound as nice.
+
+Note: I'm aware there was a recent uqm-0.8.0-3domusic release.
+However, the contents of the .uqm file (which is really just a zip
+file) are byte-for-byte identical to the 0.7.0 one, so it seems silly
+to upgrade.
diff --git a/games/uqm_3domusic/slack-desc b/games/uqm_3domusic/slack-desc
index e5f4956745..524d2c58df 100644
--- a/games/uqm_3domusic/slack-desc
+++ b/games/uqm_3domusic/slack-desc
@@ -16,4 +16,4 @@ uqm_3domusic: in-game music. You don't need this package to play the game. Witho
 uqm_3domusic: this package, there will still be music during the game; it just
 uqm_3domusic: doesn't sound as nice.
 uqm_3domusic:
-uqm_3domusic: To play the game, you must install uqm and uqm_content.
+uqm_3domusic: To play the game, you must install uqm.
diff --git a/games/uqm_3domusic/uqm_3domusic.SlackBuild b/games/uqm_3domusic/uqm_3domusic.SlackBuild
index 00c934b9cb..ce81478291 100644
--- a/games/uqm_3domusic/uqm_3domusic.SlackBuild
+++ b/games/uqm_3domusic/uqm_3domusic.SlackBuild
@@ -6,8 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210302 bkw: Yay, there's finally an update after 10 years!
+
 PRGNAM=uqm_3domusic
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/games/uqm_3domusic/uqm_3domusic.info b/games/uqm_3domusic/uqm_3domusic.info
index a4d3f8cbb6..bc2f94c57c 100644
--- a/games/uqm_3domusic/uqm_3domusic.info
+++ b/games/uqm_3domusic/uqm_3domusic.info
@@ -1,8 +1,8 @@
 PRGNAM="uqm_3domusic"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="http://sc2.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.7.0-3domusic.uqm"
-MD5SUM="86a5e376d9b76888add1d10818f0ab9f"
+DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.8.0-3domusic.uqm"
+MD5SUM="9e5801d45ca12028b486cdeb83568c02"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="uqm"
diff --git a/games/uqm_remixes/uqm_remixes.SlackBuild b/games/uqm_remixes/uqm_remixes.SlackBuild
index 86bde28824..1258242b68 100644
--- a/games/uqm_remixes/uqm_remixes.SlackBuild
+++ b/games/uqm_remixes/uqm_remixes.SlackBuild
@@ -10,7 +10,7 @@
 # files are intended for (according to their web site).
 
 PRGNAM=uqm_remixes
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -29,7 +29,7 @@ mkdir -p $TMP $PKG $OUTPUT
 mkdir -p $PKG/usr/share/uqm/content/addons/
 
 # "sources" are zip files that don't get extracted (game uses them as-is).
-for disc in 1 2 3 4; do
+for disc in 1 2 3 4-1; do
   install -m0644 -oroot -groot \
     $CWD/uqm-remix-disc$disc.uqm \
     $PKG/usr/share/uqm/content/addons/
diff --git a/games/uqm_remixes/uqm_remixes.info b/games/uqm_remixes/uqm_remixes.info
index 660407d9b9..54568c44f8 100644
--- a/games/uqm_remixes/uqm_remixes.info
+++ b/games/uqm_remixes/uqm_remixes.info
@@ -1,14 +1,14 @@
 PRGNAM="uqm_remixes"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="http://sc2.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/project/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%201/uqm-remix-disc1.uqm \
           http://downloads.sourceforge.net/project/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%202/uqm-remix-disc2.uqm \
           http://downloads.sourceforge.net/project/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%203/uqm-remix-disc3.uqm \
-          http://downloads.sourceforge.net/project/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%204/uqm-remix-disc4.uqm"
+          http://downloads.sourceforge.net/project/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%204/uqm-remix-disc4-1.uqm"
 MD5SUM="09f242d8d72166d1d5ccbd3d99c93e7d \
         fbc8bdcb709939d559d8c7216ad15cc2 \
         5ccc6d4ac301ae98e172ac6835dcdead \
-        d3dc6036588662391a3820ca6b222dd6"
+        3fb63f4ac514343ed4b4b5b194c413fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="uqm"
diff --git a/games/uqm_voice/README b/games/uqm_voice/README
index 52f9ad2cad..57ecc6e88e 100644
--- a/games/uqm_voice/README
+++ b/games/uqm_voice/README
@@ -1,5 +1,7 @@
+uqm_voice (optional game content for uqm)
+
 The Ur-Quan Masters is a port of the 3DO version of the PC game "Star
 Control II". It runs on modern operating systems and is 100% free.
 
-This package contains optional game content that provides in-game speech.
-You don't need this package to play the game.
+This package contains optional game content that provides in-game
+speech. You don't need this package to play the game.
diff --git a/games/uqm_voice/slack-desc b/games/uqm_voice/slack-desc
index 9fe7f4e2a7..768bd06f52 100644
--- a/games/uqm_voice/slack-desc
+++ b/games/uqm_voice/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-uqm_voice: uqm_voice (optional game content that provides in-game speech)
+uqm_voice: uqm_voice (optional game content for uqm)
 uqm_voice:
 uqm_voice: The Ur-Quan Masters is a port of the 3DO version of the PC game "Star
 uqm_voice: Control II". It runs on modern operating systems and is 100% free.
 uqm_voice:
 uqm_voice: This package contains optional game content that provides in-game
-uqm_voice: speech.  You don't need this package to play the game.
+uqm_voice: speech. You don't need this package to play the game.
+uqm_voice:
 uqm_voice:
-uqm_voice: To play the game, you must install uqm and uqm_content.
 uqm_voice:
 uqm_voice:
diff --git a/games/uqm_voice/uqm_voice.SlackBuild b/games/uqm_voice/uqm_voice.SlackBuild
index 42cda31858..a24530eb0a 100644
--- a/games/uqm_voice/uqm_voice.SlackBuild
+++ b/games/uqm_voice/uqm_voice.SlackBuild
@@ -6,8 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201026 bkw: updated for v0.8.0
+
 PRGNAM=uqm_voice
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/games/uqm_voice/uqm_voice.info b/games/uqm_voice/uqm_voice.info
index d546aa41f9..4a50e3eeba 100644
--- a/games/uqm_voice/uqm_voice.info
+++ b/games/uqm_voice/uqm_voice.info
@@ -1,8 +1,8 @@
 PRGNAM="uqm_voice"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="http://sc2.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.7.0-voice.uqm"
-MD5SUM="b78e0606325810f9f2e9ec786191c01b"
+DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.8.0-voice.uqm"
+MD5SUM="fc89f77d7b66c2669abca6c157f5259a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="uqm"
diff --git a/games/vera/README b/games/vera/README
index 4a60243c35..5e4a307696 100644
--- a/games/vera/README
+++ b/games/vera/README
@@ -7,5 +7,5 @@ The database is installed in GNU Info format (use "info vera" to
 access) and as the wtf(6) database, replacing the tiny/outdated one
 from bsd-games.
 
-If you remove this package, reinstall bsd-games to revert to the original
-wtf database.
+If you remove this package, reinstall bsd-games to revert to the
+original wtf database.
diff --git a/games/vera/vera.SlackBuild b/games/vera/vera.SlackBuild
index 65dbe2c416..d0417f27ee 100644
--- a/games/vera/vera.SlackBuild
+++ b/games/vera/vera.SlackBuild
@@ -6,8 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw: updated for v1.24
+
 PRGNAM=vera
-VERSION=${VERSION:-1.23}
+VERSION=${VERSION:-1.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -27,11 +29,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Fix TL;DR and BP;DR entries.
 patch -p1 < $CWD/semicolons.diff
diff --git a/games/vera/vera.info b/games/vera/vera.info
index 14b50a545d..021dd80f6d 100644
--- a/games/vera/vera.info
+++ b/games/vera/vera.info
@@ -1,8 +1,8 @@
 PRGNAM="vera"
-VERSION="1.23"
+VERSION="1.24"
 HOMEPAGE="ftp://ftp.gnu.org/gnu/vera/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/vera/vera-1.23.tar.gz"
-MD5SUM="3301685834a37f7005451c803e63a76a"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/vera/vera-1.24.tar.gz"
+MD5SUM="03dce85d633e58acdd836ac1e260e7fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/vkQuake/README b/games/vkQuake/README
index e9816fbb09..698f735f05 100644
--- a/games/vkQuake/README
+++ b/games/vkQuake/README
@@ -8,7 +8,7 @@ anti-aliasing and AF.
 
 Your video card must support the vulkan graphics API for this
 port to work.  You can check video card compatibility here
-https://en.wikipedia.org/wiki/Vulkan_(API)#Compatibility
+https://en.wikipedia.org/wiki/Vulkan_(API)#Hardware
 
 vkQuake is only a game engine modification; you still need the
 original quake *.pak game files to play vkQuake.
diff --git a/games/vkQuake/vkQuake.SlackBuild b/games/vkQuake/vkQuake.SlackBuild
index 8c9b0f1dad..a6303f50df 100644
--- a/games/vkQuake/vkQuake.SlackBuild
+++ b/games/vkQuake/vkQuake.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vkQuake
-VERSION=${VERSION:-1.04.1}
+VERSION=${VERSION:-1.05.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/vkQuake/vkQuake.info b/games/vkQuake/vkQuake.info
index 32f5fafecd..9153868579 100644
--- a/games/vkQuake/vkQuake.info
+++ b/games/vkQuake/vkQuake.info
@@ -1,10 +1,10 @@
 PRGNAM="vkQuake"
-VERSION="1.04.1"
+VERSION="1.05.2"
 HOMEPAGE="https://github.com/Novum/vkQuake"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Novum/vkQuake/archive/1.04.1/vkQuake-1.04.1.tar.gz"
-MD5SUM_x86_64="0e7aadbfa99a9890a498a5072167c910"
+DOWNLOAD_x86_64="https://github.com/Novum/vkQuake/archive/1.05.2/vkQuake-1.05.2.tar.gz"
+MD5SUM_x86_64="1f832dd12c5ce03387e9e5b651b32846"
 REQUIRES="SDL2 vulkan-sdk-bin"
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
diff --git a/games/warsow/warsow.SlackBuild b/games/warsow/warsow.SlackBuild
index bbe9a50f5a..2cab1ecc41 100644
--- a/games/warsow/warsow.SlackBuild
+++ b/games/warsow/warsow.SlackBuild
@@ -22,9 +22,10 @@
 # Written by Andre Barboza <bmg.andre@gmail.com>
 # Updated by drhouse <housegregory299@gmail.com>
 # Updated by goarilla <goarilla@gmail.com>
+# Updated to v2.1.2 by SlackBuilds.org: version 2.1 was broken.
 
 PRGNAM=warsow
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,14 +63,14 @@ mkdir -p "${PKG}/usr/doc/${PRGNAM}-${VERSION}"
 # no parent directory
 SDK="warsow_21_sdk.tar.gz"
 # ./warsow_20
-DATA="warsow_21_unified.tar.gz"
-
-tar -C "${PKG}/usr/doc/${PRGNAM}-${VERSION}" -xvf "$DATA" ./warsow_21/docs/
-mv "${PKG}/usr/doc/${PRGNAM}-${VERSION}/warsow_21/docs/"* "${PKG}/usr/doc/${PRGNAM}-${VERSION}/"
-rm -rf "${PKG}/usr/doc/${PRGNAM}-${VERSION}/warsow_21/"
-tar -C "${PKG}/usr/share/${PRGNAM}" -xvf "$DATA" ./warsow_21/basewsw
-mv "${PKG}/usr/share/${PRGNAM}/warsow_21/"* "${PKG}/usr/share/${PRGNAM}"
-rm -rf "${PKG}/usr/share/${PRGNAM}/warsow_21/"
+DATA="warsow-2.1.2.tar.gz"
+
+tar -C "${PKG}/usr/doc/${PRGNAM}-${VERSION}" -xvf "$DATA" warsow-2.1.2/docs/
+mv "${PKG}/usr/doc/${PRGNAM}-${VERSION}/warsow-2.1.2/docs/"* "${PKG}/usr/doc/${PRGNAM}-${VERSION}/"
+rm -rf "${PKG}/usr/doc/${PRGNAM}-${VERSION}/warsow-2.1.2/"
+tar -C "${PKG}/usr/share/${PRGNAM}" -xvf "$DATA" warsow-2.1.2/basewsw
+mv "${PKG}/usr/share/${PRGNAM}/warsow-2.1.2/"* "${PKG}/usr/share/${PRGNAM}"
+rm -rf "${PKG}/usr/share/${PRGNAM}/warsow-2.1.2/"
 
 # unpack sdk
 tar -C "${TMP}/${PRGNAM}-${VERSION}" -xvf "$SDK" warsow_21_sdk/
diff --git a/games/warsow/warsow.info b/games/warsow/warsow.info
index 7ba2e77188..a409c5e059 100644
--- a/games/warsow/warsow.info
+++ b/games/warsow/warsow.info
@@ -1,9 +1,9 @@
 PRGNAM="warsow"
-VERSION="2.1"
+VERSION="2.1.2"
 HOMEPAGE="https://www.warsow.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/warsow_21_unified.tar.gz \
+DOWNLOAD="https://warsow.net/warsow-2.1.2.tar.gz \
           http://ponce.cc/slackware/sources/repo/warsow_21_sdk.tar.gz"
-MD5SUM="fac70b30d7295c0bc4c3f0432c4b7937 \
+MD5SUM="ec3e8c20a491d08b2f7753ee6e700bbe \
         56c02b5e9bd6f921fbc980e868c2b48d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index 98e4ceb485..a57212b343 100644
--- a/games/wesnoth/wesnoth.SlackBuild
+++ b/games/wesnoth/wesnoth.SlackBuild
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wesnoth
-VERSION=${VERSION:-1.14.14}
+VERSION=${VERSION:-1.14.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info
index ef8051a5cf..0ed9cd9009 100644
--- a/games/wesnoth/wesnoth.info
+++ b/games/wesnoth/wesnoth.info
@@ -1,8 +1,8 @@
 PRGNAM="wesnoth"
-VERSION="1.14.14"
+VERSION="1.14.15"
 HOMEPAGE="http://www.wesnoth.org"
-DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.14.14.tar.bz2"
-MD5SUM="ce954e571b489c97e3f50011d9fe21a8"
+DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.14.15.tar.bz2"
+MD5SUM="f3149cf74ae55c490739494c45179fa7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 SDL2_image SDL2_mixer SDL2_ttf"
diff --git a/games/wordwarvi/wordwarvi.SlackBuild b/games/wordwarvi/wordwarvi.SlackBuild
index 9fba3c69d8..79f7608367 100644
--- a/games/wordwarvi/wordwarvi.SlackBuild
+++ b/games/wordwarvi/wordwarvi.SlackBuild
@@ -6,11 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210224 bkw: update for v1.0.4
 # 20170302 bkw: use long-format github URL, add .desktop, BUILD=2
 
 PRGNAM=wordwarvi
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -49,11 +50,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make OPTIMIZE_FLAG="$SLKCFLAGS" MANDIR=/usr/man SCREENSAVERFLAG=-DDO_INHIBIT_SCREENSAVER
 make install MANDIR=/usr/man DESTDIR=$PKG
diff --git a/games/wordwarvi/wordwarvi.info b/games/wordwarvi/wordwarvi.info
index 2ee105d536..0a80d673d2 100644
--- a/games/wordwarvi/wordwarvi.info
+++ b/games/wordwarvi/wordwarvi.info
@@ -1,8 +1,8 @@
 PRGNAM="wordwarvi"
-VERSION="1.0.2"
+VERSION="1.0.4"
 HOMEPAGE="https://github.com/smcameron/wordwarvi"
-DOWNLOAD="https://github.com/smcameron/wordwarvi/archive/v1.0.2/wordwarvi-1.0.2.tar.gz"
-MD5SUM="c55fad24f42ad2be0e06ac70f5fbc0be"
+DOWNLOAD="https://github.com/smcameron/wordwarvi/archive/v1.0.4/wordwarvi-1.0.4.tar.gz"
+MD5SUM="3b25d6cc973cdba85db37266b73de950"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="portaudio"
diff --git a/games/xcowsay/README b/games/xcowsay/README
index 26b743f4fa..c401df986d 100644
--- a/games/xcowsay/README
+++ b/games/xcowsay/README
@@ -1,3 +1,5 @@
+xcowsay (display a cute cow and speech bubble)
+
 xcowsay displays a cute cow and message on your desktop. Inspired by
 the original cowsay.
 
@@ -9,11 +11,13 @@ xcowsay includes all these amazing features:
  * Can draw thought and speech bubbles.
  * Daemon mode! Send your cow messages over DBus!
  * Three different sized cows provided.
- * fortune(6) wrapper program xcowfortune: cow will deliver pearls of wisdom!
+ * fortune(6) wrapper xcowfortune: cow will deliver pearls of wisdom!
  * Replace the naffness that is xmessage(1).
  * Should work with any window manager.
  * Supports UTF-8 characters properly.
  * Use alternative non-cow images if you like.
 
-Note: Please don't ask for this to be updated for version 1.5. I know
-it exists. See README_1.5.txt for an explanation.
+If you're using older hardware and have problems with this, you may
+have better results with xcowsay-1.4. To do this, get the old source:
+https://github.com/nickg/xcowsay/releases/download/v1.4/xcowsay-1.4.tar.gz
+and run the script with VERSION=1.4 in the environment.
diff --git a/games/xcowsay/README_1.5.txt b/games/xcowsay/README_1.5.txt
deleted file mode 100644
index 4e71bd4fd5..0000000000
--- a/games/xcowsay/README_1.5.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-For now, the xcowsay SlackBuild remains one version behind the latest
-release. This is because the latest (1.5) release doesn't work for
-everybody.
-
-Starting with version 1.5, xcowsay requires a compositing window manager
-that supports alpha channels. This build is for version 1.4, the last
-one which works correctly with traditional window managers such as
-WindowMaker or FVWM. Version 1.4 also works fine in environments where
-1.5 would work. If you *really* want version 1.5, download its source
-to the SlackBuild's directory and build it with a command like:
-
-# VERSION=1.5 BUILD=1 TAG=_custom ./xcowsay.SlackBuild
-
-Hopefully, some future version of xcowsay will make the compositing
-support optional (and maybe even autodetected), so this script can be
-updated to track new xcowsay releases again.
diff --git a/games/xcowsay/slack-desc b/games/xcowsay/slack-desc
index 2fc416d549..ad71e0f4cd 100644
--- a/games/xcowsay/slack-desc
+++ b/games/xcowsay/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-xcowsay: xcowsay (displays a cute cow and message on your desktop)
+xcowsay: xcowsay (display a cute cow and speech bubble)
 xcowsay:
 xcowsay: xcowsay displays a cute cow and message on your desktop. Inspired by
 xcowsay: the original cowsay.
diff --git a/games/xcowsay/xcowsay.SlackBuild b/games/xcowsay/xcowsay.SlackBuild
index 0605052be1..1cb75cce7e 100644
--- a/games/xcowsay/xcowsay.SlackBuild
+++ b/games/xcowsay/xcowsay.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw:
+# - Update for v1.5.1. The changelog for this version says this:
+#   Fix black squares around cow and bubble on non-compositing window manager.
+#   And it works fine in the window managers I've tried it with, so
+#   it's probably fine to upgrade. Add note to README about how to
+#   build 1.4, if someone needs it.
+
 # 20200221 bkw:
 # - BUILD=2
 # - Add man pages for xcow(dream|fortune|think)
@@ -16,7 +23,7 @@
 #   at some point.
 
 PRGNAM=xcowsay
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/games/xcowsay/xcowsay.info b/games/xcowsay/xcowsay.info
index 6ec9929895..c653ac4f29 100644
--- a/games/xcowsay/xcowsay.info
+++ b/games/xcowsay/xcowsay.info
@@ -1,8 +1,8 @@
 PRGNAM="xcowsay"
-VERSION="1.4"
+VERSION="1.5.1"
 HOMEPAGE="http://www.doof.me.uk/xcowsay/"
-DOWNLOAD="https://github.com/nickg/xcowsay/releases/download/v1.4/xcowsay-1.4.tar.gz"
-MD5SUM="1e9933c6f48f1e8fffbeaeb6ba0e2bc8"
+DOWNLOAD="https://github.com/nickg/xcowsay/releases/download/r1.5.1/xcowsay-1.5.1.tar.gz"
+MD5SUM="e57cfd50979de8cd590968a8d3230eaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/xmoto/README b/games/xmoto/README
index c77dd23955..f14f3cbb06 100644
--- a/games/xmoto/README
+++ b/games/xmoto/README
@@ -1,4 +1,7 @@
-X-Moto is a challenging 2D motocross platform game, where physics play an
-all important role in the gameplay. You need to control your bike to its
-limit, if you want to have a chance finishing the more difficult of the
-challenges.
+X-Moto is a challenging 2D motocross platform game, where physics play
+an all important role in the gameplay. You need to control your bike to
+its limit, if you want to have a chance finishing the more difficult of
+the challenges.
+
+On first run, if you see an error "Unable to get xmDb version",
+remove the file $HOME/.local/share/xmoto/xm.db
diff --git a/games/xmoto/gcc-4.7.patch b/games/xmoto/gcc-4.7.patch
deleted file mode 100644
index 59a6d8d974..0000000000
--- a/games/xmoto/gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
-+++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "Log.h"
- #include "VExcept.h"
- #include <sstream>
-+#include <unistd.h>
-
- std::vector<std::string>* System::getDisplayModes(int windowed) {
-     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild
index 539df636d7..225478035b 100644
--- a/games/xmoto/xmoto.SlackBuild
+++ b/games/xmoto/xmoto.SlackBuild
@@ -4,13 +4,13 @@
 # Maintained by Alex Word <alex_word86@yahoo.com>
 
 PRGNAM=xmoto
-VERSION=${VERSION:-0.5.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.6.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -21,8 +21,8 @@ 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"
@@ -37,46 +37,37 @@ fi
 
 set -e
 
-rm -rf $PKG $TMP/$PRGNAM-$VERSION
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -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 {} \;
-
-patch -p1 < $CWD/gcc-4.7.patch
-
-CFLAGS="$SLKCFLAGS -DdDOUBLE" \
-CXXFLAGS="$SLKCFLAGS -DdDOUBLE" \
-LDFLAGS="-ldl" \
-./configure \
-  --prefix=/usr \
-  --bindir=/usr/games \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --localedir=/usr/share/locale \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-localesdir=/usr/share/locale \
-  --disable-dependency-tracking \
-  --enable-threads=posix \
-  --with-asian-ttf-file="/usr/share/fonts/TTF/wqy-zenhei.ttc" \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -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/share/{pixmaps,applications}
-install -m 0644 extra/$PRGNAM.xpm $PKG/usr/share/pixmaps
-install -m 0644 extra/$PRGNAM.desktop $PKG/usr/share/applications
-
+mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # Don't include fonts that are already shipped with Slackware.
@@ -86,9 +77,7 @@ for i in $PKG/usr/share/$PRGNAM/Textures/Fonts/*.ttf; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README TODO ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog ChangeLog.SDL_gfx README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -96,4 +85,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 -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/xmoto/xmoto.info b/games/xmoto/xmoto.info
index f10ea5df19..ac1bb84b56 100644
--- a/games/xmoto/xmoto.info
+++ b/games/xmoto/xmoto.info
@@ -1,10 +1,10 @@
 PRGNAM="xmoto"
-VERSION="0.5.10"
+VERSION="0.6.1"
 HOMEPAGE="http://xmoto.tuxfamily.org/"
-DOWNLOAD="http://download.tuxfamily.org/xmoto/xmoto/0.5.10/xmoto-0.5.10-src.tar.gz"
-MD5SUM="d15f1c4e498d937b943db0b6aea437f1"
+DOWNLOAD="https://github.com/xmoto/xmoto/archive/0.6.1/xmoto-0.6.1.tar.gz"
+MD5SUM="88725490243e69d5ab5cde349fa5fa3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua ode libxdg-basedir"
+REQUIRES="lua ode libxdg-basedir cmake-202x"
 MAINTAINER="Alex Word"
 EMAIL="alex_word86@yahoo.com"
diff --git a/games/xonotic/xonotic.info b/games/xonotic/xonotic.info
index 12276b852d..db2c172acd 100644
--- a/games/xonotic/xonotic.info
+++ b/games/xonotic/xonotic.info
@@ -6,5 +6,5 @@ MD5SUM="1bd46c1fb79aae42bb13e74f5a0ff46e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Симонъ С. Болокановъ"
+MAINTAINER="S. S. Bolokanar"
 EMAIL="sbolokanov@abv.bg"
diff --git a/games/xroar/README b/games/xroar/README
index 6b78012d7a..66ac73893d 100644
--- a/games/xroar/README
+++ b/games/xroar/README
@@ -9,24 +9,5 @@ http://en.wikipedia.org/wiki/TRS-80_Color_Computer
 http://archive.worldofdragon.org/index.php?title=Main_Page
 http://archive.worldofdragon.org/archive/index.php
 
-Optional dependencies:
+For optional dependencies and build options, see README_SBo.txt.
 
-SDL2 - if you prefer SDL2 to SDL1, install SDL2 before building xroar.
-  I haven't noticed any difference between xroar built with SDL1 or SDL2,
-  but the option is there in case you need it. If SDL2 is installed,
-  you can build without it by setting SDL2=no in the environment.
-
-gtkglext - if you want a full GTK+ user interface, install gtkglext
-  before building xroar. If gtkglext is installed, you can build
-  without it by setting GTKGLEXT=no in the environment.
-
-jack - if you want to use JACK for audio output, install jack and set
-  JACK=yes in the environment before building xroar. If JACK audio has
-  x-runs, try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/games/xroar'.
-
-Other build options (environment variables):
-
-OSS - use OSS for audio? Default is "no", export OSS="yes" to enable.
-      Most users won't need this.
-
-PULSE - use PulseAudio? Default is "yes", export PULSE="no" to disable.
diff --git a/games/xroar/README_SBo.txt b/games/xroar/README_SBo.txt
new file mode 100644
index 0000000000..c7ccc12db3
--- /dev/null
+++ b/games/xroar/README_SBo.txt
@@ -0,0 +1,40 @@
+Optional Dependencies
+=====================
+
+SDL2 - If this is installed, xroar's alternate "bare-bones" SDL2
+  user inteface will be available via the "-ui sdl" option.
+
+jack - if you want to use JACK for audio output, install jack and set
+  JACK=yes in the environment before building xroar. If JACK audio has
+  x-runs, try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/games/xroar'.
+
+
+Environment Variables
+=====================
+
+GTKGLEXT - If you have gtkglext installed, but don't want to build
+  xroar with it, export GTKGLEXT=no [1] [2].
+
+SDL2 - If you have SDL2 installed, but don't want to build xroar with
+ it, export SDL2=no [2].
+
+OSS - use OSS for audio? Default is "no", export OSS="yes" to enable.
+  Most users won't need this.
+
+PULSE - use PulseAudio? Default is "yes", export PULSE="no" to disable.
+
+
+Notes
+=====
+
+[1]: Yes, gtkglext is optional, despite being listed in REQUIRES in
+     the .info file. There's no "either-or" syntax for REQUIRES, so
+     I had to list either gtkglext or SDL2, and the gtkglext UI
+     is a lot nicer so it's what most people will want.
+
+[2]: At least one of SDL2 or gtkglext is required, so you can't build
+     with SDL2=no GTKGLEXT=no. If you want to be super-pedantic, yes,
+     it *is* possible to build xroar without either gtkglext or SDL2,
+     but the result is that xroar won't display anything at all. This
+     is useless and confusing, nobody wants it, and I'm not willing to
+     support it.
diff --git a/games/xroar/slack-desc b/games/xroar/slack-desc
index c87520bc5f..4a27a9c5ab 100644
--- a/games/xroar/slack-desc
+++ b/games/xroar/slack-desc
@@ -13,7 +13,7 @@ xroar: DS and Windows. Due to hardware similarities, XRoar also emulates
 xroar: the Tandy Colour Computer (CoCo) models 1 & 2.
 xroar:
 xroar: This package is built with:
-xroar: SDL version: @SDLVER@ | GtkGLExt: @GTKGLEXT@
-xroar: PulseAudio: @PULSE@ | OSS audio: @OSS@ | JACK audio: @JACK@
+xroar:     GtkGLExt: @GTKGLEXT@ |      SDL2: @SDL2@ |
+xroar:   PulseAudio: @PULSE@ | OSS audio: @OSS@ | JACK audio: @JACK@
 xroar:
 xroar:
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index c068ce6b19..9a38359102 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201025 bkw:
+# - update for 0.36.2
+# - the SDL 1.x UI is gone. One or the other of SDL2, gtkglext is
+#   required. Actually not really: you can build without either one,
+#   in which case you get an xroar that has no display at all! Added
+#   code to the script to prevent this from happening.
+
 # 20191130 bkw:
 # - update for 0.35.4
 # - restore the SDL1 build, now that it builds again
@@ -31,7 +38,7 @@
 # 20170122 bkw: update for 0.34.7
 
 PRGNAM=xroar
-VERSION=${VERSION:-0.35.4}
+VERSION=${VERSION:-0.36.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,40 +71,50 @@ fi
 
 set -e
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+### Build options
+# Lots of these. Check them immediately (don't bother to extract the
+# source if there's a problem).
 
 # Most users will want to leave OSS and PULSE alone.
-
-# Can't check ldd output to see if OSS is built-in, so take
-# some care to leave the value of OSS presentable for use in
-# the slack-desc.
-OSS="${OSS:-no}"
-case "$OSS" in
-  y*|Y*) OSS=yes ;;
-  *)     OSS=no  ;;
-esac
-
-[ "$OSS"          = "yes" ] ||   OSSOPT="--without-oss"
+[ "${OSS:-no}"    = "yes" ] ||   OSSOPT="--without-oss"
 [ "${PULSE:-yes}" = "yes" ] || PULSEOPT="--without-pulse"
 
 # Not sure why anyone would need this, but it's easy to support.
 JACKOPT="--without-jack"
 [ "${JACK:-no}" = "yes" ] && JACKOPT="--with-jack"
 
-[ "${SDL2:-yes}" = "no" ] && SDL2OPT="--without-sdl2"
+SDL2=${SDL2:-yes}
+GTKGLEXT=${GTKGLEXT:-yes}
 
-[ "${GTKGLEXT:-yes}" = "no" ] && GTKGLOPT="--without-gtkgl"
+if [ "$SDL2" = "yes" ]; then
+  pkg-config --exists sdl2 || SDL2=no
+fi
 
-# fix underlinking via LDFLAGS instead of a .diff
+if [ "$GTKGLEXT" = "yes" ]; then
+  pkg-config --exists gtkglext-1.0 || GTKGLEXT=no
+fi
 
+echo "=== SDL2=$SDL2, GTKGLEXT=$GTKGLEXT"
+if [ "$SDL2" != "yes" ] && [ "$GTKGLEXT" != "yes" ]; then
+  echo "*** Fatal error: cannot build without at least one of SDL2 or gtkglext" 1>&2
+  exit 1
+fi
+
+[ "${SDL2:-yes}"     != "yes" ] && SDL2OPT="--without-sdl2"
+[ "${GTKGLEXT:-yes}" != "yes" ] && GTKGLOPT="--without-gtkgl"
+### End of build options.
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# fix underlinking via LDFLAGS instead of a .diff
 LDFLAGS="-lm" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -116,16 +133,16 @@ make
 make install DESTDIR=$PKG
 strip $PKG/usr/games/$PRGNAM
 
-# set these for use in the slack-desc
-SDLVER=1.2
-JACK=no
-GTKGLEXT=no
-PULSE=no
+# reset these for use in the slack-desc
+SDL2=no; JACK=no; GTKGLEXT=no; PULSE=no; OSS=no
+
+# actually examine the binary to figure out build options.
 ldd $PKG/usr/games/$PRGNAM > ldd.tmp
-grep -q libSDL2 ldd.tmp     && SDLVER=2.0
+grep -q libSDL2 ldd.tmp     && SDL2=yes
 grep -q libjack ldd.tmp     && JACK=yes
 grep -q libgtkglext ldd.tmp && GTKGLEXT=yes
 grep -q libpulse.so ldd.tmp && PULSE=yes
+strings $PKG/usr/games/$PRGNAM | grep -q /dev/dsp && OSS=yes
 
 # man page needs to be in section 6, since this is in games/
 mkdir -p $PKG/usr/man/man6
@@ -165,10 +182,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 sed -e "s,@JACK@,$JACK," \
-    -e "s,@SDLVER@,$SDLVER," \
+    -e "s,@SDL2@,$SDL2," \
     -e "s,@GTKGLEXT@,$GTKGLEXT," \
     -e "s,@PULSE@,$PULSE," \
     -e "s,@OSS@,$OSS," \
+    -e "s,: no,& ,g" \
     $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index f40281e8f7..88d6b3a35a 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,10 +1,10 @@
 PRGNAM="xroar"
-VERSION="0.35.4"
+VERSION="0.36.2"
 HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.35/xroar-0.35.4.tar.gz"
-MD5SUM="072fb6c260840ff6e6f12083a4907939"
+DOWNLOAD="http://www.6809.org.uk/xroar/dl/xroar-0.36.2.tar.gz"
+MD5SUM="c1bcc681508c5e97c335c7d71b2abd4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="xroar-roms"
+REQUIRES="gtkglext xroar-roms"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/zseal/README b/games/zseal/README
new file mode 100644
index 0000000000..001a18bc38
--- /dev/null
+++ b/games/zseal/README
@@ -0,0 +1,18 @@
+zseal
+open source client for FICS Timeseal v2 for Linux/Unix systems
+
+Timeseal is a protocol for network lag reporting and compensation used by the FICS chess
+server (freechess.org).  Version 2 of the protocol provides better delay stats as the server
+actively pings the client periodically.  FICS's FTP repository was taken down a few years
+ago and was never put back on.
+Since then, there has been nowhere to download a trustable timeseal client for Linux systems.
+
+
+To use with xboard, append "-icshelper zseal" to your normal xboard command line.
+
+  xboard -ics -icshost freechess.org -icsport 5000 -icshelper zseal
+
+
+Assuming Slackware's gnuchess package is already installed on your system,
+the install script will integrate and enable zseal in eboard automatically.
+(Otherwise, follow the instructions for eboard configuration in /usr/doc/zseal-1.0/README.)
diff --git a/games/zseal/slack-desc b/games/zseal/slack-desc
new file mode 100644
index 0000000000..ff3737a177
--- /dev/null
+++ b/games/zseal/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+zseal: zseal (FICS Timeseal client)
+zseal:
+zseal: An open source client for FICS Timeseal v2 for Linux/Unix systems.
+zseal:
+zseal:
+zseal: (C) 2016 Felipe Bergo (Pulga @ FICS), fbergo at gmail dot com
+zseal: https://github.com/fbergo/zseal 
+zseal:
+zseal: 
+zseal:
+zseal:
diff --git a/games/zseal/zseal.SlackBuild b/games/zseal/zseal.SlackBuild
new file mode 100644
index 0000000000..3bb875b3f3
--- /dev/null
+++ b/games/zseal/zseal.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# Slackware build script for zseal (an open-source implementation of Timeseal v2 for FICS.)
+#
+# Copyright 2020 by Jay, Seattle, WA.
+# 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=zseal
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i686) ARCH=i686 ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# Caveat emptor
+case "$ARCH" in
+    i?86) ;;
+  x86_64) ;;
+       *) echo -e "\nBuild for $ARCH is untested!!"
+          echo -e "Press Ctrl-C within ten seconds to abort,"
+          echo -e "or press ENTER to continue at your own risk.\n"
+          read -t 10 PLACEHOLDER ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Minor README fixes:
+sed -i "19s/.*/are not liable for anything the software does to you or your stuff; derived works must/" README
+sed -i '24d' README
+sed -i "24i\
+run './configure' (to generate config.h) \
+\nrun 'make' to compile. \
+\n \
+\nThe zseal binary will be generated in the current directory" README
+
+sed -i "s/-O2/$SLKCFLAGS/" Makefile
+
+./configure
+make
+
+mkdir -p $PKG/usr/bin $PKG/usr/share/eboard $PKG/usr/doc/$PRGNAM-$VERSION
+
+cp zseal $PKG/usr/bin
+ln -sf /usr/bin/zseal $PKG/usr/share/eboard/timeseal.$( uname -s )
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+cp -a README CHANGELOG LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/zseal.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/zseal.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/zseal/zseal.info b/games/zseal/zseal.info
new file mode 100644
index 0000000000..68a884b00e
--- /dev/null
+++ b/games/zseal/zseal.info
@@ -0,0 +1,10 @@
+PRGNAM="zseal"
+VERSION="1.0"
+HOMEPAGE="https://github.com/fbergo/zseal"
+DOWNLOAD="https://github.com/fbergo/zseal/archive/v1.0/zseal-1.0.tar.gz"
+MD5SUM="835dec238d0ac35d51fa17e25f3653cd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay"
+EMAIL="ld.jay@protonmail.com"
diff --git a/gis/Fiona/Fiona.SlackBuild b/gis/Fiona/Fiona.SlackBuild
index 10b5457a1e..e6f26cb2f1 100644
--- a/gis/Fiona/Fiona.SlackBuild
+++ b/gis/Fiona/Fiona.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Fiona
-VERSION=${VERSION:-1.8.17}
+VERSION=${VERSION:-1.8.19}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/Fiona/Fiona.info b/gis/Fiona/Fiona.info
index 2bdf8b7c22..d501116dc5 100644
--- a/gis/Fiona/Fiona.info
+++ b/gis/Fiona/Fiona.info
@@ -1,8 +1,8 @@
 PRGNAM="Fiona"
-VERSION="1.8.17"
+VERSION="1.8.19"
 HOMEPAGE="https://github.com/Toblerity/Fiona"
-DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.8.17/Fiona-1.8.17.tar.gz"
-MD5SUM="34b5823093ff4b582b0796c6f7c96d0b"
+DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.8.19/Fiona-1.8.19.tar.gz"
+MD5SUM="20ec67ac2f83127ff178af4c061f9df9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal munch python3-six python3-Cython python3-attrs click-plugins cligj"
diff --git a/gis/OTB/OTB.SlackBuild b/gis/OTB/OTB.SlackBuild
index cb23a31e93..54837333d5 100644
--- a/gis/OTB/OTB.SlackBuild
+++ b/gis/OTB/OTB.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OTB
-VERSION=${VERSION:-7.1.0}
+VERSION=${VERSION:-7.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,6 +83,10 @@ sed -i '1i\using namespace std;' \
   Modules/ThirdParty/OssimPlugins/src/ossim/*.{h,cpp} \
   Modules/ThirdParty/OssimPlugins/src/ossim/otb/*.cpp \
   Modules/Adapters/OSSIMAdapters/src/*.cxx
+sed -i "s/[{]0.0[}]//" \
+  Modules/{Learning,Segmentation,Filtering,Registration}/*/include/*.h \
+  Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h \
+  Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
 
 MONTEVERDI=${MONTEVERDI:-OFF}
 BUILD_MONTEVERDI="-DOTB_USE_QWT=$MONTEVERDI -DOTB_USE_GLEW=$MONTEVERDI -DOTB_USE_OPENGL=$MONTEVERDI"
@@ -104,10 +108,8 @@ cd build
     -DOTB_USE_OPENCV=${OPENCV:-OFF} \
     -DOTB_USE_OPENMP=ON \
     -DOTB_USE_SHARK=ON \
+    -DOTB_INSTALL_PYTHON_DIR=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -DOTB_WRAP_PYTHON=OFF \
-    -DOTB_INSTALL_PYTHON_DIR=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
-    -DOTB_WRAP_PYTHON3=ON \
-    -DOTB_INSTALL_PYTHON3_DIR=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -DOTB_INSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \
     -DGDAL_CONFIG_CHECKING:BOOL=OFF \
     $BUILD_MONTEVERDI \
diff --git a/gis/OTB/OTB.info b/gis/OTB/OTB.info
index ebfc9c5027..6d6fe86584 100644
--- a/gis/OTB/OTB.info
+++ b/gis/OTB/OTB.info
@@ -1,8 +1,8 @@
 PRGNAM="OTB"
-VERSION="7.1.0"
+VERSION="7.2.0"
 HOMEPAGE="http://orfeo-toolbox.org/otb/"
-DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/7.1.0/OTB-7.1.0.tar.gz"
-MD5SUM="e8e01a9ef4fb77a44f4aa618cd51863f"
+DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/7.2.0/OTB-7.2.0.tar.gz"
+MD5SUM="925a7bcf121c72a24dc99924c1a0c02a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas gdal ITK OpenSceneGraph muParser python3 ossim Shark tinyxml"
diff --git a/gis/OWSLib/OWSLib.SlackBuild b/gis/OWSLib/OWSLib.SlackBuild
index c56f53b8a3..2a6acc9a33 100644
--- a/gis/OWSLib/OWSLib.SlackBuild
+++ b/gis/OWSLib/OWSLib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OWSLib
 
-# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OWSLib
-VERSION=${VERSION:-0.20.0}
+VERSION=${VERSION:-0.23.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/OWSLib/OWSLib.info b/gis/OWSLib/OWSLib.info
index 772ead50e0..0961aa59ea 100644
--- a/gis/OWSLib/OWSLib.info
+++ b/gis/OWSLib/OWSLib.info
@@ -1,8 +1,8 @@
 PRGNAM="OWSLib"
-VERSION="0.20.0"
+VERSION="0.23.0"
 HOMEPAGE="https://pypi.python.org/pypi/OWSLib/"
-DOWNLOAD="https://github.com/geopython/OWSLib/archive/0.20.0/OWSLib-0.20.0.tar.gz"
-MD5SUM="f5a39aa237e2fddb663f2caa20e9275f"
+DOWNLOAD="https://github.com/geopython/OWSLib/archive/0.23.0/OWSLib-0.23.0.tar.gz"
+MD5SUM="af19b7bb8222419a7c8eb05287cef14a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-dateutil python3-dateutil pytz lxml six python3-six"
diff --git a/gis/SFCGAL/SFCGAL.SlackBuild b/gis/SFCGAL/SFCGAL.SlackBuild
index fb8e0f06bf..1934857eab 100644
--- a/gis/SFCGAL/SFCGAL.SlackBuild
+++ b/gis/SFCGAL/SFCGAL.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for SFCGAL
 
-# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SFCGAL
-VERSION=${VERSION:-1.3.7}
+VERSION=${VERSION:-1.3.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,10 +60,10 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
+rm -rf $TMP/$PRGNAM-v$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,6 +73,7 @@ find -L . \
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \
diff --git a/gis/SFCGAL/SFCGAL.info b/gis/SFCGAL/SFCGAL.info
index 7bddb85d0b..6409b92f2b 100644
--- a/gis/SFCGAL/SFCGAL.info
+++ b/gis/SFCGAL/SFCGAL.info
@@ -1,10 +1,10 @@
 PRGNAM="SFCGAL"
-VERSION="1.3.7"
-HOMEPAGE="http://www.sfcgal.org"
-DOWNLOAD="https://github.com/Oslandia/SFCGAL/archive/v1.3.7/SFCGAL-1.3.7.tar.gz"
-MD5SUM="12781da5ba97c094b222ca5bdda4d71b"
+VERSION="1.3.9"
+HOMEPAGE="https://oslandia.gitlab.io/SFCGAL/"
+DOWNLOAD="https://gitlab.com/Oslandia/SFCGAL/-/archive/v1.3.9/SFCGAL-v1.3.9.tar.gz"
+MD5SUM="99c08d524aff93be0d30a48d821783ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="CGAL"
+REQUIRES="CGAL cmake-202x"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/cartopy/cartopy.info b/gis/cartopy/cartopy.info
index 968658e101..e7c1595535 100644
--- a/gis/cartopy/cartopy.info
+++ b/gis/cartopy/cartopy.info
@@ -2,7 +2,7 @@ PRGNAM="cartopy"
 VERSION="0.18.0"
 HOMEPAGE="https://scitools.org.uk/cartopy/"
 DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.18.0/cartopy-0.18.0.tar.gz"
-MD5SUM="8e7db886f3192f5431f841211816b540"
+MD5SUM="792c63511641c843759c5b774f2a8b33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos python3-matplotlib proj pyshp scipy3 Shapely"
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index bbe278050d..89c9e3878b 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for GDAL
 
 # Copyright 2009 Marco Cecchetti <mrc.ild@gmail.com>
+# Updated 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=gdal
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -130,7 +131,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --without-grib \
   --with-static-proj4 \
   --with-mysql \
-  --with-python \
+  --with-python=/usr/bin/python3 \
   --with-poppler \
   --with-libtiff=internal \
   --with-rename-internal-libtiff-symbols=yes \
@@ -143,23 +144,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-cd swig/python
-  rm -rf build
-  python3 setup.py build
-  python3 setup.py install --root=$PKG --prefix=/usr
-cd - >/dev/null
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-make -f GNUmakefile -B man
-make install-man DESTDIR=$PKG
-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
-
-make -f GNUmakefile -B docs
-# --docdir is ignored :-(
-make install-docs DESTDIR=$PKG INST_DOCS=/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   COMMITTERS HOWTO-RELEASE LICENSE.TXT NEWS PROVENANCE.TXT VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index 86514a9a92..6f9bdf4d9e 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -1,8 +1,8 @@
 PRGNAM="gdal"
-VERSION="3.0.4"
+VERSION="3.2.2"
 HOMEPAGE="https://www.gdal.org/"
-DOWNLOAD="https://download.osgeo.org/gdal/3.0.4/gdal-3.0.4.tar.xz"
-MD5SUM="8996bbee51e73b5a968d8d0f48895ac8"
+DOWNLOAD="https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz"
+MD5SUM="c656be582f7beb528c66486cd1fca7a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos proj python3"
diff --git a/gis/geopandas/geopandas.SlackBuild b/gis/geopandas/geopandas.SlackBuild
index c2a3e68d13..5a1fdc5d8c 100644
--- a/gis/geopandas/geopandas.SlackBuild
+++ b/gis/geopandas/geopandas.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for geopandas
 
-# Copyright 2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2020-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geopandas
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/geopandas/geopandas.info b/gis/geopandas/geopandas.info
index 2c05cd1f02..e125839631 100644
--- a/gis/geopandas/geopandas.info
+++ b/gis/geopandas/geopandas.info
@@ -1,8 +1,8 @@
 PRGNAM="geopandas"
-VERSION="0.7.0"
+VERSION="0.9.0"
 HOMEPAGE="https://github.com/geopandas/geopandas"
-DOWNLOAD="https://github.com/geopandas/geopandas/archive/v0.7.0/geopandas-0.7.0.tar.gz"
-MD5SUM="41c65994519205f8fbbfb884c8882178"
+DOWNLOAD="https://github.com/geopandas/geopandas/archive/v0.9.0/geopandas-0.9.0.tar.gz"
+MD5SUM="d4f8ca22c882d80f40a48f4ac0983c7c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geopy Fiona psycopg2 pyproj python3-pandas Shapely"
diff --git a/gis/geopy/geopy.SlackBuild b/gis/geopy/geopy.SlackBuild
index 9269cb81e5..e5fbdc86c6 100644
--- a/gis/geopy/geopy.SlackBuild
+++ b/gis/geopy/geopy.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geopy
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/geopy/geopy.info b/gis/geopy/geopy.info
index 8384662134..90061ec356 100644
--- a/gis/geopy/geopy.info
+++ b/gis/geopy/geopy.info
@@ -1,8 +1,8 @@
 PRGNAM="geopy"
-VERSION="2.0.0"
+VERSION="2.1.0"
 HOMEPAGE="https://github.com/geopy/geopy"
-DOWNLOAD="https://github.com/geopy/geopy/archive/2.0.0/geopy-2.0.0.tar.gz"
-MD5SUM="3792c1776680c6af295242771943f8e1"
+DOWNLOAD="https://github.com/geopy/geopy/archive/2.1.0/geopy-2.1.0.tar.gz"
+MD5SUM="0573cc833b3566fd4c06f10f1646a252"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/gis/geos/geos.SlackBuild b/gis/geos/geos.SlackBuild
index b5148634fe..e42de54280 100644
--- a/gis/geos/geos.SlackBuild
+++ b/gis/geos/geos.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for geos
 # Written by Kyle Guinn <elyk03@gmail.com>
-# Maintained 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Maintained 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geos
-VERSION=${VERSION:-3.8.1}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/geos/geos.info b/gis/geos/geos.info
index e82a02dc53..935d9c6081 100644
--- a/gis/geos/geos.info
+++ b/gis/geos/geos.info
@@ -1,8 +1,8 @@
 PRGNAM="geos"
-VERSION="3.8.1"
+VERSION="3.9.1"
 HOMEPAGE="https://trac.osgeo.org/geos/"
-DOWNLOAD="https://download.osgeo.org/geos/geos-3.8.1.tar.bz2"
-MD5SUM="9d25df02a2c4fcc5a59ac2fb3f0bd977"
+DOWNLOAD="https://download.osgeo.org/geos/geos-3.9.1.tar.bz2"
+MD5SUM="efc4ce81bdbaa5e5c1caefe6c9b8553c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/gis/gj2ascii/gj2ascii.SlackBuild b/gis/gj2ascii/gj2ascii.SlackBuild
index aa5b014afa..fc4ce03bcb 100644
--- a/gis/gj2ascii/gj2ascii.SlackBuild
+++ b/gis/gj2ascii/gj2ascii.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gj2ascii
 
-# Copyright 2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=gj2ascii
 VERSION=${VERSION:-0.4.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,7 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/gis/gj2ascii/gj2ascii.info b/gis/gj2ascii/gj2ascii.info
index 40f0e4161a..b5d6b70281 100644
--- a/gis/gj2ascii/gj2ascii.info
+++ b/gis/gj2ascii/gj2ascii.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/geowurster/gj2ascii/archive/0.4.1/gj2ascii-0.4.1.ta
 MD5SUM="d2eb99fc027e83675fe4c2515fb781eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Shapely Fiona click numpy rasterio"
+REQUIRES="Shapely Fiona rasterio"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/google-earth/README b/gis/google-earth/README
index 941e5bece5..a39cf206a7 100644
--- a/gis/google-earth/README
+++ b/gis/google-earth/README
@@ -19,32 +19,24 @@ This should be safe to ignore - it will use other fonts (and the
 DejaVu fonts included with Slackware are based on the Bitstream fonts).
 
 NOTES:
-1) Google updates the GoogleEarth bin-file without changing the download
-   link location and they don't use version numbering in the filename 
-   (the version is more an internal numbering).  
-   
-   Therefore, this script is subject to failing (and a different MD5SUM) 
-   at any time due to the fact that you might get a newer version 
-   of GoogleEarth than what the script is designed to use. Please notify 
-   the maintainer if this is the case.
-
-2) Google Earth 7 is "LSB compliant" meaning it was built on a LSB system. 
-   Slackware however does not have that symlink which is part of the LSB 3.0 
-   specification. You'll need to create the symlink manually after installing 
-   the package:
-    
-   32-bit:    ln -sf /lib/ld-linux.so.2 /lib/ld-lsb.so.3
-   64-bit:    ln -sf /lib64/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
-
-3) Google Earth tends to crash when the 65-fonts-persian.conf is available on
-   the system. Please remove /etc/fonts/conf.d/65-fonts-persian.conf prior to
-   launching this application. The easiest way to do this is:
+1) Google Earth 7 is "LSB compliant" meaning it was built on a LSB
+   system.  Slackware however does not have that symlink which is part
+   of the LSB 3.0 specification.  Before, you had to add that symlink
+   manually; that is now handled in doinst.sh.
+
+2) Google Earth sometimes crashes when the 65-fonts-persian.conf is
+   available on the system. If you experience crashes, try removing
+   /etc/fonts/conf.d/65-fonts-persian.conf prior to launching this
+   application. The easiest way to do this is:
 
             mv /etc/fonts/conf.d/65-fonts-persian.conf \
                /etc/fonts/conf.d/65-fonts-persian.conf.old
 
-4) GoogleEarth now requires that you have OpenGL drivers installed on your
+3) GoogleEarth requires that you have OpenGL drivers installed on your
    system (and Xorg configured to use them). Not doing so will cause X
    to crash.
 
-5) On 32 bit, the VERSION is still at 7.3.0.3832.
+4) This is the legacy version 7.3.0, which is confirmed to run on
+   Slackware 14.2.  The newer versions (7.3.1 and later) tend to hang
+   on 14.2.  On startup, a nag screen will pop up advising you that a
+   new version is availble, which you can safely ignore.
diff --git a/gis/google-earth/doinst.sh b/gis/google-earth/doinst.sh
index cd40c461ab..76c4a738ca 100644
--- a/gis/google-earth/doinst.sh
+++ b/gis/google-earth/doinst.sh
@@ -11,3 +11,4 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
         /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
     fi
 fi
+
diff --git a/gis/google-earth/google-earth.SlackBuild b/gis/google-earth/google-earth.SlackBuild
index c6c6b03fe4..1ca770d92f 100644
--- a/gis/google-earth/google-earth.SlackBuild
+++ b/gis/google-earth/google-earth.SlackBuild
@@ -3,8 +3,9 @@
 # Slackware build script for google-earth
 
 # Copyright 2007-2013  Michiel van Wessem, Manchester, United Kingdom
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
+# Maintained 2021 by Lenard Spencer <lenardrspencer@gmail.com>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -30,7 +31,7 @@
 # and to Daniel de Kok and Alan_Hicks for their comments.
 
 PRGNAM=google-earth
-VERSION=${VERSION:-7.3.3.7786}
+VERSION=${VERSION:-7.3.0.3832}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,9 +62,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/google-earth-stable_current_${SRCARCH}.deb data.tar.xz | tar xJv
+ar p $CWD/google-earth-pro-stable_${VERSION}-r0_${SRCARCH}.deb data.tar.xz | tar xJv
 cd $PKG
 chown -R root:root .
+
 # Fix Google braindeadness (and mine)
 find . -type d -exec chmod 0755 {} \;
 find -L . \
@@ -101,5 +103,28 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Add ld-lsb.so symlink creation to doinst.sh
+if [ "$ARCH" = "x86_64" ]; then
+cat >> $PKG/install/doinst.sh << "EOF"
+# Create ld-lsb symlink
+( cd lib64
+  if [ ! -e ld-lsb-x86-64.so.3 ]; then
+    ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
+  fi
+)
+
+EOF
+else
+cat >> $PKG/install/doinst.sh << "EOF"
+# Create ld-lsb symlink
+( cd lib
+  if [ ! -e ld-lsb.so.3 ]; then
+    ln -sf ld-linux.so.2 ld-lsb.so.3
+  fi
+)
+
+EOF
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/gis/google-earth/google-earth.info b/gis/google-earth/google-earth.info
index 588bb62324..07621ca351 100644
--- a/gis/google-earth/google-earth.info
+++ b/gis/google-earth/google-earth.info
@@ -1,10 +1,10 @@
 PRGNAM="google-earth"
-VERSION="7.3.3.7786"
+VERSION="7.3.0.3832"
 HOMEPAGE="https://www.google.com/earth/index.html"
-DOWNLOAD="https://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb"
+DOWNLOAD="https://dl.google.com/dl/earth/client/GE7/release_7_3_0/google-earth-pro-stable_7.3.0.3832-r0_i386.deb"
 MD5SUM="5c298610ae4bd604fcfd54fdc32e53dd"
-DOWNLOAD_x86_64="https://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb"
-MD5SUM_x86_64="e26da562b45aa09d16210f97086eb358"
+DOWNLOAD_x86_64="https://dl.google.com/dl/earth/client/GE7/release_7_3_0/google-earth-pro-stable_7.3.0.3832-r0_amd64.deb"
+MD5SUM_x86_64="b9d8281257b7ebf0dfac1ab1d3578681"
 REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/gis/gpsbabel/gpsbabel.SlackBuild b/gis/gpsbabel/gpsbabel.SlackBuild
index 3caa41f120..7069748f58 100644
--- a/gis/gpsbabel/gpsbabel.SlackBuild
+++ b/gis/gpsbabel/gpsbabel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gpsbabel
 
-# Copyright 2017-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2017-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gpsbabel
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.7.0}
 SRCVER=${PRGNAM}_$(echo ${VERSION} | tr . _)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -85,8 +85,7 @@ sed -i \
 sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc
 sed -i 's|baseFile =  QApplication::applicationDirPath() + "/gmapbase.html";|baseFile = "/usr/share/gpsbabel/gmapbase.html";|' gui/map.cc
 
-# Fix the .desktop file and icon.  Thanks to Arch.
-sed -i 's|gpsbabelfe-bin|gpsbabelfe|' gui/gpsbabel.desktop
+# Resize the icon from 500x476 to 512x512.  Thanks to Arch.
 convert gui/images/appicon.png +set date:create +set date:modify -background none -gravity center -extent 512x512 gui/images/appicon.png
 
 ./configure \
diff --git a/gis/gpsbabel/gpsbabel.info b/gis/gpsbabel/gpsbabel.info
index d8cec64019..4e5ebfcbe3 100644
--- a/gis/gpsbabel/gpsbabel.info
+++ b/gis/gpsbabel/gpsbabel.info
@@ -1,8 +1,8 @@
 PRGNAM="gpsbabel"
-VERSION="1.6.0"
+VERSION="1.7.0"
 HOMEPAGE="https://www.gpsbabel.org/"
-DOWNLOAD="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_6_0/gpsbabel-gpsbabel_1_6_0.tar.gz"
-MD5SUM="accb9f923ebe1b2d2a00c67d0e1dc430"
+DOWNLOAD="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_7_0/gpsbabel-gpsbabel_1_7_0.tar.gz"
+MD5SUM="80a7d3455c741e1298b2fbce93bb6072"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libminizip qt5"
diff --git a/gis/osm2pgrouting/osm2pgrouting.SlackBuild b/gis/osm2pgrouting/osm2pgrouting.SlackBuild
index 85f927efd1..c733c2e057 100644
--- a/gis/osm2pgrouting/osm2pgrouting.SlackBuild
+++ b/gis/osm2pgrouting/osm2pgrouting.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for osm2pgrouting
 
-# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=osm2pgrouting
-VERSION=${VERSION:-2.3.6}
+VERSION=${VERSION:-2.3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,7 +82,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS.md COPYING NEWS Readme.md \
+  AUTHORS.md COPYING NEWS README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/gis/osm2pgrouting/osm2pgrouting.info b/gis/osm2pgrouting/osm2pgrouting.info
index ec5e008a9e..050108d4da 100644
--- a/gis/osm2pgrouting/osm2pgrouting.info
+++ b/gis/osm2pgrouting/osm2pgrouting.info
@@ -1,8 +1,8 @@
 PRGNAM="osm2pgrouting"
-VERSION="2.3.6"
+VERSION="2.3.7"
 HOMEPAGE="https://pgrouting.org"
-DOWNLOAD="https://github.com/pgRouting/osm2pgrouting/archive/v2.3.6/osm2pgrouting-2.3.6.tar.gz"
-MD5SUM="7d5b073f55f551ddfd51d07c7f15b651"
+DOWNLOAD="https://github.com/pgRouting/osm2pgrouting/archive/v2.3.7/osm2pgrouting-2.3.7.tar.gz"
+MD5SUM="3e4747bbfcec76785fc171b4c8dc73d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libpqxx pgrouting"
diff --git a/gis/osm2pgsql/osm2pgsql.SlackBuild b/gis/osm2pgsql/osm2pgsql.SlackBuild
index 32d1f51d52..df61f404ea 100644
--- a/gis/osm2pgsql/osm2pgsql.SlackBuild
+++ b/gis/osm2pgsql/osm2pgsql.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for osm2pgsql
 
-# Copyright 2013-2019 Benjamin Trigona-Harany
+# Copyright 2013-2021 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=osm2pgsql
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,6 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_TESTING=OFF \
     -DBUILD_TESTS=OFF \
     -DWITH_LUAJIT=ON \
     -DCMAKE_BUILD_TYPE=Release ..
@@ -90,7 +89,7 @@ gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog README.md \
+  AUTHORS COPYING README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/gis/osm2pgsql/osm2pgsql.info b/gis/osm2pgsql/osm2pgsql.info
index e9f63ecd58..28e89137ac 100644
--- a/gis/osm2pgsql/osm2pgsql.info
+++ b/gis/osm2pgsql/osm2pgsql.info
@@ -1,8 +1,8 @@
 PRGNAM="osm2pgsql"
-VERSION="1.2.1"
+VERSION="1.4.2"
 HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql"
-DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/1.2.1/osm2pgsql-1.2.1.tar.gz"
-MD5SUM="e2902cda5f41cf9cfa71459d28f24e85"
+DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/1.4.2/osm2pgsql-1.4.2.tar.gz"
+MD5SUM="6c849709fb967d75554be503385e88f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="luajit postgis"
diff --git a/gis/pdal/pdal.SlackBuild b/gis/pdal/pdal.SlackBuild
index 7fab3eac74..0c888539a4 100644
--- a/gis/pdal/pdal.SlackBuild
+++ b/gis/pdal/pdal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pdal
 
-# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=pdal
 SRCNAM=PDAL
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pdal/pdal.info b/gis/pdal/pdal.info
index 561d461a63..4de5303903 100644
--- a/gis/pdal/pdal.info
+++ b/gis/pdal/pdal.info
@@ -1,8 +1,8 @@
 PRGNAM="pdal"
-VERSION="2.1.0"
+VERSION="2.2.0"
 HOMEPAGE="http://pointcloud.org"
-DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.1.0/PDAL-2.1.0.tar.gz"
-MD5SUM="b991ff09c84cb0f54dde179f2e7a31c9"
+DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.2.0/PDAL-2.2.0.tar.gz"
+MD5SUM="b85ebc55f84821c8c2ed604d2b3b4b1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal libgeotiff postgresql"
diff --git a/gis/pgrouting/pgrouting.SlackBuild b/gis/pgrouting/pgrouting.SlackBuild
index fb107ea466..ffde730c6b 100644
--- a/gis/pgrouting/pgrouting.SlackBuild
+++ b/gis/pgrouting/pgrouting.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for pgRouting
 
-# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pgrouting
-VERSION=${VERSION:-2.6.3}
+VERSION=${VERSION:-3.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pgrouting/pgrouting.info b/gis/pgrouting/pgrouting.info
index 9c405c787a..42e7d07326 100644
--- a/gis/pgrouting/pgrouting.info
+++ b/gis/pgrouting/pgrouting.info
@@ -1,8 +1,8 @@
 PRGNAM="pgrouting"
-VERSION="2.6.3"
+VERSION="3.1.3"
 HOMEPAGE="https://pgrouting.org"
-DOWNLOAD="https://github.com/pgRouting/pgrouting/archive/v2.6.3/pgrouting-2.6.3.tar.gz"
-MD5SUM="16f8537a553d2953ef50726764dd7d66"
+DOWNLOAD="https://github.com/pgRouting/pgrouting/archive/v3.1.3/pgrouting-3.1.3.tar.gz"
+MD5SUM="fd4a7d8b098ed57c4afb630e4e7d1b13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CGAL postgis"
diff --git a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild
index 068c3c5a12..3f1e8deb6c 100644
--- a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild
+++ b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for pgsql-ogr-fdw
 
-# Copyright 2015-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2015-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pgsql-ogr-fdw
-VERSION=${VERSION:-1.0.11}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info
index ef8dd8d45d..4e350c79de 100644
--- a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info
+++ b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info
@@ -1,8 +1,8 @@
 PRGNAM="pgsql-ogr-fdw"
-VERSION="1.0.11"
+VERSION="1.1.0"
 HOMEPAGE="https://github.com/pramsey/pgsql-ogr-fdw"
-DOWNLOAD="https://github.com/pramsey/pgsql-ogr-fdw/archive/v1.0.11/pgsql-ogr-fdw-1.0.11.tar.gz"
-MD5SUM="0e844d40c3332d1960f9ebb892e952c6"
+DOWNLOAD="https://github.com/pramsey/pgsql-ogr-fdw/archive/v1.1.0/pgsql-ogr-fdw-1.1.0.tar.gz"
+MD5SUM="1a14ab7f6238e790ca139254f47e579b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgis"
diff --git a/gis/pointcloud/pointcloud.SlackBuild b/gis/pointcloud/pointcloud.SlackBuild
index f74b10186f..7fe6477083 100644
--- a/gis/pointcloud/pointcloud.SlackBuild
+++ b/gis/pointcloud/pointcloud.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pointcloud
 
-# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pointcloud
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pointcloud/pointcloud.info b/gis/pointcloud/pointcloud.info
index 9a495b8e7b..8f9193492a 100644
--- a/gis/pointcloud/pointcloud.info
+++ b/gis/pointcloud/pointcloud.info
@@ -1,8 +1,8 @@
 PRGNAM="pointcloud"
-VERSION="1.2.0"
+VERSION="1.2.1"
 HOMEPAGE="https://github.com/pramsey/pointcloud"
-DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v1.2.0/pointcloud-1.2.0.tar.gz"
-MD5SUM="ad7241cd53f69d8fd2b3850fba28c39e"
+DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v1.2.1/pointcloud-1.2.1.tar.gz"
+MD5SUM="902e6028dbf12271e6d3909471065d9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql"
diff --git a/gis/postgis/README b/gis/postgis/README
index 67c3bac5b7..abb1a3aed1 100644
--- a/gis/postgis/README
+++ b/gis/postgis/README
@@ -5,8 +5,6 @@ systems (GIS).
 
 SFCGAL is an optional dependency for advanced 3D support. 
 
-protobuf-c is an optional dependency for MapBox vector tile support.
-
 To disable the GTK-based graphical interface for shp2pgsql, set GUI=no.
 
 To include the shp2pgsql plugin for pgAdmin set PGADMIN=yes.
diff --git a/gis/postgis/postgis.SlackBuild b/gis/postgis/postgis.SlackBuild
index b47e5595c7..39a2f6c822 100644
--- a/gis/postgis/postgis.SlackBuild
+++ b/gis/postgis/postgis.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for PostGIS
 
 # Copyright 2009 Peter Sarkoci <sarkoci@math.sk>
-# Maintained 2013-2020 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Maintained 2013-2021 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=postgis
-VERSION=${VERSION:-3.0.2}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/postgis/postgis.info b/gis/postgis/postgis.info
index 7a85decceb..5ca7ffcd08 100644
--- a/gis/postgis/postgis.info
+++ b/gis/postgis/postgis.info
@@ -1,10 +1,10 @@
 PRGNAM="postgis"
-VERSION="3.0.2"
+VERSION="3.1.1"
 HOMEPAGE="http://postgis.org"
-DOWNLOAD="http://download.osgeo.org/postgis/source/postgis-3.0.2.tar.gz"
-MD5SUM="37b7b3a5e6851eae289bb87ca2f1e487"
+DOWNLOAD="http://download.osgeo.org/postgis/source/postgis-3.1.1.tar.gz"
+MD5SUM="10ef40ef64d7673cc34a1c1677584c95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gdal postgresql"
+REQUIRES="gdal postgresql protobuf-c"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/proj-data/proj-data.SlackBuild b/gis/proj-data/proj-data.SlackBuild
index 98baec278e..4def9967ce 100644
--- a/gis/proj-data/proj-data.SlackBuild
+++ b/gis/proj-data/proj-data.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=proj-data
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
diff --git a/gis/proj-data/proj-data.info b/gis/proj-data/proj-data.info
index 400076fb14..6e5214473a 100644
--- a/gis/proj-data/proj-data.info
+++ b/gis/proj-data/proj-data.info
@@ -1,8 +1,8 @@
 PRGNAM="proj-data"
-VERSION="1.1"
+VERSION="1.3"
 HOMEPAGE="https://www.osgeo.org/projects/proj/"
-DOWNLOAD="https://github.com/OSGeo/PROJ-data/releases/download/1.1.0/proj-data-1.1.tar.gz"
-MD5SUM="8b0e90fc58d2f7058c43df24e4924929"
+DOWNLOAD="https://github.com/OSGeo/PROJ-data/releases/download/1.3.0/proj-data-1.3.tar.gz"
+MD5SUM="7d202814fa70ff56f70fa4776a62b4f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="proj"
diff --git a/gis/proj/proj.SlackBuild b/gis/proj/proj.SlackBuild
index 3cd406ac96..8461345c38 100644
--- a/gis/proj/proj.SlackBuild
+++ b/gis/proj/proj.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for proj
 # Written by Kyle Guinn <elyk03@gmail.com>
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=proj
-VERSION=${VERSION:-7.1.1}
+VERSION=${VERSION:-7.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/proj/proj.info b/gis/proj/proj.info
index 16c002c547..56164b690f 100644
--- a/gis/proj/proj.info
+++ b/gis/proj/proj.info
@@ -1,8 +1,8 @@
 PRGNAM="proj"
-VERSION="7.1.1"
+VERSION="7.2.1"
 HOMEPAGE="https://www.osgeo.org/projects/proj/"
-DOWNLOAD="http://download.osgeo.org/proj/proj-7.1.1.tar.gz"
-MD5SUM="b7ce84943dcf2b660b11c2ef9657dad5"
+DOWNLOAD="http://download.osgeo.org/proj/proj-7.2.1.tar.gz"
+MD5SUM="befbafd25e65ddf0c26a8321d8bcdcd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/gis/pyproj/pyproj.SlackBuild b/gis/pyproj/pyproj.SlackBuild
index e4c9bd8cc4..4657e1fbb5 100644
--- a/gis/pyproj/pyproj.SlackBuild
+++ b/gis/pyproj/pyproj.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyproj
 
-# Copyright 2013-2020 Benjamin Trigona-Harany
+# Copyright 2013-2021 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyproj
-VERSION=${VERSION:-2.6.1}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-${VERSION}rel
-tar xvf $CWD/$PRGNAM-${VERSION}rel.tar.gz
-cd $PRGNAM-${VERSION}rel
+rm -rf $PRGNAM-${VERSION}
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
+cd $PRGNAM-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/gis/pyproj/pyproj.info b/gis/pyproj/pyproj.info
index eeeb785b23..6586a784a7 100644
--- a/gis/pyproj/pyproj.info
+++ b/gis/pyproj/pyproj.info
@@ -1,8 +1,8 @@
 PRGNAM="pyproj"
-VERSION="2.6.1"
-HOMEPAGE="https://github.com/jswhit/pyproj"
-DOWNLOAD="https://github.com/jswhit/pyproj/archive/v2.6.1rel/pyproj-2.6.1rel.tar.gz"
-MD5SUM="776e8e0777837b33bf6c87270ada45bb"
+VERSION="3.0.1"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
+DOWNLOAD="https://github.com/pyproj4/pyproj/archive/3.0.1/pyproj-3.0.1.tar.gz"
+MD5SUM="208a109f4b68a82104a52ad3db953a3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="proj python3-Cython"
diff --git a/gis/pyshp/pyshp.SlackBuild b/gis/pyshp/pyshp.SlackBuild
index a5c6dbc55a..79e20d5459 100644
--- a/gis/pyshp/pyshp.SlackBuild
+++ b/gis/pyshp/pyshp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyshp
 
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyshp
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pyshp/pyshp.info b/gis/pyshp/pyshp.info
index aa2405cb71..3beaa164ff 100644
--- a/gis/pyshp/pyshp.info
+++ b/gis/pyshp/pyshp.info
@@ -1,8 +1,8 @@
 PRGNAM="pyshp"
-VERSION="2.1.1"
+VERSION="2.1.3"
 HOMEPAGE="https://github.com/GeospatialPython/pyshp"
-DOWNLOAD="https://github.com/GeospatialPython/pyshp/archive/2.1.1/pyshp-2.1.1.tar.gz"
-MD5SUM="0374fcccf5bde94a642e312133f1eaae"
+DOWNLOAD="https://github.com/GeospatialPython/pyshp/archive/2.1.3/pyshp-2.1.3.tar.gz"
+MD5SUM="5a541b6fd09a825d1025c5563e769823"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/gis/python-pygeos/python-pygeos.SlackBuild b/gis/python-pygeos/python-pygeos.SlackBuild
index 1e3a0d4db8..b456308c47 100644
--- a/gis/python-pygeos/python-pygeos.SlackBuild
+++ b/gis/python-pygeos/python-pygeos.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-pygeos
 
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-pygeos
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/python-pygeos/python-pygeos.info b/gis/python-pygeos/python-pygeos.info
index 04fabb6247..661c5c2f54 100644
--- a/gis/python-pygeos/python-pygeos.info
+++ b/gis/python-pygeos/python-pygeos.info
@@ -1,8 +1,8 @@
 PRGNAM="python-pygeos"
-VERSION="0.5"
+VERSION="0.9"
 HOMEPAGE="https://pygeos.readthedocs.io"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pygeos/pygeos-0.5.tar.gz"
-MD5SUM="f08653606a94b0dea17b7b253bc2f454"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pygeos/pygeos-0.9.tar.gz"
+MD5SUM="e3d4e04cba540ceba80ce376f1f20192"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos numpy3"
diff --git a/gis/pytrainer/pytrainer.SlackBuild b/gis/pytrainer/pytrainer.SlackBuild
index eeceb65401..e01bff19ea 100644
--- a/gis/pytrainer/pytrainer.SlackBuild
+++ b/gis/pytrainer/pytrainer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Pytrainer
 
-# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pytrainer
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pytrainer/pytrainer.info b/gis/pytrainer/pytrainer.info
index ef93cc8484..166e517a99 100644
--- a/gis/pytrainer/pytrainer.info
+++ b/gis/pytrainer/pytrainer.info
@@ -1,8 +1,8 @@
 PRGNAM="pytrainer"
-VERSION="2.0.1"
+VERSION="2.0.2"
 HOMEPAGE="https://github.com/pytrainer/pytrainer"
-DOWNLOAD="https://github.com/pytrainer/pytrainer/archive/v2.0.1/pytrainer-2.0.1.tar.gz"
-MD5SUM="4f72a99412a40be7e40f5b84c8744472"
+DOWNLOAD="https://github.com/pytrainer/pytrainer/archive/v2.0.2/pytrainer-2.0.2.tar.gz"
+MD5SUM="75e07caa70cf0bb609c26894061b77aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lxml sqlalchemy-migrate python-dateutil python-certifi python-requests matplotlib webkit2gtk zenity"
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
index af51687518..ec241ab771 100644
--- a/gis/qgis/qgis.SlackBuild
+++ b/gis/qgis/qgis.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for QGIS
 
 # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
-# Copyright 2013-2020 Benjamin Trigona-Harany
+# Copyright 2013-2021 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qgis
-VERSION=${VERSION:-3.14.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.18.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,11 +77,11 @@ else
 fi
 
 sed -i 's|${SIP_BINARY_PATH}|/usr/bin/python3-sip|' cmake/SIPMacros.cmake
-sed -i '/CMAKE_POLICY (SET CMP0071 NEW)/d' CMakeLists.txt
-sed -i 's/Protobuf_/PROTOBUF_/' CMakeLists.txt src/core/CMakeLists.txt
+sed -i '43 i IF (NOT PROJ_INCLUDE_DIR)\nFIND_PATH(PROJ_INCLUDE_DIR proj.h\n"$ENV{INCLUDE}"\n"$ENV{LIB_DIR}/include"\n)\nENDIF (NOT PROJ_INCLUDE_DIR)\n' cmake/FindProj.cmake
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake .. \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -97,8 +97,10 @@ cd build
     -DQSCINTILLA_INCLUDE_DIR=/usr/include/qt5 \
     -DENABLE_TESTS=FALSE \
     -DWITH_3D=TRUE \
+    -Wno-dev \
     $WITHGRASS
 
+  make || make -j1
   make install DESTDIR=$PKG
 cd -
 
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index 9366944fc1..9c787e8ca7 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -1,10 +1,10 @@
 PRGNAM="qgis"
-VERSION="3.14.0"
+VERSION="3.18.1"
 HOMEPAGE="https://qgis.org/"
-DOWNLOAD="https://qgis.org/downloads/qgis-3.14.0.tar.bz2"
-MD5SUM="e4c1c32b95b6baa47eba62cf80eb5425"
+DOWNLOAD="https://qgis.org/downloads/qgis-3.18.1.tar.bz2"
+MD5SUM="9d71667d40aa0caf64e2ff0d6e60c5e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="postgis libspatialite libspatialindex numpy3 qt5-webkit qwt-qt5 QScintilla-qt5 qtkeychain qca-qt5 protobuf3 python3-PyYAML python3-certifi python-requests Pygments OWSLib psycopg2 Jinja2"
+REQUIRES="cmake-202x postgis libspatialite libspatialindex numpy3 qt5-webkit qwt-qt5 QScintilla-qt5 qtkeychain qca-qt5 protobuf3 python3-PyYAML python-requests Pygments OWSLib psycopg2 Jinja2 zstd"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/qmapshack/qmapshack.SlackBuild b/gis/qmapshack/qmapshack.SlackBuild
index c3f68f3c8e..9cffc01d79 100644
--- a/gis/qmapshack/qmapshack.SlackBuild
+++ b/gis/qmapshack/qmapshack.SlackBuild
@@ -10,7 +10,7 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=qmapshack
-VERSION=${VERSION:-1.15.0}
+VERSION=${VERSION:-1.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/qmapshack/qmapshack.info b/gis/qmapshack/qmapshack.info
index eef938a955..97b4d8d9b7 100644
--- a/gis/qmapshack/qmapshack.info
+++ b/gis/qmapshack/qmapshack.info
@@ -1,10 +1,10 @@
 PRGNAM="qmapshack"
-VERSION="1.15.0"
+VERSION="1.15.2"
 HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.15.0/qmapshack-1.15.0.tar.gz"
-MD5SUM_x86_64="c9f9dc0d2c317b8bf3d36bdff2b3e762"
+DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.15.2/qmapshack-1.15.2.tar.gz"
+MD5SUM_x86_64="5fcf9e5d31fb0abe8d5ce442ba516b30"
 REQUIRES="gdal qt5-webkit routino quazip-qt5"
 MAINTAINER="Daniel Stolarski"
 EMAIL="daniel.stolarski@gmail.com"
diff --git a/gis/rasterio/rasterio.SlackBuild b/gis/rasterio/rasterio.SlackBuild
index 6157b4cd74..4e60c382e4 100644
--- a/gis/rasterio/rasterio.SlackBuild
+++ b/gis/rasterio/rasterio.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for rasterio
 
-# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rasterio
-VERSION=${VERSION:-1.1.5}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/rasterio/rasterio.info b/gis/rasterio/rasterio.info
index 8e773f6ac3..3071637e3e 100644
--- a/gis/rasterio/rasterio.info
+++ b/gis/rasterio/rasterio.info
@@ -1,10 +1,10 @@
 PRGNAM="rasterio"
-VERSION="1.1.5"
+VERSION="1.2.2"
 HOMEPAGE="https://github.com/mapbox/rasterio"
-DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.1.5/rasterio-1.1.5.tar.gz"
-MD5SUM="fbfb53a7bc521c607d9aad7a4c35c930"
+DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.2.2/rasterio-1.2.2.tar.gz"
+MD5SUM="1e5050ea499e828a4d27877bf2cc185c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="affine click-plugins cligj snuggs numpy3 python3-attrs python3-Cython pyparsing"
+REQUIRES="affine click-plugins cligj gdal snuggs numpy3 python3-attrs python3-Cython python3-pyparsing"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild
index 3d122739f3..a2d773a42e 100644
--- a/gis/saga-gis/saga-gis.SlackBuild
+++ b/gis/saga-gis/saga-gis.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for saga-gis
 
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=saga-gis
-VERSION=${VERSION:-7.6.3}
+VERSION=${VERSION:-7.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info
index 0fc6a6e13a..e9a70eacbd 100644
--- a/gis/saga-gis/saga-gis.info
+++ b/gis/saga-gis/saga-gis.info
@@ -1,8 +1,8 @@
 PRGNAM="saga-gis"
-VERSION="7.6.3"
+VERSION="7.9.0"
 HOMEPAGE="http://www.saga-gis.org"
-DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.3/saga-7.6.3.tar.gz"
-MD5SUM="3770e90cffec8a68ce90ddfc05d683bc"
+DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.9.0/saga-7.9.0.tar.gz"
+MD5SUM="b988d202508ea8387150d13ff9292fa5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal python3 wxGTK3"
diff --git a/gis/spatialite_gui/spatialite_gui.SlackBuild b/gis/spatialite_gui/spatialite_gui.SlackBuild
index 830f79b106..d2b7b20fa6 100644
--- a/gis/spatialite_gui/spatialite_gui.SlackBuild
+++ b/gis/spatialite_gui/spatialite_gui.SlackBuild
@@ -68,6 +68,8 @@ 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 {} \;
 
+sed -i 27i'#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1' Main.cpp
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="-ldl" \
diff --git a/gis/whitebox-tools/whitebox-tools.SlackBuild b/gis/whitebox-tools/whitebox-tools.SlackBuild
index 36a6462dda..8e273041fd 100644
--- a/gis/whitebox-tools/whitebox-tools.SlackBuild
+++ b/gis/whitebox-tools/whitebox-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for whitebox-tools
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=whitebox-tools
 BINNAM=`echo $PRGNAM | tr - _`
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/whitebox-tools/whitebox-tools.info b/gis/whitebox-tools/whitebox-tools.info
index f4e513fc14..91df26721f 100644
--- a/gis/whitebox-tools/whitebox-tools.info
+++ b/gis/whitebox-tools/whitebox-tools.info
@@ -1,7 +1,7 @@
 PRGNAM="whitebox-tools"
-VERSION="1.3.0"
+VERSION="1.4.0"
 HOMEPAGE="https://github.com/jblindsay/whitebox-tools"
-DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.3.0/whitebox-tools-1.3.0.tar.gz \
+DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/1.4.0/whitebox-tools-1.4.0.tar.gz \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/alga/alga-0.9.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.3.2.crate \
@@ -13,9 +13,14 @@ DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.3.0/whitebox-to
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.8+1.0.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.52.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.3.crate \
@@ -24,10 +29,13 @@ DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.3.0/whitebox-to
           https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/kdtree/kdtree-0.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/late-static/late-static-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.69.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libm/libm-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lzw/lzw-0.10.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/matrixmultiply/matrixmultiply-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.5.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/msdos_time/msdos_time-0.1.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/nalgebra/nalgebra-0.18.1.crate \
@@ -60,9 +68,12 @@ DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.3.0/whitebox-to
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rawpointer/rawpointer-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.7.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rstar/rstar-0.7.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \
@@ -76,7 +87,7 @@ DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.3.0/whitebox-to
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.3.3.crate"
-MD5SUM="f3475fdb38721ddba1d6f2648d37996a \
+MD5SUM="260ab1a7b97a1526a342084d1205f939 \
         853b409f126727af3ee29ae2de887271 \
         1f6ec6a2e7b169d66d6db72cac5f413b \
         711b149cf4767597fc265983750f4da3 \
@@ -88,9 +99,14 @@ MD5SUM="f3475fdb38721ddba1d6f2648d37996a \
         ff4e1560b7d0ac5c4ae2688bc27f9c98 \
         af1f1bff38cb52f5836ec9a7957d419a \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        372b0092eb56ebfa98956f810f148610 \
+        a47dd336c3099e7986f926b48c64ec6a \
         1c8b50f8528dd37df7d984e0e4b61bd5 \
         3c153e21729b743f5127dec47670de17 \
+        897911f15f349a357899045e6b0c04e0 \
+        49b4b022e9fa4cc60376a79ecb39d04f \
+        836bbd6315ea443caf33fe3394ea4991 \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        82241b59d4b793d862900b62220cf05a \
         5941f4a3d3435767e79260f61093ecd3 \
         27260b46db6b9ac40318143d70a80ba3 \
         916a6c827f4f0f64b7652bebf67d82e1 \
@@ -99,10 +115,13 @@ MD5SUM="f3475fdb38721ddba1d6f2648d37996a \
         493f4bd45cf2a6c3963f66f58884f622 \
         412752575d11aefd8c262075407f5cc1 \
         04fc55fadbdb820a95287bce6c5cca71 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
         0f24b5ab599c41a83e973aabe92ac46d \
         5b23904f9579d1efd0e914257517eeb5 \
         7d95c53a33d0c550267b89a19899a6fa \
         0c8b4e7eeaa63e83b705a047d2b8580e \
+        b5cf10e268e8a3bee2de8a734104245e \
+        46fd65cd541fdc547f2ba26b8d400dae \
         6ad7c30338903afc3521369ecd826cfb \
         c24b5fe087abe69f7548a9e6c8789d61 \
         e7be05acf53dc7d372d012d7ac673073 \
@@ -135,9 +154,12 @@ MD5SUM="f3475fdb38721ddba1d6f2648d37996a \
         7b0715affe44616a992f113ad7ab7d50 \
         7826deb76941fc36c2391951bd65ba47 \
         d4a05ab09e96ee8767f7409721bf65b8 \
+        d6dae0411ef3346d4ae59498f7d523e0 \
+        74bd9140ed1ed96349474b75a26a45e9 \
         c8d655d206cbe48b84a22544d6fc6d15 \
         57d8084d93aec796d98691e654c5e0f6 \
         44d95c1ed46baee736c9420ad1de3228 \
+        b4a0a98a54439a5a37952c8879187ee3 \
         3879349fe374e764e24f37ce40ac9824 \
         9b7d58f6341fb619ff2190481ce13b84 \
         ce76f5430cd6d2ab76d0d86ecb8a4f4d \
diff --git a/graphics/Blender/01_FindEmbree_so.diff b/graphics/Blender/01_FindEmbree_so.diff
new file mode 100644
index 0000000000..6739f6852a
--- /dev/null
+++ b/graphics/Blender/01_FindEmbree_so.diff
@@ -0,0 +1,75 @@
+--- build_files/cmake/Modules/FindEmbree.cmake.orig	2020-10-21 18:59:19.000000000 +1000
++++ build_files/cmake/Modules/FindEmbree.cmake	2021-01-16 01:26:51.000000000 +1000
+@@ -7,19 +7,12 @@
+ #  EMBREE_ROOT_DIR, The base directory to search for Embree.
+ #                        This can also be an environment variable.
+ #  EMBREEFOUND, If false, do not try to use Embree.
+-#
+-# also defined, but not for general use are
+-#  EMBREE_LIBRARY, where to find the Embree library.
+ 
+ #=============================================================================
+ # Copyright 2018 Blender Foundation.
+ #
+-# Distributed under the OSI-approved BSD License (the "License");
+-# see accompanying file Copyright.txt for details.
+-#
+-# This software is distributed WITHOUT ANY WARRANTY; without even the
+-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-# See the License for more information.
++# Distributed under the OSI-approved BSD 3-Clause License,
++# see accompanying file BSD-3-Clause-license.txt for details.
+ #=============================================================================
+ 
+ # If EMBREE_ROOT_DIR was defined in the environment, use it.
+@@ -44,9 +37,9 @@
+ 
+ SET(_embree_FIND_COMPONENTS
+   embree3
++  embree_sse42
+   embree_avx
+   embree_avx2
+-  embree_sse42
+   lexers
+   math
+   simd
+@@ -66,29 +59,28 @@
+     PATH_SUFFIXES
+       lib64 lib
+     )
++  IF (NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
++    IF (EMBREE_EMBREE3_LIBRARY)
++      # If we can't find all the static libraries, try to fall back to the shared library if found.
++      # This allows building with a shared embree library
++      SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
++      BREAK()
++    ENDIF ()
++  ENDIF ()
+   LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
+ ENDFOREACH()
+ 
+ 
+-FIND_LIBRARY(EMBREE_LIBRARY
+-  NAMES
+-    libembree3
+-  HINTS
+-    ${_embree_SEARCH_DIRS}
+-  PATH_SUFFIXES
+-    lib64 lib
+-)
+-
+ # handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if
+ # all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(EMBREE DEFAULT_MSG
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG
+     _embree_LIBRARIES EMBREE_INCLUDE_DIR)
+ 
+ IF(EMBREE_FOUND)
+   SET(EMBREE_LIBRARIES ${_embree_LIBRARIES})
+   SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
+-ENDIF(EMBREE_FOUND)
++ENDIF()
+ 
+ MARK_AS_ADVANCED(
+   EMBREE_INCLUDE_DIR
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 15d2553188..a8c4ca8b9d 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Blender
 
-# Copyright 2015-2020 Christoph Willing, Brisbane Australia
+# Copyright 2015-2021 Christoph Willing, Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Blender
-VERSION=${VERSION:-2.83.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.83.8}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 SRCNAM=blender
@@ -69,6 +69,16 @@ if [ -d /usr/include/cuda ]; then
   fi
 fi
 
+embree=""
+if [ -d /usr/include/embree3 ]; then
+  # If embree is installed, assume we want to use it
+  embree="-DWITH_CYCLES_EMBREE=ON"
+  # However disable embree if requested by e.g. EMBREE=no
+  if [ ${EMBREE:-yes} != "yes" ]; then
+    embree="-DWITH_CYCLES_EMBREE=OFF"
+  fi
+fi
+
 set -e
 
 rm -rf $PKG
@@ -77,6 +87,12 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
+patch -p0 < $CWD/01_FindEmbree_so.diff
+if [ ${FORCE_FFMPEG4:-no} = "yes" ]; then
+  echo "Force use of ffmpeg4"
+  SLKCFLAGS="$SLKCFLAGS -I/usr/include/ffmpeg4 -L/usr/lib${LIBDIRSUFFIX}/ffmpeg4"
+  sed -i -e "s|\"exitcode=0\"|&,\"LD_LIBRARY_PATH\":\"/usr/lib$LIBDIRSUFFIX/ffmpeg4\"|g" doc/manpage/blender.1.py
+fi
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -115,6 +131,7 @@ cd build
     -DWITH_SDL_DYNLOAD:BOOL=ON \
     -DCMAKE_BUILD_TYPE=Release \
     $cuda \
+    $embree \
 
   make
   make install DESTDIR=$PKG
@@ -128,8 +145,7 @@ for bin in $BLENDERBINS ; do
   mv $PKG/usr/bin/$bin $PKG/usr/bin/$bin.bin
   cat <<EOF >$PKG/usr/bin/$bin
 #!/bin/sh
-#export PYTHONPATH=/usr/share/$SRCNAM/$BASE_VERSION/python/lib$LIBDIRSUFFIX/python$PYTHON_VERSION
-export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada
+export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada:/usr/lib$LIBDIRSUFFIX/ffmpeg4
 exec $bin.bin "\$@"
 EOF
   chmod 0755 $PKG/usr/bin/$bin
diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info
index e2b592a93d..26038a5885 100644
--- a/graphics/Blender/Blender.info
+++ b/graphics/Blender/Blender.info
@@ -1,10 +1,10 @@
 PRGNAM="Blender"
-VERSION="2.83.4"
+VERSION="2.83.8"
 HOMEPAGE="https://blender.org"
-DOWNLOAD="https://download.blender.org/source/blender-2.83.4.tar.xz"
-MD5SUM="ccfec7799c168eca11be172ed1247d4e"
+DOWNLOAD="https://download.blender.org/source/blender-2.83.8.tar.xz"
+MD5SUM="1a920506a3a695d629d5f312b9b45c01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ffmpeg jack opencollada opus python-requests valgrind numpy3 SDL2 openimageio freealut tbb"
+REQUIRES="ffmpeg jack opencollada opus python-requests valgrind numpy3 SDL2 openimageio freealut tbb embree"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/graphics/Blender/README b/graphics/Blender/README
index c89c1f1c39..e6fe94d6e9 100644
--- a/graphics/Blender/README
+++ b/graphics/Blender/README
@@ -17,3 +17,14 @@ successful build. The CUDA handling above remains for cases which may:
     - use a newer CUDA version toolkit
     - require the existing cudatoolkit for other purposes
       (so need CUDA=no for Blender)
+
+Support for embree may be disabled by passing EMBREE=no when building e.g.
+    EMBREE=no sh ./Blender.SlackBuild
+
+Support in 14.2 for using SBo's ffmpeg4 SlackBuild may be enabled by
+passing FORCE_FFMPEG4=yes when building e.g.
+    FORCE_FFMPEG4=yes sh ./Blender.SlackBuild
+
+Version 2.83.8 is the last SBo supported version of Blender for building
+from source code in Slackware64-14.2. A more recent compiler (gcc-9.3.1)
+is required for 2.90.x and later blender versions.
diff --git a/graphics/CairoSVG/CairoSVG.SlackBuild b/graphics/CairoSVG/CairoSVG.SlackBuild
index 49576d41d4..0725ad10cb 100644
--- a/graphics/CairoSVG/CairoSVG.SlackBuild
+++ b/graphics/CairoSVG/CairoSVG.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CairoSVG
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CairoSVG
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/CairoSVG/CairoSVG.info b/graphics/CairoSVG/CairoSVG.info
index 5b8cd0045e..15cb6ed231 100644
--- a/graphics/CairoSVG/CairoSVG.info
+++ b/graphics/CairoSVG/CairoSVG.info
@@ -1,10 +1,10 @@
 PRGNAM="CairoSVG"
-VERSION="2.3.0"
+VERSION="2.5.0"
 HOMEPAGE="https://cairosvg.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/f3/23/67e77d4ffd643287a0dfb7dc76acef05548bd1964cd355f588b93c026deb/CairoSVG-2.3.0.tar.gz"
-MD5SUM="0fb63ab45152cdb7968d861de6e8344c"
+DOWNLOAD="https://files.pythonhosted.org/packages/26/f5/d8fb11ac3ac613cae21f6860d9bebc12792240f7d22e62f84354dc365e7e/CairoSVG-2.5.0.tar.gz"
+MD5SUM="7b45e544969455167ce5b40406c25c30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 cairocffi cssselect tinycss python3-pillow python3-defusedxml"
+REQUIRES="cairocffi cssselect2 python3-pillow python3-defusedxml"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/graphics/OpenSubdiv/OpenSubdiv.SlackBuild b/graphics/OpenSubdiv/OpenSubdiv.SlackBuild
index 09a81f056a..e9a279e7c4 100644
--- a/graphics/OpenSubdiv/OpenSubdiv.SlackBuild
+++ b/graphics/OpenSubdiv/OpenSubdiv.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for Opensubdiv
 
 # Copyright 2019 J. "MUFTI" Scheurich Stuttgart/Germany
+# Copyright 2021 Christoph Willing  Brisbane/Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 
 PRGNAM=OpenSubdiv
 SRCNAM=OpenSubDiv
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.4.3}
 SRCVER=$(echo $VERSION | tr . _)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/graphics/OpenSubdiv/OpenSubdiv.info b/graphics/OpenSubdiv/OpenSubdiv.info
index 777889c61e..b7292a557b 100644
--- a/graphics/OpenSubdiv/OpenSubdiv.info
+++ b/graphics/OpenSubdiv/OpenSubdiv.info
@@ -1,10 +1,10 @@
 PRGNAM="OpenSubdiv"
-VERSION="3.4.0"
+VERSION="3.4.3"
 HOMEPAGE="http://graphics.pixar.com/opensubdiv"
-DOWNLOAD="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_4_0/OpenSubDiv-3.4.0.tar.gz"
-MD5SUM="2eea21ef2d85bcbbcee94e287c34a07e"
+DOWNLOAD="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_4_3/OpenSubDiv-3.4.3.tar.gz"
+MD5SUM="7bbfa275d021fb829e521df749160edb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="J. Scheurich"
-EMAIL="mufti11@web.de"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/graphics/SPIRV-Tools/README b/graphics/SPIRV-Tools/README
new file mode 100644
index 0000000000..d0f604b893
--- /dev/null
+++ b/graphics/SPIRV-Tools/README
@@ -0,0 +1,10 @@
+The SPIR-V Tools project provides an API and commands for processing
+SPIR-V modules.
+
+The project includes an assembler, binary module parser, disassembler,
+validator, and optimizer for SPIR-V. Except for the optimizer,
+all are based on a common static library. The library contains all
+of the implementation details, and is used in the standalone tools
+whilst also enabling integration into other code bases directly. The
+optimizer implementation resides in its own library, which depends
+on the core library.
diff --git a/graphics/SPIRV-Tools/SPIRV-Tools.SlackBuild b/graphics/SPIRV-Tools/SPIRV-Tools.SlackBuild
new file mode 100644
index 0000000000..cdde34904a
--- /dev/null
+++ b/graphics/SPIRV-Tools/SPIRV-Tools.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for SPIRV-Tools
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=SPIRV-Tools
+VERSION=${VERSION:-2020.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DBUILD_SHARED_LIBS=ON \
+    -DSPIRV_TOOLS_BUILD_STATIC=OFF \
+    -DSPIRV_SKIP_TESTS=ON \
+    -DSPIRV_WERROR=OFF \
+    -DSPIRV-Headers_SOURCE_DIR=/usr \
+    -DCMAKE_SKIP_RPATH=TRUE \
+    -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 CHANGES CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/SPIRV-Tools/SPIRV-Tools.info b/graphics/SPIRV-Tools/SPIRV-Tools.info
new file mode 100644
index 0000000000..ab0b391ef3
--- /dev/null
+++ b/graphics/SPIRV-Tools/SPIRV-Tools.info
@@ -0,0 +1,10 @@
+PRGNAM="SPIRV-Tools"
+VERSION="2020.6"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.6/SPIRV-Tools-2020.6.tar.gz"
+MD5SUM="a5e7b94edc9f8ecc798c66a549bba181"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SPIRV-Headers python3"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/graphics/SPIRV-Tools/slack-desc b/graphics/SPIRV-Tools/slack-desc
new file mode 100644
index 0000000000..79e9d751ca
--- /dev/null
+++ b/graphics/SPIRV-Tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+SPIRV-Tools: SPIRV-Tools (API and commands for processing SPIR-V modules)
+SPIRV-Tools:
+SPIRV-Tools: The SPIR-V Tools project provides an API and commands for processing
+SPIRV-Tools: SPIR-V modules.
+SPIRV-Tools:
+SPIRV-Tools: Homepage: https://github.com/KhronosGroup/SPIRV-Tools
+SPIRV-Tools:
+SPIRV-Tools:
+SPIRV-Tools:
+SPIRV-Tools:
+SPIRV-Tools:
diff --git a/graphics/Vulkan-Tools/README b/graphics/Vulkan-Tools/README
new file mode 100644
index 0000000000..10206439f4
--- /dev/null
+++ b/graphics/Vulkan-Tools/README
@@ -0,0 +1 @@
+This project provides Khronos official Vulkan Tools and Utilities.
diff --git a/graphics/Vulkan-Tools/Vulkan-Tools.SlackBuild b/graphics/Vulkan-Tools/Vulkan-Tools.SlackBuild
new file mode 100644
index 0000000000..1e47b57e54
--- /dev/null
+++ b/graphics/Vulkan-Tools/Vulkan-Tools.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for Vulkan-Tools
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=Vulkan-Tools
+VERSION=${VERSION:-1.2.162.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-sdk-$VERSION
+tar xvf $CWD/$PRGNAM-sdk-$VERSION.tar.gz
+cd $PRGNAM-sdk-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Require an older cmake version.
+sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DBUILD_WSI_XCB_SUPPORT=ON \
+    -DBUILD_WSI_XLIB_SUPPORT=ON \
+    -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
+    -DGLSLANG_INSTALL_DIR=/usr \
+    -DVULKAN_HEADERS_INSTALL_DIR=/usr \
+    -DCMAKE_SKIP_RPATH=TRUE \
+    -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 CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md LICENSE.txt README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/Vulkan-Tools/Vulkan-Tools.info b/graphics/Vulkan-Tools/Vulkan-Tools.info
new file mode 100644
index 0000000000..11f37a9fee
--- /dev/null
+++ b/graphics/Vulkan-Tools/Vulkan-Tools.info
@@ -0,0 +1,10 @@
+PRGNAM="Vulkan-Tools"
+VERSION="1.2.162.0"
+HOMEPAGE="https://www.khronos.org/vulkan/"
+DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.162.0/Vulkan-Tools-sdk-1.2.162.0.tar.gz"
+MD5SUM="55b70e8a7fff81fbc2f659e1dcfba1d2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="vulkan-sdk"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/graphics/Vulkan-Tools/slack-desc b/graphics/Vulkan-Tools/slack-desc
new file mode 100644
index 0000000000..ac886d645c
--- /dev/null
+++ b/graphics/Vulkan-Tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+Vulkan-Tools: Vulkan-Tools (Vulkan Utilities and Tools)
+Vulkan-Tools:
+Vulkan-Tools: This project provides Khronos official Vulkan Tools and Utilities.
+Vulkan-Tools:
+Vulkan-Tools: Homepage: https://www.khronos.org/vulkan/
+Vulkan-Tools:
+Vulkan-Tools:
+Vulkan-Tools:
+Vulkan-Tools:
+Vulkan-Tools:
+Vulkan-Tools:
diff --git a/graphics/blender/README b/graphics/blender/README
index 1dc1788be2..7ec5ddf850 100644
--- a/graphics/blender/README
+++ b/graphics/blender/README
@@ -1,5 +1,6 @@
 Blender is the free open source 3D content creation suite, available
 for all major operating systems under the GNU General Public License.
 
-This version repackages the binary bundle, if you wish to build
-from source look for 'Blender' on SBo.
+This version repackages the binary bundle,
+for which only a 64bit version is available from upstream.
+If you wish to build from source look for 'graphics/Blender' on SBo.
diff --git a/graphics/blender/blender.SlackBuild b/graphics/blender/blender.SlackBuild
index 4df6935aca..334a9e41ec 100644
--- a/graphics/blender/blender.SlackBuild
+++ b/graphics/blender/blender.SlackBuild
@@ -27,11 +27,11 @@
 # Thanks to Giorgio Peron <giorgio.peron@gmail.com> for some build tips
 
 PRGNAM=blender
-VERSION=${VERSION:-2.78c}
+VERSION=${VERSION:-2.90.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=${VERSION}-linux-glibc219
+SRCVERSION=${VERSION}-linux64
 
 # We'll remove the libGL* shared libaries that are shipped with blender (and
 # instead use the ones that are shipped with Slackware's Xorg)
@@ -63,14 +63,14 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION-${ARCH}
-tar xvf $CWD/$PRGNAM-$SRCVERSION-${ARCH}.tar.bz2
-cd $PRGNAM-$SRCVERSION-${ARCH}
+rm -rf $PRGNAM-$SRCVERSION
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.xz
+cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 
 # Move the docs to our standard location first
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv GPL-license.txt copyright.txt Python-license.txt readme.html \
+mv *.txt readme.html \
    $PKG/usr/doc/$PRGNAM-$VERSION
 
 # Now move everything else
diff --git a/graphics/blender/blender.info b/graphics/blender/blender.info
index 01a70ecf71..dc059d3be8 100644
--- a/graphics/blender/blender.info
+++ b/graphics/blender/blender.info
@@ -1,10 +1,10 @@
 PRGNAM="blender"
-VERSION="2.78c"
+VERSION="2.90.1"
 HOMEPAGE="http://blender.org"
-DOWNLOAD="http://ftp.nluug.nl/pub/graphics/blender/release/Blender2.78/blender-2.78c-linux-glibc219-i686.tar.bz2"
-MD5SUM="be5315ba731ab4c80ba6b24562022124"
-DOWNLOAD_x86_64="http://ftp.nluug.nl/pub/graphics/blender/release/Blender2.78/blender-2.78c-linux-glibc219-x86_64.tar.bz2"
-MD5SUM_x86_64="6aec4319f0a0cd632f48e07e2866d2ab"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://ftp.nluug.nl/pub/graphics/blender/release/Blender2.90/blender-2.90.1-linux64.tar.xz"
+MD5SUM_x86_64="38c75023edf4c11aff79459a82808a62"
 REQUIRES=""
 MAINTAINER="DhabyX"
 EMAIL="slack.dhabyx@gmail.com"
diff --git a/graphics/converseen/converseen.SlackBuild b/graphics/converseen/converseen.SlackBuild
index a870f1b504..7b8ea81092 100644
--- a/graphics/converseen/converseen.SlackBuild
+++ b/graphics/converseen/converseen.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for converseen
 
-# Copyright 2014-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=converseen
-VERSION=${VERSION:-0.9.8.1}
+VERSION=${VERSION:-0.9.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/graphics/converseen/converseen.info b/graphics/converseen/converseen.info
index 0c94ec0471..812799be6d 100644
--- a/graphics/converseen/converseen.info
+++ b/graphics/converseen/converseen.info
@@ -1,8 +1,8 @@
 PRGNAM="converseen"
-VERSION="0.9.8.1"
+VERSION="0.9.9.0"
 HOMEPAGE="http://converseen.fasterland.net/"
-DOWNLOAD="http://downloads.sourceforge.net/converseen/converseen-0.9.8.1.tar.bz2"
-MD5SUM="c7a5cf9b791777da0bc3689075986155"
+DOWNLOAD="http://downloads.sourceforge.net/converseen/converseen-0.9.9.0.tar.bz2"
+MD5SUM="187e6d792c08ebda33016820b3cf4fbe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/graphics/embree/README b/graphics/embree/README
new file mode 100644
index 0000000000..85e4ce2ad7
--- /dev/null
+++ b/graphics/embree/README
@@ -0,0 +1,43 @@
+Intel® Embree is a collection of high-performance ray tracing kernels,
+developed at Intel. The target users of Intel® Embree are graphics
+application engineers who want to improve the performance of their
+photo-realistic rendering application by leveraging Embree's
+performance- optimized ray tracing kernels. The kernels are optimized
+for the latest Intel® processors with support for SSE, AVX, AVX2, and
+AVX-512 instructions.
+
+Intel® Embree supports runtime code selection to choose the traversal
+and build algorithms that best matches the instruction set of your CPU.
+We recommend using Intel® Embree through its API to get the highest
+benefit from future improvements. Intel® Embree is released as Open
+Source under the Apache 2.0 license.
+
+Intel® Embree supports applications written with the Intel® SPMD Program
+Compiler (ISPC, https://ispc.github.io/) by also providing an ISPC
+interface to the core ray tracing algorithms. This makes it possible to
+write a renderer in ISPC that automatically vectorizes and leverages
+SSE, AVX, AVX2, and AVX-512 instructions. ISPC also supports runtime
+code selection, thus ISPC will select the best code path for your
+application.
+
+Intel® Embree contains algorithms optimized for incoherent workloads
+(e.g. Monte Carlo ray tracing algorithms) and coherent workloads (e.g.
+primary visibility and hard shadow rays).
+
+The single-ray traversal kernels of Intel® Embree provide high
+performance for incoherent workloads and are very easy to integrate into
+existing rendering applications. Using the stream kernels, even higher
+performance for incoherent rays is possible, but integration might
+require significant code changes to the application to use the stream
+paradigm. In general for coherent workloads, the stream mode with
+coherent flag set gives the best performance.
+
+Intel® Embree also supports dynamic scenes by implementing
+high-performance two-level spatial index structure construction
+algorithms.
+
+In addition to the ray tracing kernels, Intel® Embree provides some
+Embree Tutorials to demonstrate how to use the Embree API.
+
+Optional dependency: Intel® Threading Building Blocks (TBB) & Intel®
+SPMD Program Compiler (ISPC)
diff --git a/graphics/embree/embree.SlackBuild b/graphics/embree/embree.SlackBuild
new file mode 100644
index 0000000000..6a70fc784a
--- /dev/null
+++ b/graphics/embree/embree.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Slackware build script for embree
+
+# Copyright 2006-2014  Robby Workman, Northport, AL, USA
+# 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=embree
+VERSION=${VERSION:-3.12.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+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 \
+  -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 {} \;
+
+#EMBREE_API_NAMESPACE:STRING=
+#EMBREE_BACKFACE_CULLING:BOOL=OFF
+#EMBREE_COMPACT_POLYS:BOOL=OFF
+#EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR:STRING=2.0
+#EMBREE_FILTER_FUNCTION:BOOL=ON
+#EMBREE_GEOMETRY_CURVE:BOOL=ON
+#EMBREE_GEOMETRY_GRID:BOOL=ON
+#EMBREE_GEOMETRY_INSTANCE:BOOL=ON
+#EMBREE_GEOMETRY_POINT:BOOL=ON
+#EMBREE_GEOMETRY_QUAD:BOOL=ON
+#EMBREE_GEOMETRY_SUBDIVISION:BOOL=ON
+#EMBREE_GEOMETRY_TRIANGLE:BOOL=ON
+#EMBREE_GEOMETRY_USER:BOOL=ON
+#EMBREE_IGNORE_CMAKE_CXX_FLAGS:BOOL=ON
+#EMBREE_IGNORE_INVALID_RAYS:BOOL=OFF
+#EMBREE_INSTALL_DEPENDENCIES:BOOL=OFF
+#EMBREE_ISA_AVX:BOOL=ON
+#EMBREE_ISA_AVX2:BOOL=ON
+#EMBREE_ISA_AVX512KNL:BOOL=OFF
+#EMBREE_ISA_AVX512SKX:BOOL=ON
+#EMBREE_ISA_SSE2:BOOL=ON
+#EMBREE_ISA_SSE42:BOOL=ON
+#EMBREE_ISPC_EXECUTABLE:FILEPATH=EMBREE_ISPC_EXECUTABLE-NOTFOUND
+#EMBREE_ISPC_SUPPORT:BOOL=ON
+#EMBREE_LIBRARY_NAME:STRING=embree3
+#EMBREE_MAX_INSTANCE_LEVEL_COUNT:STRING=1
+#EMBREE_MAX_ISA:STRING=NONE
+#EMBREE_MIN_WIDTH:BOOL=OFF
+#EMBREE_RAY_MASK:BOOL=OFF
+#EMBREE_RAY_PACKETS:BOOL=ON
+#EMBREE_STACK_PROTECTOR:BOOL=OFF
+#EMBREE_STATIC_LIB:BOOL=OFF
+#EMBREE_STAT_COUNTERS:BOOL=OFF
+#EMBREE_TASKING_SYSTEM:STRING=TBB
+#EMBREE_TUTORIALS:BOOL=ON
+#EMBREE_ZIP_MODE:BOOL=OFF
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc \
+    -DEMBREE_ISPC_SUPPORT=OFF \
+    -DEMBREE_TASKING_SYSTEM=OFF \
+    -DEMBREE_TUTORIALS=OFF \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+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 \
+  third-party-programs-TBB.txt third-party-programs.txt readme.pdf README.md LICENSE.txt CHANGELOG.md doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -name "Makefile*" -exec rm {} \;
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/embree/embree.info b/graphics/embree/embree.info
new file mode 100644
index 0000000000..e5130250b4
--- /dev/null
+++ b/graphics/embree/embree.info
@@ -0,0 +1,10 @@
+PRGNAM="embree"
+VERSION="3.12.1"
+HOMEPAGE="https://www.embree.org"
+DOWNLOAD="https://github.com/embree/embree/archive/v3.12.1/embree-3.12.1.tar.gz"
+MD5SUM="2d24fa44db63ae1900cf6279140abd8a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="glfw3"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/graphics/embree/slack-desc b/graphics/embree/slack-desc
new file mode 100644
index 0000000000..6f4f28dc10
--- /dev/null
+++ b/graphics/embree/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+embree: embree (ray tracing kernels)
+embree:
+embree: Intel® Embree is a collection of high-performance ray tracing kernels,
+embree: developed at Intel.
+embree: The target users of Intel® Embree are graphics application engineers
+embree: who want to improve the performance of their photo-realistic rendering
+embree: application by leveraging Embree's performance-optimized ray tracing
+embree: kernels.
+embree:
+embree: Homepage: https://www.embree.org/
+embree:
diff --git a/graphics/exif/exif.SlackBuild b/graphics/exif/exif.SlackBuild
index 843f8d5039..c18c99c8a4 100644
--- a/graphics/exif/exif.SlackBuild
+++ b/graphics/exif/exif.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for exif
 
-# Copyright 2012-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exif
-VERSION=${VERSION:-0.6.21}
+VERSION=${VERSION:-0.6.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/graphics/exif/exif.info b/graphics/exif/exif.info
index 7b8d3fc89a..60c9dcb2c9 100644
--- a/graphics/exif/exif.info
+++ b/graphics/exif/exif.info
@@ -1,8 +1,8 @@
 PRGNAM="exif"
-VERSION="0.6.21"
+VERSION="0.6.22"
 HOMEPAGE="https://libexif.github.io/"
-DOWNLOAD="https://sourceforge.net/projects/libexif/files/exif/0.6.21/exif-0.6.21.tar.bz2"
-MD5SUM="0e744471b8c3b3b1534d5af38bbf6408"
+DOWNLOAD="https://github.com/libexif/exif/releases/download/exif-0_6_22-release/exif-0.6.22.tar.xz"
+MD5SUM="bc600b12c50fbb26f025819164d963e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/fbgrab/README b/graphics/fbgrab/README
new file mode 100644
index 0000000000..aa736ff03d
--- /dev/null
+++ b/graphics/fbgrab/README
@@ -0,0 +1,2 @@
+FBGrab is a framebuffer screenshot program, capturing the linux
+frambuffer and converting it to a png-picture.
diff --git a/graphics/fbgrab/fbgrab.SlackBuild b/graphics/fbgrab/fbgrab.SlackBuild
new file mode 100644
index 0000000000..c232b5b4b9
--- /dev/null
+++ b/graphics/fbgrab/fbgrab.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for fbgrab
+
+# Copyright 2020 Serg Bormant
+# 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=fbgrab
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e 's,/usr/share/man/,/usr/man/,' Makefile
+CFLAGS="$SLKCFLAGS" \
+  make
+make install DESTDIR=$PKG
+
+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 \
+  COPYING INSTALL \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/fbgrab/fbgrab.info b/graphics/fbgrab/fbgrab.info
new file mode 100644
index 0000000000..6ed406b0fc
--- /dev/null
+++ b/graphics/fbgrab/fbgrab.info
@@ -0,0 +1,10 @@
+PRGNAM="fbgrab"
+VERSION="1.4"
+HOMEPAGE="https://github.com/GunnarMonell/fbgrab"
+DOWNLOAD="https://github.com/GunnarMonell/fbgrab/archive/1.4/fbgrab-1.4.tar.gz"
+MD5SUM="5a1df4d79b335ece8d9cf88de7e3e898"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Serg Bormant"
+EMAIL="bormant@mail.ru"
diff --git a/network/fping3/slack-desc b/graphics/fbgrab/slack-desc
index e65a12eed9..18d9208227 100644
--- a/network/fping3/slack-desc
+++ b/graphics/fbgrab/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-fping3: fping3 (send ICMP ECHO_REQUEST packets to network hosts)
-fping3:
-fping3: fping is a program to send ICMP echo probes to network hosts, similar
-fping3: to ping, but much better performing when pinging multiple hosts.
-fping3:
-fping3: Homepage: http://fping.org/
-fping3:
-fping3:
-fping3:
-fping3:
-fping3:
+fbgrab: fbgrab (framebuffer screenshot program)
+fbgrab:
+fbgrab: FBGrab is a framebuffer screenshot program, capturing the linux
+fbgrab: frambuffer and converting it to a png-picture.
+fbgrab: 
+fbgrab: Homepage: https://github.com/GunnarMonell/fbgrab
+fbgrab:
+fbgrab:
+fbgrab:
+fbgrab:
+fbgrab:
diff --git a/graphics/fbpic/fbpic.SlackBuild b/graphics/fbpic/fbpic.SlackBuild
index 1bc2e5358f..516c911975 100644
--- a/graphics/fbpic/fbpic.SlackBuild
+++ b/graphics/fbpic/fbpic.SlackBuild
@@ -4,9 +4,13 @@
 
 # Written by K.D.Hedger kdhedger@yahoo.co.uk
 
+# 20210122 bkw: modified by SlackBuilds.org: This has been broken
+# for years and nobody complained. Made it build, and use standard
+# SLKCFLAGS.
+
 PRGNAM=fbpic
 VERSION=${VERSION:-0.0.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -29,32 +33,29 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O3 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM.tgz
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod 644 *
 
-CXXFLAGS="$SLKCFLAGS" \
-make
+make CXXFLAGS="$SLKCFLAGS"
 make install PREFIX=/usr DESTDIR=$PKG
 
-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
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/fbpic/fbpic.info b/graphics/fbpic/fbpic.info
index 8962c50070..b0608deb5f 100644
--- a/graphics/fbpic/fbpic.info
+++ b/graphics/fbpic/fbpic.info
@@ -1,6 +1,6 @@
 PRGNAM="fbpic"
 VERSION="0.0.2"
-HOMEPAGE="http://keithhedger.hostingsiteforfree.com"
+HOMEPAGE="http://web.archive.org/web/20140723200425/http://keithhedger.hostingsiteforfree.com/pages/apps.html#fbpic"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/fbpic.tgz"
 MD5SUM="74d77dee97a4004cc165a34b98cfb4c6"
 DOWNLOAD_x86_64=""
diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild
index 7d0a6e376f..4873d18f5a 100644
--- a/graphics/feh/feh.SlackBuild
+++ b/graphics/feh/feh.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
 # Copyright 2011-2012 Grigorios Bouzakis <grbzks@imap.cc>
 # Copyright 2014-2015 Luka Novsak <lnovsak@gmail.com>
-# Copyright 2017-2020 Hunter Sezen <orbea@riseup.net>
+# Copyright 2017-2021 Hunter Sezen <orbea@riseup.net>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -24,7 +24,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=feh
-VERSION=${VERSION:-3.5}
+VERSION=${VERSION:-3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/feh/feh.info b/graphics/feh/feh.info
index dadf738639..5be6bc0044 100644
--- a/graphics/feh/feh.info
+++ b/graphics/feh/feh.info
@@ -1,8 +1,8 @@
 PRGNAM="feh"
-VERSION="3.5"
+VERSION="3.6.1"
 HOMEPAGE="https://feh.finalrewind.org"
-DOWNLOAD="https://feh.finalrewind.org/feh-3.5.tar.bz2"
-MD5SUM="8fb620a84e65c3af40b2f559b1d075c4"
+DOWNLOAD="https://feh.finalrewind.org/feh-3.6.1.tar.bz2"
+MD5SUM="0dd986d77805cd306a81864c69cf040c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
diff --git a/graphics/flameshot/flameshot.SlackBuild b/graphics/flameshot/flameshot.SlackBuild
index 0e8f69f2af..1f0df31576 100644
--- a/graphics/flameshot/flameshot.SlackBuild
+++ b/graphics/flameshot/flameshot.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flameshot
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.8.5}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -70,19 +70,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-qmake-qt5 -recursive flameshot.pro \
-  PREFIX=/usr \
-  CONFIG+=packaging \
-  QMAKE_CFLAGS="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS="$SLKCFLAGS"
-make
-make install INSTALL_ROOT=$PKG
+mkdir -p build
+cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  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 CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md docs/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/flameshot/flameshot.info b/graphics/flameshot/flameshot.info
index 1d357c9f06..8ef185bd1e 100644
--- a/graphics/flameshot/flameshot.info
+++ b/graphics/flameshot/flameshot.info
@@ -1,10 +1,10 @@
 PRGNAM="flameshot"
-VERSION="0.6.0"
+VERSION="0.8.5"
 HOMEPAGE="https://flameshot.js.org"
-DOWNLOAD="https://github.com/lupoDharkael/flameshot/archive/v0.6.0/flameshot-0.6.0.tar.gz"
-MD5SUM="e7bfcd53264c5b105556580cf0f2c231"
+DOWNLOAD="https://github.com/lupoDharkael/flameshot/archive/v0.8.5/flameshot-0.8.5.tar.gz"
+MD5SUM="be843bc62c0955a0aadc2a5dcc66e4b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES="qt5 cmake-202x"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"
diff --git a/graphics/flpsed/README b/graphics/flpsed/README
index f74832118f..78805bb4a5 100644
--- a/graphics/flpsed/README
+++ b/graphics/flpsed/README
@@ -1,6 +1,8 @@
-flpsed is a WYSIWYG PostScript annotator.  You can't remove or modify 
-existing elements of a document, but flpsed lets you add arbitrary 
-text lines to existing PostScript documents.  Added lines can later 
-be reedited with flpsed.  Using pdftops, which is part of xpdf, one 
-can convert PDF documents to PostScript and also add text to them. 
-flpsed is useful for filling in forms, adding notes, etcetera. 
+flpsed (WYSIWYG PostScript annotator)
+
+flpsed is a WYSIWYG PostScript annotator. You can't remove or modify
+existing elements of a document, but flpsed lets you add arbitrary
+text lines to existing PostScript documents. Added lines can later
+be reedited with flpsed. Using pdftops, which is part of xpdf, one
+can convert PDF documents to PostScript and also add text to them.
+flpsed is useful for filling in forms, adding notes, et cetera.
diff --git a/graphics/flpsed/flpsed.SlackBuild b/graphics/flpsed/flpsed.SlackBuild
index 29e74628b0..80b9bea7a3 100644
--- a/graphics/flpsed/flpsed.SlackBuild
+++ b/graphics/flpsed/flpsed.SlackBuild
@@ -1,14 +1,19 @@
 #!/bin/sh
 
 # Slackware build script for flpsed
-# Originally written by Jack Maddox <jackmaddox@gmail.com>
+# Originally written by Jack Maddox <email removed>
 # Currently maintained by B. Watson <yalhcru@gmail.com>
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201102 bkw: BUILD=2
+# - Include icons in the package
+# - Get rid of INSTALL in doc dir
+# - Homepage went away, use Fedora download and archive.org homepage.
+
 PRGNAM=flpsed
 VERSION=${VERSION:-0.7.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -47,11 +52,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -69,11 +71,18 @@ make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README INSTALL COPYING AUTHORS NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING AUTHORS NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# upstream ships icons but doesn't 'make install' them.
+mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/icons/hicolor/scalable/apps/
+cat $PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+gzip -9c < $PRGNAM.svg > $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svgz
+
 mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+sed "/^Icon=\$/s,\$,$PRGNAM," \
+    $CWD/$PRGNAM.desktop > \
+    $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/flpsed/flpsed.info b/graphics/flpsed/flpsed.info
index 63a4e36d36..05c17f7f47 100644
--- a/graphics/flpsed/flpsed.info
+++ b/graphics/flpsed/flpsed.info
@@ -1,7 +1,7 @@
 PRGNAM="flpsed"
 VERSION="0.7.3"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-DOWNLOAD="http://flpsed.org/flpsed-0.7.3.tar.gz"
+HOMEPAGE="http://web.archive.org/web/20201018005250/https://flpsed.org/flpsed.html"
+DOWNLOAD="https://src.fedoraproject.org/repo/pkgs/flpsed/flpsed-0.7.3.tar.gz/3b7c2ffd349a41c2e484dad3fd3d73d0/flpsed-0.7.3.tar.gz"
 MD5SUM="3b7c2ffd349a41c2e484dad3fd3d73d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/flpsed/slack-desc b/graphics/flpsed/slack-desc
index f51e89dcb6..5600ed01e4 100644
--- a/graphics/flpsed/slack-desc
+++ b/graphics/flpsed/slack-desc
@@ -8,10 +8,10 @@
       |-----handy-ruler------------------------------------------------------|
 flpsed: flpsed (WYSIWYG PostScript annotator)
 flpsed:
-flpsed: flpsed is a WYSIWYG PostScript annotator.  You can't remove or modify
+flpsed: flpsed is a WYSIWYG PostScript annotator. You can't remove or modify
 flpsed: existing elements of a document, but flpsed lets you add arbitrary
-flpsed: text lines to existing PostScript documents.  Added lines can later
-flpsed: be reedited with flpsed.  Using pdftops, which is part of xpdf, one
+flpsed: text lines to existing PostScript documents. Added lines can later
+flpsed: be reedited with flpsed. Using pdftops, which is part of xpdf, one
 flpsed: can convert PDF documents to PostScript and also add text to them.
 flpsed: flpsed is useful for filling in forms, adding notes, etcetera.
 flpsed:
diff --git a/graphics/glslang/README b/graphics/glslang/README
index e93d06b191..d61381b370 100644
--- a/graphics/glslang/README
+++ b/graphics/glslang/README
@@ -1,2 +1,5 @@
 Khronos-reference front end for GLSL/ESSL, partial front end for HLSL,
 and a SPIR-V generator.
+
+If SPIRV-Tools is not installed a package will be created where illegal
+SPIRV may be generated for HLSL.
diff --git a/graphics/glslang/SPIRV-Tools-shared.patch b/graphics/glslang/SPIRV-Tools-shared.patch
new file mode 100644
index 0000000000..34cb8ad9bc
--- /dev/null
+++ b/graphics/glslang/SPIRV-Tools-shared.patch
@@ -0,0 +1,61 @@
+From 1504af077935a0bfd1b1b59f77d8b1cd89f913b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
+Date: Mon, 10 Dec 2018 13:05:15 +0100
+Subject: [PATCH] CMake: Allow linking against system-installed SPIRV-Tools
+
+Fixes #1585.
+---
+ CMakeLists.txt       |  7 ++++++-
+ SPIRV/CMakeLists.txt | 21 +++++++++++++--------
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ada2b8fb9..22243f491 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -320,7 +320,12 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
+     add_subdirectory(External)
+ endif()
+ 
+-if(NOT TARGET SPIRV-Tools-opt)
++find_package(PkgConfig)
++if(PkgConfig_FOUND)
++    pkg_check_modules(SPIRV-Tools SPIRV-Tools)
++endif()
++# Former would be system-installed, later is from External
++if(NOT SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools-opt)
+     set(ENABLE_OPT OFF)
+ endif()
+ 
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index d699daddb..28beb47bb 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -91,14 +91,19 @@ if(WIN32 AND BUILD_SHARED_LIBS)
+ endif()
+ 
+ if(ENABLE_OPT)
+-    target_include_directories(SPIRV
+-        PRIVATE ${spirv-tools_SOURCE_DIR}/include
+-        PRIVATE ${spirv-tools_SOURCE_DIR}/source
+-    )
+-    target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
+-    target_include_directories(SPIRV PUBLIC
+-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++    if(SPIRV-Tools_FOUND)
++        target_include_directories(SPIRV PUBLIC ${SPIRV-Tools_INCLUDEDIR})
++        target_link_libraries(SPIRV glslang ${SPIRV-Tools_LIBRARIES})
++    else()
++        target_include_directories(SPIRV
++            PRIVATE ${spirv-tools_SOURCE_DIR}/include
++            PRIVATE ${spirv-tools_SOURCE_DIR}/source
++        )
++        target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
++        target_include_directories(SPIRV PUBLIC
++            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
++            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++    endif()
+ else()
+     target_link_libraries(SPIRV PRIVATE MachineIndependent)
+ endif(ENABLE_OPT)
diff --git a/graphics/glslang/glslang.SlackBuild b/graphics/glslang/glslang.SlackBuild
index d51ff730b5..db38ad19a9 100644
--- a/graphics/glslang/glslang.SlackBuild
+++ b/graphics/glslang/glslang.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for glslang
 
-# Copyright 2020 Hunter Sezen California, USA
+# Copyright 2020-2021 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# For best compatibility use git versions which vulkan-sdk upstream also uses.
-# Vulkan-ValidationLayers/scripts/known_good.json
-# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1082
-
 PRGNAM=glslang
-VERSION=${VERSION:-bacaef3237c515e40d1a24722be48c0a0b30f75f}
+VERSION=${VERSION:-11.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,27 +56,12 @@ fi
 
 set -eu
 
-# For best compatibility use git versions which glslang upstream also uses.
-# glslang/known_good.json
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-060627f0b0d2fa8581b5acb939f46e3b9e500593}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-0a1fb588cd365f7737cb121fdd64553923e0cef6}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
-(
-  cd External
-  tar xvf $CWD/SPIRV-Tools-$SPIRV_TOOLS_VERSION.tar.gz
-  mv SPIRV-Tools-$SPIRV_TOOLS_VERSION spirv-tools
-  cd spirv-tools/external
-  tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.gz
-  mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers
-)
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -88,13 +69,18 @@ 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 {} \;
 
+# CMake: Allow linking against system-installed SPIRV-Tools
+# https://github.com/KhronosGroup/glslang/issues/1585
+# https://github.com/KhronosGroup/glslang/pull/1621
+patch -p1 < $CWD/SPIRV-Tools-shared.patch
+
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DBUILD_EXTERNAL=OFF \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
@@ -112,7 +98,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/graphics/glslang/glslang.info b/graphics/glslang/glslang.info
index 4ef3491d89..2fd87c7139 100644
--- a/graphics/glslang/glslang.info
+++ b/graphics/glslang/glslang.info
@@ -1,14 +1,10 @@
 PRGNAM="glslang"
-VERSION="bacaef3237c515e40d1a24722be48c0a0b30f75f"
+VERSION="11.1.0"
 HOMEPAGE="https://github.com/KhronosGroup/glslang"
-DOWNLOAD="https://github.com/KhronosGroup/glslang/archive/bacaef3237c515e40d1a24722be48c0a0b30f75f/glslang-bacaef3237c515e40d1a24722be48c0a0b30f75f.tar.gz \
-          https://github.com/KhronosGroup/SPIRV-Headers/archive/060627f0b0d2fa8581b5acb939f46e3b9e500593/SPIRV-Headers-060627f0b0d2fa8581b5acb939f46e3b9e500593.tar.gz \
-          https://github.com/KhronosGroup/SPIRV-Tools/archive/0a1fb588cd365f7737cb121fdd64553923e0cef6/SPIRV-Tools-0a1fb588cd365f7737cb121fdd64553923e0cef6.tar.gz"
-MD5SUM="3e631acd4c41c0d5a0b8dd42d32d32c6 \
-        459fc2b250130c38c31e2d9690d32e69 \
-        9ebcd80ceda36ee2df65daf33bb332b2"
+DOWNLOAD="https://github.com/KhronosGroup/glslang/archive/11.1.0/glslang-11.1.0.tar.gz"
+MD5SUM="1688a1e36945d72df960b859ede55078"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES="SPIRV-Tools"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/graphics/graphite2/README b/graphics/graphite2/README
index 8084db6fb0..03a0e630a8 100644
--- a/graphics/graphite2/README
+++ b/graphics/graphite2/README
@@ -6,3 +6,5 @@ indicating how to combine and position the letters in complex ways.
 Graphite was primarily developed to provide the flexibility needed for
 minority languages which often need to be written according to slightly
 different rules than well-known languages that use the same script.
+
+python3 is an optional dependency.
diff --git a/graphics/graphite2/graphite2.SlackBuild b/graphics/graphite2/graphite2.SlackBuild
index ed4a1ef360..c047c832bf 100644
--- a/graphics/graphite2/graphite2.SlackBuild
+++ b/graphics/graphite2/graphite2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for graphite2
 
-# Copyright 2015-2018 Hunter Sezen California, USA
+# Copyright 2015-2018, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=graphite2
-VERSION=${VERSION:-1.3.13}
+VERSION=${VERSION:-1.3.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,6 +76,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release \
     -Wno-dev ..
   make
diff --git a/graphics/graphite2/graphite2.info b/graphics/graphite2/graphite2.info
index b627fa40a6..3402fcc300 100644
--- a/graphics/graphite2/graphite2.info
+++ b/graphics/graphite2/graphite2.info
@@ -1,8 +1,8 @@
 PRGNAM="graphite2"
-VERSION="1.3.13"
+VERSION="1.3.14"
 HOMEPAGE="http://graphite.sil.org/"
-DOWNLOAD="https://github.com/silnrsi/graphite/releases/download/1.3.13/graphite2-1.3.13.tgz"
-MD5SUM="29616d4f9651706036ca25c111508272"
+DOWNLOAD="https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.tgz"
+MD5SUM="1bccb985a7da01092bfb53bb5041e836"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/gscan2pdf/README b/graphics/gscan2pdf/README
index a8925e3b54..c2cbdf489c 100644
--- a/graphics/gscan2pdf/README
+++ b/graphics/gscan2pdf/README
@@ -5,3 +5,6 @@ gscan2pdf should work on almost any Linux/BSD machine.
 
 -> Scan one or several pages in with File/Scan,
 -> Create PDF of selected pages with File/Save.
+
+Run the tests with:
+   MAKETEST=yes ./gscan2pdf.SlackBuild
diff --git a/graphics/gscan2pdf/gscan2pdf.SlackBuild b/graphics/gscan2pdf/gscan2pdf.SlackBuild
index e64600333b..2f27d18337 100644
--- a/graphics/gscan2pdf/gscan2pdf.SlackBuild
+++ b/graphics/gscan2pdf/gscan2pdf.SlackBuild
@@ -22,10 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-##             !!!!!!!!!  'make test'  commented out  !!!!!!!!
-
 PRGNAM=gscan2pdf
-VERSION=${VERSION:-2.6.3}
+VERSION=${VERSION:-2.11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,6 +78,9 @@ perl Makefile.PL \
   INSTALLVENDORMAN1DIR=/usr/man/man1 \
   INSTALLVENDORMAN3DIR=/usr/man/man3
 make
+if [ "${MAKETEST:-no}" = "yes" ]; then
+  make test
+fi
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/graphics/gscan2pdf/gscan2pdf.info b/graphics/gscan2pdf/gscan2pdf.info
index 73539fb9f2..89c1e917ad 100644
--- a/graphics/gscan2pdf/gscan2pdf.info
+++ b/graphics/gscan2pdf/gscan2pdf.info
@@ -1,10 +1,10 @@
 PRGNAM="gscan2pdf"
-VERSION="2.6.3"
+VERSION="2.11.0"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/gscan2pdf/files/gscan2pdf/2.6.3/gscan2pdf-2.6.3.tar.xz"
-MD5SUM="d9326a7cc51bf37fbd10e3cc5f1e79fb"
+DOWNLOAD="https://sourceforge.net/projects/gscan2pdf/files/gscan2pdf/2.11.0/gscan2pdf-2.11.0.tar.xz"
+MD5SUM="8cab16574dd95cab3d7d7c3b5c43ea60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Image-Sane perl-Image-Magick perl-Log-Log4perl perl-Date-Calc perl-GooCanvas2 perl-config-general"
+REQUIRES="perl-glib perl-Gtk3 perl-Image-Sane perl-Image-Magick perl-IPC-System-Simple perl-Date-Calc perl-html-parser perl-Log-Log4perl perl-Try-Tiny perl-Carp-Clan perl-Sub-Override perl-PDF-Builder perl-Proc-ProcessTable perl-Gtk3 perl-Set-IntSpan perl-List-MoreUtils perl-Filesys-Df"
 MAINTAINER="Michel A. BEGUE"
 EMAIL="mab974@gmail.com"
diff --git a/graphics/img2pdf/README b/graphics/img2pdf/README
new file mode 100644
index 0000000000..7da803e3ac
--- /dev/null
+++ b/graphics/img2pdf/README
@@ -0,0 +1,234 @@
+img2pdf
+
+Lossless conversion of raster images to PDF. You should use img2pdf if
+your priorities are (in this order):
+
+    always lossless: the image embedded in the PDF will always have the
+exact same color information for every pixel as the input small: if
+possible, the difference in filesize between the input image and the
+output PDF will only be the overhead of the PDF container itself fast:
+if possible, the input image is just pasted into the PDF document as-is
+without any CPU hungry re-encoding of the pixel data
+
+Conventional conversion software (like ImageMagick) would either:
+
+    not be lossless because lossy re-encoding to JPEG not be small
+because using wasteful flate encoding of raw pixel data not be fast
+because input data gets re-encoded
+
+Another advantage of not having to re-encode the input (in most common
+situations) is, that img2pdf is able to handle much larger input than
+other software, because the raw pixel data never has to be loaded into
+memory.
+
+The following table shows how img2pdf handles different input depending
+on the input file format and image color space.  Format
+Colorspace 	Result JPEG 	any 	direct JPEG2000 	any
+direct PNG (non-interlaced) 	any 	direct TIFF (CCITT Group 4)
+monochrome 	direct any 	any except CMYK and monochrome 	PNG
+Paeth any 	monochrome 	CCITT Group 4 any 	CMYK 	flate
+
+For JPEG, JPEG2000, non-interlaced PNG and TIFF images with CCITT Group
+4 encoded data, img2pdf directly embeds the image data into the PDF
+without re-encoding it. It thus treats the PDF format merely as a
+container format for the image data. In these cases, img2pdf only
+increases the filesize by the size of the PDF container (typically
+around 500 to 700 bytes). Since data is only copied and not re-encoded,
+img2pdf is also typically faster than other solutions for these input
+formats.
+
+For all other input types, img2pdf first has to transform the pixel data
+to make it compatible with PDF. In most cases, the PNG Paeth filter is
+applied to the pixel data. For monochrome input, CCITT Group 4 is used
+instead. Only for CMYK input no filter is applied before finally
+applying flate compression.  Usage
+
+The images must be provided as files because img2pdf needs to seek in
+the file descriptor.
+
+If no output file is specified with the -o/--output option, output will
+be done to stdout. A typical invocation is:
+
+$ img2pdf img1.png img2.jpg -o out.pdf
+
+The detailed documentation can be accessed by running:
+
+$ img2pdf --help
+
+Bugs
+
+    If you find a JPEG, JPEG2000, PNG or CCITT Group 4 encoded TIFF file
+that, when embedded into the PDF cannot be read by the Adobe Acrobat
+Reader, please contact me.
+
+    I have not yet figured out how to determine the colorspace of
+JPEG2000 files. Therefore JPEG2000 files use DeviceRGB by default. For
+JPEG2000 files with other colorspaces, you must explicitly specify it
+using the --colorspace option.
+
+    Input images with alpha channels are not allowed. PDF only supports
+transparency using binary masks but is unable to store 8-bit
+transparency information as part of the image itself. But img2pdf will
+always be lossless and thus, input images must not carry transparency
+information.
+
+    img2pdf uses PIL (or Pillow) to obtain image meta data and to
+convert the input if necessary. To prevent decompression bomb denial of
+service attacks, Pillow limits the maximum number of pixels an input
+image is allowed to have. If you are sure that you know what you are
+doing, then you can disable this safeguard by passing the
+--pillow-limit-break option to img2pdf. This allows one to process even
+very large input images.
+
+Installation
+
+On a Debian- and Ubuntu-based systems, img2pdf can be installed from the
+official repositories:
+
+$ apt install img2pdf
+
+If you want to install it using pip, you can run:
+
+$ pip3 install img2pdf
+
+If you prefer to install from source code use:
+
+$ cd img2pdf/ $ pip3 install .
+
+To test the console script without installing the package on your
+system, use virtualenv:
+
+$ cd img2pdf/ $ virtualenv ve $ ve/bin/pip3 install .
+
+You can then test the converter using:
+
+$ ve/bin/img2pdf -o test.pdf src/tests/test.jpg
+
+For Microsoft Windows users, PyInstaller based .exe files are produced
+by appveyor. If you don't want to install Python before using img2pdf
+you can head to appveyor and click on "Artifacts" to download the latest
+version: https://ci.appveyor.com/project/josch/img2pdf GUI
+
+There exists an experimental GUI with all settings currently disabled.
+You can directly convert images to PDF but you cannot set any options
+via the GUI yet. If you are interested in adding more features to the
+PDF, please submit a merge request. The GUI is based on tkinter and
+works on Linux, Windows and MacOS.
+
+Library
+
+The package can also be used as a library:
+
+import img2pdf
+
+# opening from filename with open("name.pdf","wb") as f:
+f.write(img2pdf.convert('test.jpg'))
+
+# opening from file handle with open("name.pdf","wb") as f1,
+open("test.jpg") as f2: f1.write(img2pdf.convert(f2))
+
+# using in-memory image data with open("name.pdf","wb") as f:
+f.write(img2pdf.convert("\x89PNG...")
+
+# multiple inputs (variant 1) with open("name.pdf","wb") as f:
+f.write(img2pdf.convert("test1.jpg", "test2.png"))
+
+# multiple inputs (variant 2) with open("name.pdf","wb") as f:
+f.write(img2pdf.convert(["test1.jpg", "test2.png"]))
+
+# convert all files ending in .jpg inside a directory dirname =
+"/path/to/images" with open("name.pdf","wb") as f: imgs = [] for fname
+in os.listdir(dirname): if not fname.endswith(".jpg"): continue path =
+os.path.join(dirname, fname) if os.path.isdir(path): continue
+imgs.append(path) f.write(img2pdf.convert(imgs))
+
+# convert all files ending in .jpg in a directory and its subdirectories
+dirname = "/path/to/images" with open("name.pdf","wb") as f: imgs = []
+for r, _, f in os.walk(dirname): for fname in f: if not
+fname.endswith(".jpg"): continue imgs.append(os.path.join(r, fname))
+f.write(img2pdf.convert(imgs))
+
+
+# convert all files matching a glob import glob with
+open("name.pdf","wb") as f:
+f.write(img2pdf.convert(glob.glob("/path/to/*.jpg")))
+
+# writing to file descriptor with open("name.pdf","wb") as f1,
+open("test.jpg") as f2: img2pdf.convert(f2, outputstream=f1)
+
+# specify paper size (A4) a4inpt =
+(img2pdf.mm_to_pt(210),img2pdf.mm_to_pt(297)) layout_fun =
+img2pdf.get_layout_fun(a4inpt) with open("name.pdf","wb") as f:
+f.write(img2pdf.convert('test.jpg', layout_fun=layout_fun))
+
+Comparison to ImageMagick
+
+Create a large test image:
+
+$ convert logo: -resize 8000x original.jpg
+
+Convert it into PDF using ImageMagick and img2pdf:
+
+$ time img2pdf original.jpg -o img2pdf.pdf $ time convert original.jpg
+imagemagick.pdf
+
+Notice how ImageMagick took an order of magnitude longer to do the
+conversion than img2pdf. It also used twice the memory.
+
+Now extract the image data from both PDF documents and compare it to the
+original:
+
+$ pdfimages -all img2pdf.pdf tmp $ compare -metric AE original.jpg
+tmp-000.jpg null: 0 $ pdfimages -all imagemagick.pdf tmp $ compare
+-metric AE original.jpg tmp-000.jpg null: 118716
+
+To get lossless output with ImageMagick we can use Zip compression but
+that unnecessarily increases the size of the output:
+
+$ convert original.jpg -compress Zip imagemagick.pdf $ pdfimages -all
+imagemagick.pdf tmp $ compare -metric AE original.jpg tmp-000.png null:
+0 $ stat --format="%s %n" original.jpg img2pdf.pdf imagemagick.pdf
+1535837 original.jpg 1536683 img2pdf.pdf 9397809 imagemagick.pdf
+
+Comparison to pdfLaTeX
+
+pdfLaTeX performs a lossless conversion from included images to PDF by
+default. If the input is a JPEG, then it simply embeds the JPEG into the
+PDF in the same way as img2pdf does it. But for other image formats it
+uses flate compression of the plain pixel data and thus needlessly
+increases the output file size:
+
+$ convert logo: -resize 8000x original.png $ cat << END > pdflatex.tex
+\documentclass{article} \usepackage{graphicx} \begin{document}
+\includegraphics{original.png} \end{document} END $ pdflatex
+pdflatex.tex $ stat --format="%s %n" original.png pdflatex.pdf 4500182
+original.png 9318120 pdflatex.pdf
+
+Comparison to podofoimg2pdf
+
+Like pdfLaTeX, podofoimg2pdf is able to perform a lossless conversion
+from JPEG to PDF by plainly embedding the JPEG data into the pdf
+container. But just like pdfLaTeX it uses flate compression for all
+other file formats, thus sometimes resulting in larger files than
+necessary.
+
+$ convert logo: -resize 8000x original.png $ podofoimg2pdf out.pdf
+original.png stat --format="%s %n" original.png out.pdf 4500181
+original.png 9335629 out.pdf
+
+It also only supports JPEG, PNG and TIF as input and lacks many of the
+convenience features of img2pdf like page sizes, borders, rotation and
+metadata.  Comparison to Tesseract OCR
+
+Tesseract OCR comes closest to the functionality img2pdf provides. It is
+able to convert JPEG and PNG input to PDF without needlessly increasing
+the filesize and is at the same time lossless. So if your input is JPEG
+and PNG images, then you should safely be able to use Tesseract instead
+of img2pdf. For other input, Tesseract might not do a lossless
+conversion. For example it converts CMYK input to RGB and removes the
+alpha channel from images with transparency. For multipage TIFF or
+animated GIF, it will only convert the first frame.
+
+OPTIONAL:
+
+python3
diff --git a/graphics/img2pdf/img2pdf.SlackBuild b/graphics/img2pdf/img2pdf.SlackBuild
new file mode 100644
index 0000000000..87a3ae33eb
--- /dev/null
+++ b/graphics/img2pdf/img2pdf.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for img2pdf
+
+# Copyright 2020 Alan Aversa
+# 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=img2pdf
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}		
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}		
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i "s/self.qmake_bin = 'qmake'/self.qmake_bin = 'qmake-qt5'/" setup.py
+
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+else
+  python setup.py install --root=$PKG
+fi
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/img2pdf/img2pdf.info b/graphics/img2pdf/img2pdf.info
new file mode 100644
index 0000000000..757c4f4abb
--- /dev/null
+++ b/graphics/img2pdf/img2pdf.info
@@ -0,0 +1,10 @@
+PRGNAM="img2pdf"
+VERSION="0.4.0"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+DOWNLOAD="https://files.pythonhosted.org/packages/80/ed/5167992abaf268f5a5867e974d9d36a8fa4802800898ec711f4e1942b4f5/img2pdf-0.4.0.tar.gz"
+MD5SUM="e4e3510dd301e50a5d03739bf9991a86"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"
diff --git a/graphics/img2pdf/slack-desc b/graphics/img2pdf/slack-desc
new file mode 100644
index 0000000000..de4242d2bb
--- /dev/null
+++ b/graphics/img2pdf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+img2pdf: img2pdf (Lossless conversion of raster images to PDF.)
+img2pdf:
+img2pdf: A Python package to losslessly convert raster images to PDF.
+img2pdf: 
+img2pdf: Created and currently maintained by josch 
+img2pdf: https://pypi.org/user/josch/
+img2pdf: 
+img2pdf: Homepage: https://gitlab.mister-muffin.de/josch/img2pdf
+img2pdf: 
+img2pdf: 
+img2pdf: 
diff --git a/graphics/imv/README b/graphics/imv/README
new file mode 100644
index 0000000000..30357235ef
--- /dev/null
+++ b/graphics/imv/README
@@ -0,0 +1,34 @@
+imv (image viewer for X and/or Wayland)
+
+imv is a command line image viewer intended for use with tiling window
+managers. Features:
+
+* Native Wayland [2] and X11 [1] support
+* Support for dozens of image formats including:
+  * PNG [1]
+  * JPEG [1]
+  * Animated GIFs [3]
+  * SVG [4]
+  * TIFF [1]
+  * Various RAW formats [5]
+  * Photoshop PSD files [5]
+* Configurable key bindings and behaviour
+* Highly scriptable with IPC via imv-msg
+
+Optional dependencies (autodetected):
+
+- wayland
+- FreeImage (support for GIF, RAW, PSD formats)
+- libnsgif (support for GIF)
+
+If you don't have at least one of FreeImage or libnsgif, imv won't
+support GIF images at all.
+
+Notes:
+
+[1] - uses a library from core Slackware, so always enabled.
+[2] - requires wayland.
+[3] - requires either FreeImage or libnsgif.
+[4] - imv supports SVG images, but the librsvg in Slackware 14.2 is too
+      old for imv to use, so SVG support is disabled. Sorry.
+[5] - requires FreeImage.
diff --git a/network/qbittorrent-qt5/doinst.sh b/graphics/imv/doinst.sh
index d3350f3157..7a6eafcfff 100644
--- a/network/qbittorrent-qt5/doinst.sh
+++ b/graphics/imv/doinst.sh
@@ -1,24 +1,25 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/rc.d/rc.qbittorrent-nox.new
+config etc/imv/imv_config.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
diff --git a/graphics/imv/icons/16.png b/graphics/imv/icons/16.png
new file mode 100644
index 0000000000..8da696a803
--- /dev/null
+++ b/graphics/imv/icons/16.png
diff --git a/graphics/imv/icons/22.png b/graphics/imv/icons/22.png
new file mode 100644
index 0000000000..3a766591f7
--- /dev/null
+++ b/graphics/imv/icons/22.png
diff --git a/graphics/imv/icons/24.png b/graphics/imv/icons/24.png
new file mode 100644
index 0000000000..69549b70a2
--- /dev/null
+++ b/graphics/imv/icons/24.png
diff --git a/graphics/imv/icons/48.png b/graphics/imv/icons/48.png
new file mode 100644
index 0000000000..31bb9ee702
--- /dev/null
+++ b/graphics/imv/icons/48.png
diff --git a/graphics/imv/icons/64.png b/graphics/imv/icons/64.png
new file mode 100644
index 0000000000..ed5c510e32
--- /dev/null
+++ b/graphics/imv/icons/64.png
diff --git a/graphics/imv/icons/96.png b/graphics/imv/icons/96.png
new file mode 100644
index 0000000000..89c3510dd1
--- /dev/null
+++ b/graphics/imv/icons/96.png
diff --git a/graphics/imv/imv.SlackBuild b/graphics/imv/imv.SlackBuild
new file mode 100644
index 0000000000..a453bf317f
--- /dev/null
+++ b/graphics/imv/imv.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# Slackware build script for imv
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=imv
+VERSION=${VERSION:-4.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# libtiff complains "not a TIFF image" for every non-TIFF image imv
+# loads. patch disables libtiff warnings, and also moves libtiff to
+# the end of the backend list, so it'll get tried last (after all the
+# other backends have decided they can't handle the file).
+patch -p1 < $CWD/squelch_libtiff_warnings.diff
+
+# missing an include...
+sed -i '1i#include <string.h>' src/backend_freeimage.c
+
+# look in the right place for the config file.
+sed -i 's,/usr/local/etc/,/etc/imv/,' src/imv.c
+
+# No autodetection for optional deps. Help it out a little.
+# libpng, libtiff, libjpeg-turbo are always included.
+# librsvg never included, 14.2's is too old, and the minimum supported
+# version requires rust, meaning I don't love it enough to include a
+# static build here. I'm not just assuming it's too old because the
+# docs say so, I actually tried it. Sigh.
+W=x11; F=no; G=no; WS=no
+pkg-config --exists wayland-client && W=all && WS=yes
+[ -e /usr/include/FreeImage.h ] && F=yes
+pkg-config --exists libnsgif && G=yes
+
+cat >config.mk <<EOF
+# Core Slackware stuff:
+BACKEND_LIBTIFF=yes
+BACKEND_LIBPNG=yes
+BACKEND_LIBJPEG=yes
+
+# Core Slackware 14.2, but too old to use, sorry.
+BACKEND_LIBRSVG=no
+
+# Optional SBo packages (FreeImage, libnsgif):
+BACKEND_FREEIMAGE=$F
+BACKEND_LIBNSGIF=$G
+
+# Optional: window system (x11, wayland, or 'all' for both)
+WINDOWS=$W
+EOF
+
+make \
+  CFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  CONFIGPREFIX=/etc/$PRGNAM
+
+make install \
+  DESTDIR=$PKG \
+  PREFIX=/usr \
+  CONFIGPREFIX=/etc/$PRGNAM \
+  MANPREFIX=/usr/man \
+  INSTALL_PROGRAM="install -s -m0755"
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+( cd $PKG/etc/$PRGNAM; mv ${PRGNAM}_config ${PRGNAM}_config.new )
+
+# make install doesn't install the .desktop file. Also there's no icon
+# so we have to include one, below.
+mkdir -p $PKG/usr/share/applications
+sed "s,multimedia-photo-viewer,$PRGNAM," files/$PRGNAM.desktop > \
+    $PKG/usr/share/applications/$PRGNAM.desktop
+
+# Icon came from Debian moka-icon-theme package. I have no idea
+# what the default icon theme is in Debian (equivalent of hicolor in
+# Slackware). Don't care, either. So I picked one at random.
+for i in 16 22 24 48 64 96; do
+  mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  cat $CWD/icons/$i.png > $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
+done
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS* CHANGE* CONTRIB* LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+
+sed -e "s,@F@,$F," \
+    -e "s,@G@,$G," \
+    -e "s,@W@,$WS," \
+    $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}
diff --git a/graphics/imv/imv.info b/graphics/imv/imv.info
new file mode 100644
index 0000000000..88d3b72278
--- /dev/null
+++ b/graphics/imv/imv.info
@@ -0,0 +1,10 @@
+PRGNAM="imv"
+VERSION="4.1.0"
+HOMEPAGE="https://github.com/eXeC64/imv"
+DOWNLOAD="https://github.com/eXeC64/imv/archive/v4.1.0/imv-4.1.0.tar.gz"
+MD5SUM="325bac66149dfa3f6e7688b1f4ab5f67"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libxkbcommon"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/imv/slack-desc b/graphics/imv/slack-desc
new file mode 100644
index 0000000000..286c5202c9
--- /dev/null
+++ b/graphics/imv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+imv: imv (image viewer for X and/or Wayland)
+imv:
+imv: imv is a command line image viewer intended for use with tiling window
+imv: managers.
+imv:
+imv: Package built with support for:
+imv:
+imv: FreeImage: @F@  libnsgif: @G@  wayland: @W@
+imv:
+imv:
+imv:
diff --git a/graphics/imv/squelch_libtiff_warnings.diff b/graphics/imv/squelch_libtiff_warnings.diff
new file mode 100644
index 0000000000..9c66ba26f2
--- /dev/null
+++ b/graphics/imv/squelch_libtiff_warnings.diff
@@ -0,0 +1,44 @@
+diff -Naur imv-4.1.0/src/backend_libtiff.c imv-4.1.0.patched/src/backend_libtiff.c
+--- imv-4.1.0/src/backend_libtiff.c	2019-12-21 17:54:26.000000000 -0500
++++ imv-4.1.0.patched/src/backend_libtiff.c	2020-11-21 16:40:37.971589947 -0500
+@@ -110,6 +110,7 @@
+ {
+   struct private private;
+ 
++  TIFFSetErrorHandler(NULL);
+   private.tiff = TIFFOpen(path, "r");
+   if (!private.tiff) {
+     /* Header is read, so no BAD_PATH check here */
+@@ -129,6 +130,7 @@
+ static enum backend_result open_memory(void *data, size_t len, struct imv_source **src)
+ {
+   struct private *private = malloc(sizeof *private);
++  TIFFSetErrorHandler(NULL);
+   private->data = data;
+   private->len = len;
+   private->pos = 0;
+diff -Naur imv-4.1.0/src/main.c imv-4.1.0.patched/src/main.c
+--- imv-4.1.0/src/main.c	2019-12-21 17:54:26.000000000 -0500
++++ imv-4.1.0.patched/src/main.c	2020-11-21 16:40:46.483589173 -0500
+@@ -17,10 +17,6 @@
+     return 1;
+   }
+ 
+-#ifdef IMV_BACKEND_LIBTIFF
+-  imv_install_backend(imv, &imv_backend_libtiff);
+-#endif
+-
+ #ifdef IMV_BACKEND_LIBPNG
+   imv_install_backend(imv, &imv_backend_libpng);
+ #endif
+@@ -41,6 +37,10 @@
+   imv_install_backend(imv, &imv_backend_freeimage);
+ #endif
+ 
++#ifdef IMV_BACKEND_LIBTIFF
++  imv_install_backend(imv, &imv_backend_libtiff);
++#endif
++
+   if (!imv_load_config(imv)) {
+     imv_free(imv);
+     return 1;
diff --git a/graphics/libplacebo/glslang.patch b/graphics/libplacebo/glslang.patch
deleted file mode 100644
index cfeb61bf4e..0000000000
--- a/graphics/libplacebo/glslang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 87e11a7e57ec734059924e192656fc70d1ce3f50
-Author: orbea <orbea@riseup.net>
-Date:   Mon Jun 8 10:29:26 2020 -0700
-
-    Fix build with newer glslang.
-
-diff --git a/src/glsl/glslang.cc b/src/glsl/glslang.cc
-index 5546120..07cf8f1 100644
---- a/src/glsl/glslang.cc
-+++ b/src/glsl/glslang.cc
-@@ -210,6 +210,7 @@ const TBuiltInResource DefaultTBuiltInResource = {
-     /* .maxTaskWorkGroupSizeY_NV = */ 1,
-     /* .maxTaskWorkGroupSizeZ_NV = */ 1,
-     /* .maxMeshViewCountNV = */ 4,
-+    /* .maxDualSourceDrawBuffersEXT = */ 1,
- #endif
- 
-     /* .limits = */ {
diff --git a/graphics/libplacebo/glslang_version.patch b/graphics/libplacebo/glslang_version.patch
deleted file mode 100644
index 17bb0fb9f4..0000000000
--- a/graphics/libplacebo/glslang_version.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 217edc52822845ad70eb39e95871f90d14d1dac6 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Wed, 21 Oct 2020 12:55:24 +0200
-Subject: [PATCH] glslang: update for new glslang versioning scheme
-
-This updates our checks to use the new header locations as introduced in
-https://github.com/KhronosGroup/glslang/pull/2277. Fortunately, it seems
-that the new version scheme is backwards compatible with the old one, so
-we don't need any excessively complicated logic updates.
-
-Fixes https://github.com/haasn/libplacebo/issues/83
----
- src/glsl/glslang.cc |  9 +++++----
- src/meson.build     | 19 ++++++++++++++++---
- 2 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/src/glsl/glslang.cc b/src/glsl/glslang.cc
-index 3b17a4e..01ad0fa 100644
---- a/src/glsl/glslang.cc
-+++ b/src/glsl/glslang.cc
-@@ -15,6 +15,8 @@
-  * License along with libplacebo. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config_internal.h"
-+
- #include <assert.h>
- #include <pthread.h>
- 
-@@ -23,7 +25,6 @@ extern "C" {
- }
- 
- #include <glslang/Include/ResourceLimits.h>
--#include <glslang/Include/revision.h>
- #include <glslang/Public/ShaderLang.h>
- #include <SPIRV/GlslangToSpv.h>
- 
-@@ -36,7 +37,7 @@ static int pl_glslang_refcount;
- 
- int pl_glslang_version(void)
- {
--    return GLSLANG_PATCH_LEVEL;
-+    return GLSLANG_VERSION_PATCH;
- }
- 
- bool pl_glslang_init(void)
-@@ -78,7 +79,7 @@ struct pl_glslang_res *pl_glslang_compile(const char *glsl, uint32_t api_ver,
-     if (api_ver >= EShTargetVulkan_1_1)
-         spirv_version = EShTargetSpv_1_3;
- 
--#if GLSLANG_PATCH_LEVEL >= 3667
-+#if GLSLANG_VERSION_PATCH >= 3667
-     if (api_ver >= EShTargetVulkan_1_2)
-         spirv_version = EShTargetSpv_1_5;
- #endif
-@@ -200,7 +201,7 @@ const TBuiltInResource DefaultTBuiltInResource = {
-     /* .MaxCullDistances = */ 8,
-     /* .MaxCombinedClipAndCullDistances = */ 8,
-     /* .MaxSamples = */ 4,
--#if GLSLANG_PATCH_LEVEL >= 2892
-+#if GLSLANG_VERSION_PATCH >= 2892
-     /* .maxMeshOutputVerticesNV = */ 256,
-     /* .maxMeshOutputPrimitivesNV = */ 512,
-     /* .maxMeshWorkGroupSizeX_NV = */ 32,
- 
-diff --git a/src/meson.build b/src/meson.build
-index 5a77cea..dcb8137 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -83,9 +83,20 @@ else
- endif
- 
- if glslang_found
--  glslang_ver = cxx.get_define('GLSLANG_PATCH_LEVEL',
--      prefix: '#include <glslang/Include/revision.h>'
--  ).to_int()
-+  glslang_header_old = 'glslang/Include/revision.h'
-+  glslang_header_new = 'glslang/build_info.h'
-+
-+  if cc.has_header(glslang_header_new)
-+    glslang_ver = cxx.get_define('GLSLANG_VERSION_PATCH',
-+        prefix: '#include <' + glslang_header_new + '>'
-+    ).to_int()
-+  elif cc.has_header(glslang_header_old)
-+    glslang_ver = cxx.get_define('GLSLANG_PATCH_LEVEL',
-+        prefix: '#include <' + glslang_header_old+ '>'
-+    ).to_int()
-+  else
-+    error('No glslang version header found?')
-+  endif
- 
-   if glslang_ver >= glslang_min_ver
-     # glslang must be linked against pthreads on platforms where pthreads is
-@@ -108,6 +119,8 @@ if glslang_found
-       add_project_arguments('-I' + i, language: 'cpp')
-     endforeach
- 
-+    conf_internal.set('GLSLANG_VERSION_PATCH', glslang_ver)
-+
-   else
-     error('glslang revision @0@ too old! Must be at least @1@'
-           .format(glslang_ver, glslang_min_ver))
--- 
-GitLab
diff --git a/graphics/libplacebo/libplacebo.SlackBuild b/graphics/libplacebo/libplacebo.SlackBuild
index 4dd590965e..0697bf74f0 100644
--- a/graphics/libplacebo/libplacebo.SlackBuild
+++ b/graphics/libplacebo/libplacebo.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libplacebo
-VERSION=${VERSION:-2.72.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.72.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -81,15 +81,6 @@ fi
 # Use an older epoxy version.
 sed -i 's/1.4.0/1.3.1/' src/meson.build
 
-# Fix the build with newer glslang versions.
-patch -p1 < $CWD/glslang.patch
-
-# glslang: update for new glslang versioning scheme
-# https://code.videolan.org/videolan/libplacebo/-/merge_requests/118
-# https://github.com/haasn/libplacebo/issues/83
-# https://code.videolan.org/videolan/libplacebo/-/commit/217edc52822845ad70eb39e95871f90d14d1dac6
-patch -p1 < $CWD/glslang_version.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 meson \
diff --git a/graphics/libplacebo/libplacebo.info b/graphics/libplacebo/libplacebo.info
index 85fc2e90d2..51ae650726 100644
--- a/graphics/libplacebo/libplacebo.info
+++ b/graphics/libplacebo/libplacebo.info
@@ -1,8 +1,8 @@
 PRGNAM="libplacebo"
-VERSION="2.72.0"
+VERSION="2.72.2"
 HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
-DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v2.72.0/libplacebo-v2.72.0.tar.gz"
-MD5SUM="dd6e7fca60c1dda53f2f6d5adf06fe69"
+DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v2.72.2/libplacebo-v2.72.2.tar.gz"
+MD5SUM="93b90922056c7d74455b45fae74959e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson"
diff --git a/graphics/lilypond/README b/graphics/lilypond/README
index 033b3da404..84c8c4cd96 100644
--- a/graphics/lilypond/README
+++ b/graphics/lilypond/README
@@ -1,10 +1,4 @@
 LilyPond is a music typesetter.  It produces beautiful
 sheet music using a description file as input.
 
-To enable documentation (man and info pages), first install dblatex and a
-newer version of texi2html than shipped with Slackware, then run the script as
-
-  # ENABLE_DOCS=yes ./lilypond.SlackBuild
-
-The documentation is disabled by default since SBo's texi2html package
-conflicts with Slackware's tetex package.
+extractpdfmark is an optional dependency.
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index 70e31a9fb4..61caa7cd99 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lilypond
 
-# Copyright 2012-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilypond
-VERSION=${VERSION:-2.18.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.22.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
@@ -37,7 +37,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADMAP"
@@ -45,6 +45,9 @@ DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADM
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -70,10 +73,8 @@ chmod -R u+w,go-w,a+rX-st .
 # Move the vim syntax highlighting files to where vim can find them.
 sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in
 
-# configure searches for naming variants like guile1.8-config but not this:
-GUILE_CONFIG=guile-config1.8 \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# --with-texgyre-dir is needed until/unless texlive's fonts are available by default:
+# `cd /etc/fonts/conf.d && ln -s ../conf.avail/09-texlive.conf`
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -83,8 +84,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-debugging \
-  --enable-documentation=${ENABLE_DOCS:-no}
+  --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  GUILE_FLAVOR=guile-1.8 \
+  GUILE=guile1.8 \
 
 make
 make install DESTDIR=$PKG
@@ -92,16 +96,13 @@ make install DESTDIR=$PKG
 find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-if [ "x${ENABLE_DOCS:-no}" = "xno" ]; then
-  # These are (or should be) empty.
-  rmdir $PKG/usr/man/man1
-  rmdir $PKG/usr/man
-else
-  find $PKG/usr/man -type f -execdir gzip -9 {} +
+find $PKG/usr/man -type f -execdir gzip -9 {} +
 
-  rm -f $PKG/usr/info/dir
-  find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
-fi
+# `make install` prints a reminder to run install-info on lilypond-web.info
+# (only this $MAIN_INFO_DOC, not the others), but forgets to install it.
+# Until that is fixed, omit running install-info from doinst.sh.
+rm -f $PKG/usr/info/dir
+find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index b3864d97c9..52aaf1ae73 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -1,10 +1,10 @@
 PRGNAM="lilypond"
-VERSION="2.18.2"
-HOMEPAGE="http://www.lilypond.org/"
-DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz"
-MD5SUM="3c4bcbb708d12644668b32bfe82ebf25"
+VERSION="2.22.0"
+HOMEPAGE="https://lilypond.org/"
+DOWNLOAD="https://lilypond.org/download/sources/v2.22/lilypond-2.22.0.tar.gz"
+MD5SUM="4b0d869873b0120bda2e8bd94e1a628a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fontforge t1utils guile1.8"
+REQUIRES="python3 fontforge texlive texi2html dblatex guile1.8"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/graphics/meh/README b/graphics/meh/README
index 1f319edf6a..47f6078f41 100644
--- a/graphics/meh/README
+++ b/graphics/meh/README
@@ -15,6 +15,6 @@ Features:
          * All ImageMagick formats (almost 200)
          * This allows limited support for PDFs and SVGs
   * Scales images to window size
-  * Preserves aspect ratio (either via EWMH hints or by padding the window)
+  * Preserves aspect ratio (either via EWMH hints or padding the window)
   * XSHM Support
   * Minimal dependencies (Xlib, libjpeg, libpng, giflib)
diff --git a/graphics/mozjpeg/README b/graphics/mozjpeg/README
index 00b151318f..a8d968a844 100644
--- a/graphics/mozjpeg/README
+++ b/graphics/mozjpeg/README
@@ -1,41 +1,60 @@
 mozjpeg (Mozilla JPEG Encoder Project)
 
-mozjpeg is a fork of libjpeg-turbo from Mozilla Research. Its goal is to
-reduce the size of JPEG files without reducing quality or compatibility
-with the vast majority of the world's deployed decoders. The idea is to
-reduce transfer times for JPEGs on the Web, thus reducing page load times.
-
-mozjpeg is not intended to be a general JPEG library replacement. It makes
-tradeoffs that are intended to benefit Web use cases and focuses solely
-on improving encoding. It is best used as part of a Web encoding workflow.
-
-In essence, libjpeg-turbo (as shipped with Slackware) is optimized for
-speed of encoding/decoding, while mozjpeg is optimized for encoding
-smaller file sizes (at the expense of speed). mozjpeg will not interfere
-with Slackware's libjpeg-turbo package, as it installs to /opt/mozjpeg/.
+mozjpeg is a fork of libjpeg-turbo from Mozilla Research. Its
+goal is to reduce the size of JPEG files without reducing quality
+or compatibility with the vast majority of the world's deployed
+decoders. The idea is to reduce transfer times for JPEGs on the Web,
+thus reducing page load times.
+
+mozjpeg is not intended to be a general JPEG library replacement. It
+makes tradeoffs that are intended to benefit Web use cases and
+focuses solely on improving encoding. It is best used as part of a Web
+encoding workflow.
+
+In essence, libjpeg-turbo (as shipped with Slackware) is optimized
+for speed of encoding/decoding, while mozjpeg is optimized for
+encoding smaller file sizes (at the expense of speed). mozjpeg will
+not interfere with Slackware's libjpeg-turbo package, as it installs
+to /opt/mozjpeg/.
 
 mozjpeg supports multiple versions of the libjpeg API. By default,
 version 6b is built. If you need compatibility with libjpeg 7 or 8,
 set API=7 or API=8 in the script's environment.
 
-Optionally, mozjpeg can be built with Java wrapper support for
-turbojpeg. To do this, install one of: jdk, openjdk, openjdk8, or
-openjdk6. Then run this script with JAVA=yes in the environment.
+Usage
+-----
+To run the binaries, either call them by their full paths, e.g:
 
-To run the binaries, it's probably easiest to add this to ~/.bash_profile:
+$ /opt/mozjpeg/bin/cjpeg
 
-export PATH=/opt/mozjpeg/bin:$PATH
-export MANPATH=/opt/mozjpeg/man:$MANPATH
+...or else:
 
-To compile & link with the mozjpeg libraries, use -I/opt/mozjpeg/include
-and -L/opt/mozjpeg/lib (or lib64). You might also want -static, or
-else -Wl,-rpath,/opt/mozjpeg/lib (or lib64). Starting with version 3.2,
-there's also pkg-config support for mozjpeg. In ~/.bash_profile:
+$ source /etc/profile.d/mozjpeg.sh
 
-export PKG_CONFIG_PATH=/opt/mozjpeg/lib64/pkgconfig:$PKG_CONFIG_PATH
+...to temporarily make mozjpeg the default, in the current shell.
+Running e.g. "cjpeg" will now run the mozjpeg one. If you wanted to
+do this permanently for all users (not recommended), you could:
 
-(chage lib64 to lib, for 32-bit Slackware)
+# chmod +x /etc/profile.d/mozjpeg.sh
 
-If you built with JAVA=yes, the java library will be installed
+...then log out and back in. The profile script isn't executable by
+default, to avoid surprises.
+
+Development
+-----------
+To compile & link with the mozjpeg libraries, use -I/opt/mozjpeg/include
+and -L/opt/mozjpeg/lib (or lib64). You might also want -static, or
+else -Wl,-rpath,/opt/mozjpeg/lib (or lib64). Starting with version 3.2,
+there's also pkg-config support for mozjpeg. If you source the profile
+script, software that uses pkg-config should find and link with the
+mozjpeg libraries automatically.
+
+Java Support
+------------
+Optionally, mozjpeg can be built with Java wrapper support
+for turbojpeg. To do this, install one of: jdk, openjdk8,
+openjdk7, or openjdk6 (or possibly one of the zulu-openjdk*
+or adoptopenjdk* packages; untested). Then run this script with
+JAVA=yes in the environment. The Java library will be installed
 as /opt/mozjpeg/classes/turbojpeg.jar, and the docs will be in
 /usr/doc/mozjpeg-$VERSION/javadoc.
diff --git a/graphics/mozjpeg/mozjpeg.SlackBuild b/graphics/mozjpeg/mozjpeg.SlackBuild
index c752946864..ecf3732720 100644
--- a/graphics/mozjpeg/mozjpeg.SlackBuild
+++ b/graphics/mozjpeg/mozjpeg.SlackBuild
@@ -25,6 +25,18 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+# 20210310 bkw: update for v4.0.3.
+# - upstream switched from autoconf to cmake, so this script can't
+#   build older versions any more.
+# - cmake chokes when trying to build static libs, apparently because
+#   we don't have a static libpng.a. So no more static libs in this
+#   package until further notice. If you actually care about this,
+#   remind me to look into it again.
+# - get rid of man pages, they're identical to the ones from libjpeg-turbo.
+# - add profile script.
+# - add -Wl,-rpath to .pc files.
+# - install HTML docs in /usr/doc.
+
 # 20180101 bkw: Update for v3.3.1. Script still works with 3.1 and 3.2,
 # if you can think of a use for them.
 
@@ -45,7 +57,7 @@
 # - BUILD=2
 
 PRGNAM=mozjpeg
-VERSION=${VERSION:-3.3.1}
+VERSION=${VERSION:-4.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,19 +97,18 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
-
-# JAVA=yes only tested with openjdk and openjdk6. We source the profile.d
-# script here in case someone's *just* installed jdk|openjdk, so they
-# won't have to log out & back in to get this built. This mostly helps
-# out sbopkg users.
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+ARGS=""
+
+# JAVA=yes only tested with openjdk8. We source the profile.d script
+# here in case someone's *just* installed jdk|openjdk, so they won't
+# have to log out & back in to get this built. This mostly helps out
+# sbopkg users.
 JAVA="${JAVA:-no}"
 if [ "$JAVA" = "yes" ]; then
-  EXTRAOPTS="--with-java "
+  ARGS+="-DWITH_JAVA=TRUE "
 
   # Find a JDK. Presumably a sane admin will only have one of these
   # profile scripts executable, even if he's installed all of them.
@@ -105,84 +116,56 @@ if [ "$JAVA" = "yes" ]; then
   # sure it actually matters that much ("write once, run anywhere" should
   # mean a .jar built with openjdk will run with Oracle's jdk, right? But
   # there's JNI (native code) involved...)
-  for i in jdk openjdk8 openjdk openjdk6; do
+  for i in jdk openjdk8 openjdk7 openjdk6; do
     if [ -x /etc/profile.d/$i.sh ]; then
       source /etc/profile.d/$i.sh
       break
     fi
   done
-
-  # Whichever jdk we decided to use, use its JAVA_HOME. Unfortunately
-  # mozjpeg ignores the *standard* JAVA_HOME env var, so we persuade
-  # it thus:
-  sed -i "s,/usr/java,$JAVA_HOME,g" configure.ac
 fi
 
-autoreconf -fiv
-
-# Maybe TODO: really, there should be a way to build multiple API versions,
-# with file paths that don't clash: /opt/mozjpeg/jpeg$API/(bin|lib|include).
-# However, I'd be inventing my own directory layout for this (upstream
-# doesn't support it), which is kinda outside the scope of what a SlackBuild
-# should do. If you *really* need this feature, email me and convince me to
-# implement it (it's a lot of error-prone work, not going to do it unless
-# someone actually needs it).
 API="${API:-6b}"
-case "$API" in
-  6b) ;; # do nothing, this is the default
-  7|8)  EXTRAOPTS="$EXTRAOPTS --with-jpeg$API" ;;
-  *)    echo "Invalid API version, supported versions are 6b 7 8" 1>&2
-        exit 1
-        ;;
-esac
-
-# 20170310 bkw: This stuff needs documenting, or I'll forget why
-# I did it this way.
-
-# Leaving off all the --prefix and related options below, since the
-# default prefix is already /opt/mozjpeg... though starting with 3.2,
-# the man pages and docs are in $PREFIX/share/(man|doc), so use
-# --mandir and --docdir. Also, to make 3.2 match the 3.1 package, need
-# --datarootdir=$PREFIX to make the java classes go to $PREFIX/classes.
-
-# Ryan's version of this script had --disable-static, but I'm leaving
-# that off, because sometimes static libs are easier to deal with when
-# you're linking with libraries outside the system /usr/lib(64) dir.
-
-# The LDFLAGS gibberish below is to force the binaries in /opt/mozjpeg/bin
-# to use the libraries in /opt/mozjpeg/lib(64), otherwise they use the
-# system libjpeg in /usr/lib(64) which partly defeats the purpose of
-# having optimized jpeg libs...
-
-
-LDFLAGS="-Wl,-rpath,/opt/$PRGNAM/lib$LIBDIRSUFFIX" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  $EXTRAOPTS \
-  --datarootdir=/opt/$PRGNAM \
-  --mandir=/opt/$PRGNAM/man \
-  --docdir=/opt/$PRGNAM/doc \
-  --build=$ARCH-slackware-linux
-
-# the java stuff chokes without -j1, everything else is OK.
-if [ "$JAVA" = "yes" ]; then
-  make -j1 -C java
-fi
-
-make # V=1
-make install-strip DESTDIR=$PKG
-gzip $PKG/opt/$PRGNAM/man/man?/*.?
-
-# docs are installed in /opt already (except the license)
+[ "$API"  = "7" ] && ARGS+="-DWITH_JPEG7=TRUE "
+[ "$API"  = "8" ] && ARGS+="-DWITH_JPEG8=TRUE "
+
+mkdir -p build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  cmake \
+    $ARGS \
+    -DENABLE_STATIC=FALSE \
+    -DPNG_LIBRARY_DEBUG=/usr/lib$LIBDIRSUFFIX/libpng.so \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# Slackware has these man pages already.
+rm -rf $PKG/opt/$PRGNAM/man
+
+# most of the docs are installed in /opt already, but not all.
 mkdir -p $PKG/usr/doc
 mv $PKG/opt/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f CMakeLists.txt BUILDING.* jconfig.txt # do not want
+cp -a *.txt *.md tjexample.c doc/html $PKG/usr/doc/$PRGNAM-$VERSION
 ln -s ../../../usr/doc/$PRGNAM-$VERSION $PKG/opt/$PRGNAM/doc
-cp -a LICENSE.* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 [ "$JAVA" = "yes" ] && cp -a java/doc $PKG/usr/doc/$PRGNAM-$VERSION/javadoc
 
+# 20210312 bkw: profile script is new with v4.0.x. It's installed without +x
+# permission (see README).
+mkdir -p $PKG/etc/profile.d
+sed "s,@,$LIBDIRSUFFIX," $CWD/${PRGNAM}.sh > $PKG/etc/profile.d/${PRGNAM}.sh
+
+# 20210312 bkw: help pkg-config out a bit.
+sed -i '/^Libs:/s|$| -lm -Wl,-rpath,${libdir}|' \
+       $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX/pkgconfig/*.pc
+
 mkdir -p $PKG/install
 sed -e "s,@API@,$API," -e "s,@JAVA@,$JAVA," \
   $CWD/slack-desc > \
diff --git a/graphics/mozjpeg/mozjpeg.info b/graphics/mozjpeg/mozjpeg.info
index fe1d1c78b8..b799b1deda 100644
--- a/graphics/mozjpeg/mozjpeg.info
+++ b/graphics/mozjpeg/mozjpeg.info
@@ -1,8 +1,8 @@
 PRGNAM="mozjpeg"
-VERSION="3.3.1"
+VERSION="4.0.3"
 HOMEPAGE="https://github.com/mozilla/mozjpeg"
-DOWNLOAD="https://github.com/mozilla/mozjpeg/archive/v3.3.1/mozjpeg-3.3.1.tar.gz"
-MD5SUM="63bc152b325666465ae86dc046786118"
+DOWNLOAD="https://github.com/mozilla/mozjpeg/archive/v4.0.3/mozjpeg-4.0.3.tar.gz"
+MD5SUM="c6910ca8f0ee82a8c0243dc5b7217aba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/mozjpeg/mozjpeg.sh b/graphics/mozjpeg/mozjpeg.sh
new file mode 100644
index 0000000000..fc784ee53a
--- /dev/null
+++ b/graphics/mozjpeg/mozjpeg.sh
@@ -0,0 +1,8 @@
+# mozjpeg.sh: part of the SBo mozjpeg build, by B. Watson
+# <yalhcru@gmail.com>. Source this file in your shell, to run
+# mozjpeg's binaries by default, and to compile software with
+# mozjpeg's libraries. Not installed +x by default to avoid
+# conflicting with Slackware's libjpeg-turbo package.
+
+export PATH=/opt/mozjpeg/bin:$PATH
+export PKG_CONFIG_PATH=/opt/mozjpeg/lib@/pkgconfig:$PKG_CONFIG_PATH
diff --git a/graphics/mtpaint/mtpaint.SlackBuild b/graphics/mtpaint/mtpaint.SlackBuild
index a9fcdd8169..35430fbdf0 100644
--- a/graphics/mtpaint/mtpaint.SlackBuild
+++ b/graphics/mtpaint/mtpaint.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mtpaint
 
 # Copyright 2020 Petar Petrov slackalaxy@gmail.com
-# Copyright 2010-2020 slackmagik <slakmagik@gmail.com>
+# Copyright 2010-2021 slackmagik <slakmagik@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mtpaint
-VERSION=${VERSION:-3.49.29}
+VERSION=${VERSION:-3.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DIRVER=mtPaint
-COMMIT=ff0a801413e612f74fe4c5d251e4bf36c6628013
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -71,9 +68,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $DIRVER-$VERSION
-tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
-cd $DIRVER-$COMMIT
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find -L . \
diff --git a/graphics/mtpaint/mtpaint.info b/graphics/mtpaint/mtpaint.info
index b4f8b4e6d4..67c074a32b 100644
--- a/graphics/mtpaint/mtpaint.info
+++ b/graphics/mtpaint/mtpaint.info
@@ -1,8 +1,8 @@
 PRGNAM="mtpaint"
-VERSION="3.49.29"
-HOMEPAGE="https://github.com/wjaguar/mtPaint/"
-DOWNLOAD="https://github.com/wjaguar/mtPaint/archive/ff0a801/mtpaint-ff0a801413e612f74fe4c5d251e4bf36c6628013.tar.gz"
-MD5SUM="d4c526bd7f2ee4d4ac68340f461f5dfa"
+VERSION="3.50"
+HOMEPAGE="https://sourceforge.net/projects/mtpaint/"
+DOWNLOAD="https://sourceforge.net/projects/mtpaint/files/mtpaint/3.50/mtpaint-3.50.tar.bz2"
+MD5SUM="bd50c57259e22a96989b9c923743d1d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/openimageio/oiio-libopenimageio-exif-cpp.diff b/graphics/openimageio/oiio-libopenimageio-exif-cpp.diff
new file mode 100644
index 0000000000..b0955d5c7d
--- /dev/null
+++ b/graphics/openimageio/oiio-libopenimageio-exif-cpp.diff
@@ -0,0 +1,326 @@
+--- oiio-Release-2.0.13/src/libOpenImageIO/exif.cpp	2019-12-03 23:28:14.000000000 +0100
++++ oiio-Release-2.0.13/src/libOpenImageIO/exif.cpp	2021-02-02 02:54:55.000000000 +0100
+@@ -554,40 +528,44 @@
+ 
+ 
+ 
++// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define
++// them ourselves.
++#ifndef GPSTAG_VERSIONID
+ enum GPSTag {
+-    GPSTAG_VERSIONID         = 0,
+-    GPSTAG_LATITUDEREF       = 1,
+-    GPSTAG_LATITUDE          = 2,
+-    GPSTAG_LONGITUDEREF      = 3,
+-    GPSTAG_LONGITUDE         = 4,
+-    GPSTAG_ALTITUDEREF       = 5,
+-    GPSTAG_ALTITUDE          = 6,
+-    GPSTAG_TIMESTAMP         = 7,
+-    GPSTAG_SATELLITES        = 8,
+-    GPSTAG_STATUS            = 9,
+-    GPSTAG_MEASUREMODE       = 10,
+-    GPSTAG_DOP               = 11,
+-    GPSTAG_SPEEDREF          = 12,
+-    GPSTAG_SPEED             = 13,
+-    GPSTAG_TRACKREF          = 14,
+-    GPSTAG_TRACK             = 15,
+-    GPSTAG_IMGDIRECTIONREF   = 16,
+-    GPSTAG_IMGDIRECTION      = 17,
+-    GPSTAG_MAPDATUM          = 18,
+-    GPSTAG_DESTLATITUDEREF   = 19,
+-    GPSTAG_DESTLATITUDE      = 20,
+-    GPSTAG_DESTLONGITUDEREF  = 21,
+-    GPSTAG_DESTLONGITUDE     = 22,
+-    GPSTAG_DESTBEARINGREF    = 23,
+-    GPSTAG_DESTBEARING       = 24,
+-    GPSTAG_DESTDISTANCEREF   = 25,
+-    GPSTAG_DESTDISTANCE      = 26,
+-    GPSTAG_PROCESSINGMETHOD  = 27,
+-    GPSTAG_AREAINFORMATION   = 28,
+-    GPSTAG_DATESTAMP         = 29,
+-    GPSTAG_DIFFERENTIAL      = 30,
+-    GPSTAG_HPOSITIONINGERROR = 31
++    GPSTAG_VERSIONID            = 0,
++    GPSTAG_LATITUDEREF          = 1,
++    GPSTAG_LATITUDE             = 2,
++    GPSTAG_LONGITUDEREF         = 3,
++    GPSTAG_LONGITUDE            = 4,
++    GPSTAG_ALTITUDEREF          = 5,
++    GPSTAG_ALTITUDE             = 6,
++    GPSTAG_TIMESTAMP            = 7,
++    GPSTAG_SATELLITES           = 8,
++    GPSTAG_STATUS               = 9,
++    GPSTAG_MEASUREMODE          = 10,
++    GPSTAG_DOP                  = 11,
++    GPSTAG_SPEEDREF             = 12,
++    GPSTAG_SPEED                = 13,
++    GPSTAG_TRACKREF             = 14,
++    GPSTAG_TRACK                = 15,
++    GPSTAG_IMGDIRECTIONREF      = 16,
++    GPSTAG_IMGDIRECTION         = 17,
++    GPSTAG_MAPDATUM             = 18,
++    GPSTAG_DESTLATITUDEREF      = 19,
++    GPSTAG_DESTLATITUDE         = 20,
++    GPSTAG_DESTLONGITUDEREF     = 21,
++    GPSTAG_DESTLONGITUDE        = 22,
++    GPSTAG_DESTBEARINGREF       = 23,
++    GPSTAG_DESTBEARING          = 24,
++    GPSTAG_DESTDISTANCEREF      = 25,
++    GPSTAG_DESTDISTANCE         = 26,
++    GPSTAG_PROCESSINGMETHOD     = 27,
++    GPSTAG_AREAINFORMATION      = 28,
++    GPSTAG_DATESTAMP            = 29,
++    GPSTAG_DIFFERENTIAL         = 30,
++    GPSTAG_GPSHPOSITIONINGERROR = 31
+ };
++#endif
+ 
+ static const TagInfo gps_tag_table[] = {
+     // clang-format off
+@@ -622,7 +600,7 @@
+     { GPSTAG_AREAINFORMATION,	"GPS:AreaInformation",	TIFF_UNDEFINED, 1 },
+     { GPSTAG_DATESTAMP,		"GPS:DateStamp",	TIFF_ASCII, 0 },
+     { GPSTAG_DIFFERENTIAL,	"GPS:Differential",	TIFF_SHORT, 1 },
+-    { GPSTAG_HPOSITIONINGERROR,	"GPS:HPositioningError",TIFF_RATIONAL, 1 }
++    { GPSTAG_GPSHPOSITIONINGERROR,	"GPS:HPositioningError",TIFF_RATIONAL, 1 }
+     // clang-format on
+ };
+ 
+@@ -685,7 +663,7 @@
+     }
+     if (dirp->tdir_type == TIFF_RATIONAL) {
+         int n    = dirp->tdir_count;  // How many
+-        float* f = (float*)alloca(n * sizeof(float));
++        float* f = OIIO_ALLOCA(float, n);
+         for (int i = 0; i < n; ++i) {
+             unsigned int num, den;
+             num = ((const unsigned int*)dataptr)[2 * i + 0];
+@@ -704,7 +682,7 @@
+     }
+     if (dirp->tdir_type == TIFF_SRATIONAL) {
+         int n    = dirp->tdir_count;  // How many
+-        float* f = (float*)alloca(n * sizeof(float));
++        float* f = OIIO_ALLOCA(float, n);
+         for (int i = 0; i < n; ++i) {
+             int num, den;
+             num = ((const int*)dataptr)[2 * i + 0];
+@@ -799,7 +777,7 @@
+ 
+ #if DEBUG_EXIF_READ
+     std::cerr << "Read " << tagmap.mapname() << " ";
+-    print_dir_entry(tagmap, dir, buf, offset_adjustment);
++    print_dir_entry(std::cerr, tagmap, dir, buf, offset_adjustment);
+ #endif
+ 
+     if (dir.tdir_tag == TIFFTAG_EXIFIFD || dir.tdir_tag == TIFFTAG_GPSIFD) {
+@@ -808,7 +786,7 @@
+         unsigned int offset = dirp->tdir_offset;  // int stored in offset itself
+         if (swab)
+             swap_endian(&offset);
+-        if (offset >= buf.size()) {
++        if (offset >= size_t(buf.size())) {
+ #if DEBUG_EXIF_READ
+             unsigned int off2 = offset;
+             swap_endian(&off2);
+@@ -863,6 +841,16 @@
+         unsigned int offset = dirp->tdir_offset;  // int stored in offset itself
+         if (swab)
+             swap_endian(&offset);
++        if (offset >= size_t(buf.size())) {
++#if DEBUG_EXIF_READ
++            unsigned int off2 = offset;
++            swap_endian(&off2);
++            std::cerr << "Bad Exif block? ExifIFD has offset " << offset
++                      << " inexplicably greater than exif buffer length "
++                      << buf.size() << " (byte swapped = " << off2 << ")\n";
++#endif
++            return;
++        }
+         // Don't recurse if we've already visited this IFD
+         if (ifd_offsets_seen.find(offset) != ifd_offsets_seen.end())
+             return;
+ 
+@@ -964,49 +946,46 @@
+             const char* s = *(const char**)p.data();
+             int len       = strlen(s) + 1;
+             append_tiff_dir_entry(dirs, data, tag, type, len, s,
+-                                  offset_correction);
++                                  offset_correction, 0, endianreq);
+             return;
+         }
+         break;
+     case TIFF_RATIONAL:
+         if (element == TypeDesc::FLOAT) {
+-            unsigned int* rat = (unsigned int*)alloca(2 * count
+-                                                      * sizeof(unsigned int));
++            unsigned int* rat = OIIO_ALLOCA(unsigned int, 2 * count);
+             const float* f    = (const float*)p.data();
+             for (size_t i = 0; i < count; ++i)
+                 float_to_rational(f[i], rat[2 * i], rat[2 * i + 1]);
+             append_tiff_dir_entry(dirs, data, tag, type, count, rat,
+-                                  offset_correction);
++                                  offset_correction, 0, endianreq);
+             return;
+         }
+         break;
+     case TIFF_SRATIONAL:
+         if (element == TypeDesc::FLOAT) {
+-            int* rat       = (int*)alloca(2 * count * sizeof(int));
++            int* rat       = OIIO_ALLOCA(int, 2 * count);
+             const float* f = (const float*)p.data();
+             for (size_t i = 0; i < count; ++i)
+                 float_to_rational(f[i], rat[2 * i], rat[2 * i + 1]);
+             append_tiff_dir_entry(dirs, data, tag, type, count, rat,
+-                                  offset_correction);
++                                  offset_correction, 0, endianreq);
+             return;
+         }
+         break;
+     case TIFF_SHORT:
+-        if (append_tiff_dir_entry_integer<unsigned short>(p, dirs, data, tag,
+-                                                          type,
+-                                                          offset_correction))
++        if (append_tiff_dir_entry_integer<unsigned short>(
++                p, dirs, data, tag, type, offset_correction, endianreq))
+             return;
+         break;
+     case TIFF_LONG:
+         if (append_tiff_dir_entry_integer<unsigned int>(p, dirs, data, tag,
+-                                                        type,
+-                                                        offset_correction))
++                                                        type, offset_correction,
++                                                        endianreq))
+             return;
+         break;
+     case TIFF_BYTE:
+-        if (append_tiff_dir_entry_integer<unsigned char>(p, dirs, data, tag,
+-                                                         type,
+-                                                         offset_correction))
++        if (append_tiff_dir_entry_integer<unsigned char>(
++                p, dirs, data, tag, type, offset_correction, endianreq))
+             return;
+         break;
+     default: break;
+@@ -1091,14 +1097,24 @@
+ bool
+ decode_exif(cspan<uint8_t> exif, ImageSpec& spec)
+ {
++    // Sometimes an exif blob starts with "Exif". Skip it.
++    if (exif.size() >= 6 && exif[0] == 'E' && exif[1] == 'x' && exif[2] == 'i'
++        && exif[3] == 'f' && exif[4] == 0 && exif[5] == 0) {
++        exif = exif.subspan(6);
++    }
++
+ #if DEBUG_EXIF_READ
+     std::cerr << "Exif dump:\n";
+-    for (size_t i = 0; i < exif.size(); ++i) {
++    for (size_t i = 0; i < std::min(200L, exif.size()); ++i) {
++        if ((i % 16) == 0)
++            std::cerr << "[" << i << "] ";
+         if (exif[i] >= ' ')
+             std::cerr << (char)exif[i] << ' ';
+         std::cerr << "(" << (int)exif[i] << ") ";
++        if ((i % 16) == 15)
++            std::cerr << "\n";
+     }
+-    std::cerr << "\n";
++    std::cerr << std::endl;
+ #endif
+ 
+     // The first item should be a standard TIFF header.  Note that HERE,
+@@ -1176,8 +1192,10 @@
+ 
+ template<class T>
+ inline void
+-append(std::vector<char>& blob, const T& v)
++append(std::vector<char>& blob, T v, endian endianreq = endian::native)
+ {
++    if (endianreq != endian::native)
++        swap_endian(&v);
+     blob.insert(blob.end(), (const char*)&v, (const char*)&v + sizeof(T));
+ }
+ 
+@@ -1191,10 +1209,20 @@
+ 
+ 
+ 
++// DEPRECATED(2.1)
++void
++encode_exif(const ImageSpec& spec, std::vector<char>& blob)
++{
++    encode_exif(spec, blob, endian::native);
++}
++
++
++
+ // Construct an Exif data block from the ImageSpec, appending the Exif
+ // data as a big blob to the char vector.
+ void
+-encode_exif(const ImageSpec& spec, std::vector<char>& blob)
++encode_exif(const ImageSpec& spec, std::vector<char>& blob,
++            OIIO::endian endianreq)
+ {
+     const TagMap& exif_tagmap(exif_tagmap_ref());
+     const TagMap& gps_tagmap(gps_tagmap_ref());
+@@ -1243,9 +1271,9 @@
+     // Put a TIFF header
+     size_t tiffstart = blob.size();  // store initial size
+     TIFFHeader head;
+-    head.tiff_magic   = littleendian() ? 0x4949 : 0x4d4d;
++    head.tiff_magic   = (endianreq == endian::little) ? 0x4949 : 0x4d4d;
+     head.tiff_version = 42;
+-    // head.tiff_diroff -- fix below, once we know the sizes
++    // N.B. need to swap_endian head.tiff_diroff  below, once we know the sizes
+     append(blob, head);
+ 
+     // Accumulate separate tag directories for TIFF, Exif, GPS, and Interop.
+@@ -1259,7 +1287,8 @@
+         if (Strutil::starts_with(p.name(), "GPS:")) {
+             int tag = gps_tagmap.tag(p.name());
+             if (tag >= 0)
+-                encode_exif_entry(p, tag, gpsdirs, blob, gps_tagmap, tiffstart);
++                encode_exif_entry(p, tag, gpsdirs, blob, gps_tagmap, tiffstart,
++                                  endianreq);
+         } else {
+             // Not GPS
+             int tag = exif_tagmap.tag(p.name());
+@@ -1267,10 +1296,10 @@
+                 // This range of Exif tags go in the main TIFF directories,
+                 // not the Exif IFD. Whatever.
+                 encode_exif_entry(p, tag, tiffdirs, blob, exif_tagmap,
+-                                  tiffstart);
++                                  tiffstart, endianreq);
+             } else {
+                 encode_exif_entry(p, tag, exifdirs, blob, exif_tagmap,
+-                                  tiffstart);
++                                  tiffstart, endianreq);
+             }
+         }
+     }
+@@ -1293,12 +1322,14 @@
+     if (exifdirs.size() || makerdirs.size()) {
+         // Add some required Exif tags that wouldn't be in the spec
+         append_tiff_dir_entry(exifdirs, blob, EXIF_EXIFVERSION, TIFF_UNDEFINED,
+-                              4, "0230", tiffstart);
++                              4, "0230", tiffstart, 0, endianreq);
+         append_tiff_dir_entry(exifdirs, blob, EXIF_FLASHPIXVERSION,
+-                              TIFF_UNDEFINED, 4, "0100", tiffstart);
++                              TIFF_UNDEFINED, 4, "0100", tiffstart, 0,
++                              endianreq);
+         static char componentsconfig[] = { 1, 2, 3, 0 };
+         append_tiff_dir_entry(exifdirs, blob, EXIF_COMPONENTSCONFIGURATION,
+-                              TIFF_UNDEFINED, 4, componentsconfig, tiffstart);
++                              TIFF_UNDEFINED, 4, componentsconfig, tiffstart, 0,
++                              endianreq);
+     }
+ 
+     // If any GPS info was found, add a version tag to the GPS fields.
+@@ -1306,7 +1337,7 @@
+         // Add some required Exif tags that wouldn't be in the spec
+         static char ver[] = { 2, 2, 0, 0 };
+         append_tiff_dir_entry(gpsdirs, blob, GPSTAG_VERSIONID, TIFF_BYTE, 4,
+-                              &ver, tiffstart);
++                              &ver, tiffstart, 0, endianreq);
+     }
+ 
+     // Compute offsets:
diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild
index 85c9198124..fa21c74582 100644
--- a/graphics/openimageio/openimageio.SlackBuild
+++ b/graphics/openimageio/openimageio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openimageio
 
-# Copyright 2015-2020 Christoph Willing Brisbane, Australia
+# Copyright 2015-2021 Christoph Willing Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,9 @@
 PRGNAM=openimageio
 SRCNAM=oiio-Release
 VERSION=${VERSION:-2.0.13}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-PYLIB_INSTALL_DIRECTORY=$(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 PYLIB3_INSTALL_DIRECTORY=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 
 if [ -z "$ARCH" ]; then
@@ -63,10 +62,18 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 patch -p0 < $CWD/oiio-include-cstdio.diff
+
+grep 20191103 /usr/include/tiffvers.h 2>&1 >/dev/null || {
+# libtiff-4.2.0 requires additional patches
+# (thanks to Giancarlo Dessi)
+  patch -p1 < $CWD/rawinput.diff
+  patch -p1 < $CWD/oiio-libopenimageio-exif-cpp.diff
+}
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,7 +88,7 @@ mkdir -p build
 cd build
   cmake ../ \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 -fcommon" \
     -DOPENJPEG_INCLUDE_DIR="/usr/include/openmj2-2.1" \
     -DOPENJPEG_OPENJPEG_LIBRARY_RELEASE="/usr/lib${LIBDIRSUFFIX}/libopenmj2.so" \
     -DCMAKE_BUILD_TYPE=Release \
@@ -92,8 +99,9 @@ cd build
     -DUSE_OPENJPEG:BOOL=TRUE \
     -DOIIO_BUILD_TESTS:BOOL=FALSE \
     -DUSE_PYTHON:BOOL=TRUE \
+    -DPYTHON_VERSION=$(python3 --version | cut -d' ' -f2) \
     -DUSE_EXTERNAL_PUGIXML:BOOL=FALSE \
-    -DPYBIND11_INCLUDE_DIR:STRING=/usr/include/python2.7 \
+
 
   make
   make install DESTDIR=$PKG
diff --git a/graphics/openimageio/rawinput.diff b/graphics/openimageio/rawinput.diff
new file mode 100644
index 0000000000..e465621ac2
--- /dev/null
+++ b/graphics/openimageio/rawinput.diff
@@ -0,0 +1,114 @@
+--- oiio-Release-2.0.13/src/raw.imageio/rawinput.cpp	2019-12-03 23:28:14.000000000 +0100
++++ oiio-Release-2.0.13-fix/src/raw.imageio/rawinput.cpp	2020-12-20 23:29:30.556780764 +0100
+@@ -643,7 +643,7 @@
+ #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 17, 0)
+     if (other.parsed_gps.gpsparsed) {
+         add("GPS", "Latitude", other.parsed_gps.latitude, false, 0.0f);
+-        add("GPS", "Longitude", other.parsed_gps.longtitude, false,
++        add("GPS", "Longitude", other.parsed_gps.longitude, false,
+             0.0f);  // N.B. wrong spelling!
+         add("GPS", "TimeStamp", other.parsed_gps.gpstimestamp, false, 0.0f);
+         add("GPS", "Altitude", other.parsed_gps.altitude, false, 0.0f);
+@@ -667,12 +667,12 @@
+     // float AmbientTemperature;
+     // float BatteryTemperature;
+     // float exifAmbientTemperature;
+-    add("Exif", "Humidity", other.exifHumidity, false, 0.0f);
+-    add("Exif", "Pressure", other.exifPressure, false, 0.0f);
+-    add("Exif", "WaterDepth", other.exifWaterDepth, false, 0.0f);
+-    add("Exif", "Acceleration", other.exifAcceleration, false, 0.0f);
+-    add("Exif", "CameraElevactionAngle", other.exifCameraElevationAngle, false,
+-        0.0f);
++    //add("Exif", "Humidity", other.exifHumidity, false, 0.0f);
++    //add("Exif", "Pressure", other.exifPressure, false, 0.0f);
++    //add("Exif", "WaterDepth", other.exifWaterDepth, false, 0.0f);
++    //add("Exif", "Acceleration", other.exifAcceleration, false, 0.0f);
++    //add("Exif", "CameraElevactionAngle", other.exifCameraElevationAngle, false,
++    //    0.0f);
+     // float real_ISO;
+ #endif
+ 
+@@ -861,9 +861,9 @@
+ {
+ #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0)
+     auto const& mn(m_processor->imgdata.makernotes.olympus);
+-    MAKERF(OlympusCropID);
+-    MAKERF(OlympusFrame); /* upper left XY, lower right XY */
+-    MAKERF(OlympusSensorCalibration);
++    //MAKERF(OlympusCropID);
++    //MAKERF(OlympusFrame); /* upper left XY, lower right XY */
++    //MAKERF(OlympusSensorCalibration);
+     MAKERF(FocusMode);
+     MAKERF(AutoFocus);
+     MAKERF(AFPoint);
+@@ -938,12 +938,12 @@
+ {
+ #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0)
+     auto const& mn(m_processor->imgdata.makernotes.fuji);
+-    add(m_make, "ExpoMidPointShift", mn.FujiExpoMidPointShift);
+-    add(m_make, "DynamicRange", mn.FujiDynamicRange);
+-    add(m_make, "FilmMode", mn.FujiFilmMode);
+-    add(m_make, "DynamicRangeSetting", mn.FujiDynamicRangeSetting);
+-    add(m_make, "DevelopmentDynamicRange", mn.FujiDevelopmentDynamicRange);
+-    add(m_make, "AutoDynamicRange", mn.FujiAutoDynamicRange);
++    add(m_make, "ExpoMidPointShift", mn.ExpoMidPointShift);
++    add(m_make, "DynamicRange", mn.DynamicRange);
++    add(m_make, "FilmMode", mn.FilmMode);
++    add(m_make, "DynamicRangeSetting", mn.DynamicRangeSetting);
++    add(m_make, "DevelopmentDynamicRange", mn.DevelopmentDynamicRange);
++    add(m_make, "AutoDynamicRange", mn.AutoDynamicRange);
+     MAKERF(FocusMode);
+     MAKERF(AFMode);
+     MAKERF(FocusPixel);
+@@ -967,7 +967,7 @@
+ {
+ #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0)
+     auto const& mn(m_processor->imgdata.makernotes.sony);
+-    MAKERF(SonyCameraType);
++    MAKERF(CameraType);
+ #endif
+ #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 19, 0)
+     // uchar Sony0x9400_version; /* 0 if not found/deciphered, 0xa, 0xb, 0xc following exiftool convention */
+@@ -976,12 +976,12 @@
+     // uchar Sony0x9400_SequenceLength1;
+     // unsigned Sony0x9400_SequenceFileNumber;
+     // uchar Sony0x9400_SequenceLength2;
+-    if (mn.raw_crop.cwidth || mn.raw_crop.cheight) {
+-        add(m_make, "cropleft", mn.raw_crop.cleft, true);
+-        add(m_make, "croptop", mn.raw_crop.ctop, true);
+-        add(m_make, "cropwidth", mn.raw_crop.cwidth, true);
+-        add(m_make, "cropheight", mn.raw_crop.cheight, true);
+-    }
++    //if (mn.raw_crop.cwidth || mn.raw_crop.cheight) {
++    //    add(m_make, "cropleft", mn.raw_crop.cleft, true);
++    //    add(m_make, "croptop", mn.raw_crop.ctop, true);
++    //    add(m_make, "cropwidth", mn.raw_crop.cwidth, true);
++    //    add(m_make, "cropheight", mn.raw_crop.cheight, true);
++    //}
+     MAKERF(AFMicroAdjValue);
+     MAKERF(AFMicroAdjOn);
+     MAKER(AFMicroAdjRegisteredLenses, 0);
+@@ -1054,17 +1054,17 @@
+         MAKER(Adapter, 0);
+         MAKER(AttachmentID, 0ULL);
+         MAKER(Attachment, 0);
+-        MAKER(CanonFocalUnits, 0);
++        MAKER(FocalUnits, 0);
+         MAKER(FocalLengthIn35mmFormat, 0.0f);
+     }
+ 
+     if (Strutil::iequals(m_make, "Nikon")) {
+         auto const& mn(m_processor->imgdata.lens.nikon);
+-        add(m_make, "EffectiveMaxAp", mn.NikonEffectiveMaxAp);
+-        add(m_make, "LensIDNumber", mn.NikonLensIDNumber);
+-        add(m_make, "LensFStops", mn.NikonLensFStops);
+-        add(m_make, "MCUVersion", mn.NikonMCUVersion);
+-        add(m_make, "LensType", mn.NikonLensType);
++        add(m_make, "EffectiveMaxAp", mn.EffectiveMaxAp);
++        add(m_make, "LensIDNumber", mn.LensIDNumber);
++        add(m_make, "LensFStops", mn.LensFStops);
++        add(m_make, "MCUVersion", mn.MCUVersion);
++        add(m_make, "LensType", mn.LensType);
+     }
+     if (Strutil::iequals(m_make, "DNG")) {
+         auto const& mn(m_processor->imgdata.lens.dng);
diff --git a/graphics/openscad-mcad/README b/graphics/openscad-mcad/README
new file mode 100644
index 0000000000..cce08e8586
--- /dev/null
+++ b/graphics/openscad-mcad/README
@@ -0,0 +1,9 @@
+This library contains components commonly used in designing and
+mocking up mechanical designs. It is currently unfinished and you
+can expect some API changes, however many things are already working.
+
+This library was created by various authors as named in the
+individual files' comments. All the files are licensed under
+the LGPL 2.1 (see http://creativecommons.org/licenses/LGPL/2.1/
+or the included file lgpl-2.1.txt), some of them allow distribution
+under more permissive terms (as described in the files' comments).
diff --git a/graphics/openscad-mcad/openscad-mcad.SlackBuild b/graphics/openscad-mcad/openscad-mcad.SlackBuild
new file mode 100644
index 0000000000..2834c0043d
--- /dev/null
+++ b/graphics/openscad-mcad/openscad-mcad.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for openscad-mcad
+
+# Copyright 2020 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# 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=openscad-mcad
+COMVER=1ea402208c3127ffb443931e9bb1681c191dacca
+VERSION=${VERSION:-2020.10.09.$( printf %s $COMVER | cut -c1-7 )}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf MCAD-$COMVER
+tar xvf $CWD/$PRGNAM-$COMVER.tar.?z
+cd MCAD-$COMVER
+
+chown -R root:root .
+find -L . \
+ \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/openscad/libraries/MCAD/bitmap
+
+install -m775 2Dshapes.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 3d_triangle.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 array.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bearing.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bitmap/alphabet_block.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bitmap/bitmap.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bitmap/height_map.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bitmap/letter_necklace.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bitmap/name_tag.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 bitmap/test_name_tag.scad $PKG/usr/share/openscad/libraries/MCAD/bitmap
+install -m775 boxes.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 constants.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 curves.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 fonts.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 gears.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 gridbeam.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 hardware.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 involute_gears.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 layouts.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 lego_compatibility.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 libtriangles.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 linear_bearing.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 materials.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 math.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 metric_fastners.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 motors.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 multiply.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 nuts_and_bolts.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 polyholes.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 profiles.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 regular_shapes.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 screw.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 servos.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 shapes.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 stepper.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 teardrop.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 transformations.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 triangles.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 trochoids.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 units.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 unregular_shapes.scad $PKG/usr/share/openscad/libraries/MCAD/
+install -m775 utilities.scad $PKG/usr/share/openscad/libraries/MCAD/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a bitmap/README TODO README.markdown lgpl-2.1.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/openscad-mcad/openscad-mcad.info b/graphics/openscad-mcad/openscad-mcad.info
new file mode 100644
index 0000000000..748d96be6c
--- /dev/null
+++ b/graphics/openscad-mcad/openscad-mcad.info
@@ -0,0 +1,10 @@
+PRGNAM="openscad-mcad"
+VERSION="2020.10.09.1ea4022"
+HOMEPAGE="https://github.com/openscad/MCAD"
+DOWNLOAD="https://github.com/openscad/MCAD/archive/1ea402208c3127ffb443931e9bb1681c191dacca/openscad-mcad-1ea402208c3127ffb443931e9bb1681c191dacca.tar.gz"
+MD5SUM="a86572e744abff686ee146274eda87f4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/graphics/openscad-mcad/slack-desc b/graphics/openscad-mcad/slack-desc
new file mode 100644
index 0000000000..6ce7b6f630
--- /dev/null
+++ b/graphics/openscad-mcad/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+openscad-mcad: openscad-mcad (Parametric CAD Library)
+openscad-mcad:
+openscad-mcad: This library contains components commonly used in designing and
+openscad-mcad: mocking up mechanical designs. It is currently unfinished and you
+openscad-mcad: can expect some API changes, however many things are already working.
+openscad-mcad:
+openscad-mcad: Homepage: https://github.com/openscad/MCAD/
+openscad-mcad:
+openscad-mcad:
+openscad-mcad:
+openscad-mcad:
diff --git a/graphics/pencil2d/README b/graphics/pencil2d/README
new file mode 100644
index 0000000000..ea7b43207d
--- /dev/null
+++ b/graphics/pencil2d/README
@@ -0,0 +1,6 @@
+Pencil2D is an animation/drawing software for Windows, macOS, Linux, and
+FreeBSD. It lets you create traditional hand-drawn animation (cartoon)
+using both bitmap and vector graphics. Pencil2D is free and open source.
+
+ffmpeg is runtime requirement. It's used to render mp4 and gif.
+Otherwise you can render every frame to png.
diff --git a/graphics/pencil2d/doinst.sh b/graphics/pencil2d/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/graphics/pencil2d/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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/graphics/pencil2d/pencil2d.SlackBuild b/graphics/pencil2d/pencil2d.SlackBuild
new file mode 100644
index 0000000000..60e5868627
--- /dev/null
+++ b/graphics/pencil2d/pencil2d.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+# Slackware build script for <pencil2d>
+#
+# Michales (clavisound) Michaloudes korgie@gmail.com <2020>
+
+PRGNAM=pencil2d
+SRCNAM=pencil
+VERSION=${VERSION:-0.6.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+  qmake-qt5 \
+  PREFIX=/usr \
+  CONFIG+=release \
+  DEFINES+=QT_NO_DEBUG_OUTPUT \
+  DEFINES+=PENCIL2D_RELEASE
+
+make
+make install INSTALL_ROOT=$PKG
+
+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
+
+for i in 16 32 48 64 96 128
+do
+	mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps/
+	convert $PKG/usr/share/icons/hicolor/256x256/apps/org.$PRGNAM.Pencil2D.png \
+    -resize ${i}x${i} $PKG/usr/share/icons/hicolor/${i}x${i}/apps/org.$PRGNAM.Pencil2D.png
+done
+
+sed -i 's+Icon=pencil2d+Icon=/usr/share/icons/hicolor/48x48/apps/pencil2d.png+' \
+  $PKG/usr/share/applications/org.$PRGNAM.Pencil2D.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE.TXT CODE_OF_CONDUCT.md ChangeLog.md README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/graphics/pencil2d/pencil2d.info b/graphics/pencil2d/pencil2d.info
new file mode 100644
index 0000000000..de0918fc55
--- /dev/null
+++ b/graphics/pencil2d/pencil2d.info
@@ -0,0 +1,10 @@
+PRGNAM="pencil2d"
+VERSION="0.6.5"
+HOMEPAGE="https://www.pencil2d.org/"
+DOWNLOAD="https://github.com/pencil2d/pencil/archive/v0.6.5/pencil-0.6.5.tar.gz"
+MD5SUM="80f5f5ca1ba49453631353b5b1c8c5ee"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="six pyudev python-evdev graphviz ninja meson libwacom libinput libxkbcommon qt5"
+MAINTAINER="Michales Michaloudes"
+EMAIL="korgie@gmail.com"
diff --git a/graphics/pencil2d/slack-desc b/graphics/pencil2d/slack-desc
new file mode 100644
index 0000000000..940b2516a1
--- /dev/null
+++ b/graphics/pencil2d/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+pencil2d: pencil2d (animation/drawing software)
+pencil2d:
+pencil2d: Pencil2D is an animation/drawing software for Windows, macOS, Linux,
+pencil2d: and FreeBSD. It lets you create traditional hand-drawn animation
+pencil2d: (cartoon) using both bitmap and vector graphics. Pencil2D is free and
+pencil2d: open source.
+pencil2d:
+pencil2d: https://www.pencil2d.org
+pencil2d:
+pencil2d:
+pencil2d:
diff --git a/graphics/plotutils/README b/graphics/plotutils/README
index a6d56c5df6..ec7424f2f3 100644
--- a/graphics/plotutils/README
+++ b/graphics/plotutils/README
@@ -1,16 +1,18 @@
-GNU plotutils contains software for both programmers and technical users.  
-Its centerpiece is libplot, a powerful C/C++ function library for exporting 
-2-D vector graphics in many file formats, both vector and raster. It can 
-also do vector graphics animations.  libplot is device-independent in the 
-sense that its API does not depend on the type of graphics file to be exported.
+GNU plotutils contains software for both programmers and technical
+users. Its centerpiece is libplot, a powerful C/C++ function library for
+exporting 2-D vector graphics in many file formats, both vector and
+raster. It can also do vector graphics animations. libplot is
+device-independent in the sense that its API does not depend on the type
+of graphics file to be exported.
 
-Besides libplot, the package contains command-line programs for plotting 
+Besides libplot, the package contains command-line programs for plotting
 scientific data. Many of them use libplot to export graphics.
 
-Other ./configure options that you may want to add (provided you install 
+Other ./configure options that you may want to add (provided you install
 the required fonts):
 
---enable-ps-fonts-in-pcl   enable use of PS fonts in PCL and HP-GL/2 output
+--enable-ps-fonts-in-pcl   enable use of PS fonts in PCL and HP-GL/2
+                           output
 --enable-lj-fonts-in-ps    enable use of LaserJet fonts in PS output
 --enable-lj-fonts-in-x     enable use of LaserJet fonts on X displays
 
diff --git a/graphics/plotutils/plotutils-2.6-libpng-1.5.patch b/graphics/plotutils/plotutils-2.6-libpng-1.6.patch
index 8a10d19e56..835ea44932 100644
--- a/graphics/plotutils/plotutils-2.6-libpng-1.5.patch
+++ b/graphics/plotutils/plotutils-2.6-libpng-1.6.patch
@@ -1,4 +1,4 @@
-fix building with libpng-1.5
+fix building with libpng-1.6
 
 --- libplot/z_write.c
 +++ libplot/z_write.c
diff --git a/graphics/plotutils/plotutils.SlackBuild b/graphics/plotutils/plotutils.SlackBuild
index 9f769eaaa7..897f84f343 100644
--- a/graphics/plotutils/plotutils.SlackBuild
+++ b/graphics/plotutils/plotutils.SlackBuild
@@ -1,17 +1,35 @@
 #!/bin/sh
 
-# Slackware build script for plotutils
-
-# Written by Luis Henrique <lmello.009@gmail.com>
+# Slackware build script for GNU plotutils
+
+# Originally written by Luis Henrique <lmello dot 009 at gmail dot com>
+# Currently maintained by Philip Lacroix <slackph at posteo dot de>
+
+# 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=plotutils
 VERSION=${VERSION:-2.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +40,8 @@ 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"
@@ -46,25 +64,22 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
-# Fix build with libpng16 (-current) (patch from Arch Linux)
-patch -p0 < $CWD/plotutils-2.6-libpng-1.5.patch
+# Fix build with libpng 1.6 (patch from Arch Linux)
+patch -p0 < $CWD/plotutils-2.6-libpng-1.6.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --libdir=/usr/lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --htmldir=/usr/doc/$PRGNAM-$VERSION/html \
   --enable-static=no \
   --enable-shared=yes \
   --enable-libplotter \
@@ -73,19 +88,19 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
-DOCS="AUTHORS COMPAT COPYING ChangeLog INSTALL INSTALL.fonts INSTALL.pkg \
-  KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO"
+DOCS="AUTHORS COMPAT COPYING INSTALL INSTALL.fonts INSTALL.pkg KNOWN_BUGS \
+  NEWS ONEWS PROBLEMS README THANKS TODO"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/plotutils/plotutils.info b/graphics/plotutils/plotutils.info
index 57c573515f..d989daf4d7 100644
--- a/graphics/plotutils/plotutils.info
+++ b/graphics/plotutils/plotutils.info
@@ -1,7 +1,7 @@
 PRGNAM="plotutils"
 VERSION="2.6"
-HOMEPAGE="http://www.gnu.org/software/plotutils"
-DOWNLOAD="http://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/plotutils"
+DOWNLOAD="https://ftpmirror.gnu.org/plotutils/plotutils-2.6.tar.gz"
 MD5SUM="c08a424bd2438c80a786a7f4b5bb6a40"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/plotutils/slack-desc b/graphics/plotutils/slack-desc
index 0b6251b862..1ec9c19a6c 100644
--- a/graphics/plotutils/slack-desc
+++ b/graphics/plotutils/slack-desc
@@ -14,6 +14,6 @@ plotutils: function library for exporting 2-D vector graphics in many file
 plotutils: formats, both vector and raster. It can also do vector graphics
 plotutils: animations.
 plotutils:
-plotutils: Homepage: http://www.gnu.org/software/plotutils
+plotutils: Homepage: https://www.gnu.org/software/plotutils
 plotutils:
 plotutils:
diff --git a/graphics/psftools/README b/graphics/psftools/README
index c800979abc..3bfbd42795 100644
--- a/graphics/psftools/README
+++ b/graphics/psftools/README
@@ -15,9 +15,10 @@ font formats:
 - Hercules WriteOn
 - Raw bitmaps
 
-...and can also convert fonts to XBM, PBM, C source, and human-readable
-text files. psftools can also merge font files together, and transform
-them in various ways (scaling, flipping, adjusting the bounding box, etc).
+...and can also convert fonts to XBM, PBM, C source, and human
+readable text files. psftools can also merge font files together,
+and transform them in various ways (scaling, flipping, adjusting the
+bounding box, etc).
 
 The package also includes few console fonts, taken from the open source
 release of the GEM operating system.
diff --git a/graphics/psftools/psftools.SlackBuild b/graphics/psftools/psftools.SlackBuild
index 1282dff0d1..1167b8bbe4 100644
--- a/graphics/psftools/psftools.SlackBuild
+++ b/graphics/psftools/psftools.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210219 bkw: updated for v1.1.1
+# 20201208 bkw: updated for v1.0.14
 # 20191129 bkw: updated for v1.0.13
 
 # 20180112 bkw:
@@ -17,7 +19,7 @@
 # - expand the README since it was a bit too terse
 
 PRGNAM=psftools
-VERSION=${VERSION:-1.0.13}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,11 +59,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # --docdir not supported
 CFLAGS="$SLKCFLAGS" \
diff --git a/graphics/psftools/psftools.info b/graphics/psftools/psftools.info
index 5557744398..bf272a5277 100644
--- a/graphics/psftools/psftools.info
+++ b/graphics/psftools/psftools.info
@@ -1,8 +1,8 @@
 PRGNAM="psftools"
-VERSION="1.0.13"
+VERSION="1.1.1"
 HOMEPAGE="http://www.seasip.info/Unix/PSF/index.html"
-DOWNLOAD="http://www.seasip.info/Unix/PSF/psftools-1.0.13.tar.gz"
-MD5SUM="47f8206bf55de8d2c456e4996e6766b3"
+DOWNLOAD="http://www.seasip.info/Unix/PSF/psftools-1.1.1.tar.gz"
+MD5SUM="fb29d0adae0384e70aa20e94998dd9e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/qrencode/qrencode.SlackBuild b/graphics/qrencode/qrencode.SlackBuild
index 92b8368175..52fd2710fd 100644
--- a/graphics/qrencode/qrencode.SlackBuild
+++ b/graphics/qrencode/qrencode.SlackBuild
@@ -3,7 +3,7 @@
 # SlackBuild Script for qrencode
 
 # Copyright 2012  Matthew "mfillpot" Fillpot
-# Copyright 2018 Lenard Spencer, Orlando, Florida, USA
+# Copyright 2018, 2020 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qrencode
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/qrencode/qrencode.info b/graphics/qrencode/qrencode.info
index 9992cc2c4f..ecdb156112 100644
--- a/graphics/qrencode/qrencode.info
+++ b/graphics/qrencode/qrencode.info
@@ -1,8 +1,8 @@
 PRGNAM="qrencode"
-VERSION="4.1.0"
+VERSION="4.1.1"
 HOMEPAGE="https://fukuchi.org/works/qrencode/"
-DOWNLOAD="https://fukuchi.org/works/qrencode/qrencode-4.1.0.tar.bz2"
-MD5SUM="f2343f69def03b4e6bfeaf2c7e1016b9"
+DOWNLOAD="https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.bz2"
+MD5SUM="de7185bcab635a34730e1b73d4efa705"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/renderdoc/README b/graphics/renderdoc/README
index 1319c62737..415012ab7d 100644
--- a/graphics/renderdoc/README
+++ b/graphics/renderdoc/README
@@ -4,3 +4,9 @@ any application using Vulkan, D3D11, OpenGL & OpenGL ES or D3D12.
 
 qt5 and python3 are optional dependencies required to build the
 qrenderdoc GUI.
+
+To disable building the qrenderdoc GUI use:
+  QT=no ./renderdoc.SlackBuild
+
+To build debugging symbols use:
+  DEBUG=yes ./renderdoc.SlackBuild
diff --git a/graphics/renderdoc/renderdoc.SlackBuild b/graphics/renderdoc/renderdoc.SlackBuild
index 660ade67b2..573f723403 100644
--- a/graphics/renderdoc/renderdoc.SlackBuild
+++ b/graphics/renderdoc/renderdoc.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=renderdoc
-VERSION=${VERSION:-1.10}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,7 +64,14 @@ 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 {} \;
 
-if pkg-config --exists python3 && pkg-config --exists Qt5Core; then
+if [ "${DEBUG:=0}" != 0 ]; then
+  RELEASE=Debug
+  SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')"
+else
+  RELEASE=Release
+fi
+
+if [ "${QT:-yes}" = yes ] && pkg-config --exists Qt5Core python3; then
   GUI=ON
 else
   GUI=OFF
@@ -89,13 +96,18 @@ cd build
     -DBUILD_VERSION_STABLE=ON \
     -DBUILD_VERSION_DIST_NAME=slackware \
     -DBUILD_VERSION_DIST_CONTACT='https://lists.slackbuilds.org/' \
-    -DCMAKE_BUILD_TYPE=Release ..
+    -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
+# renderdoc explicity depends on CMAKE_INSTALL_RPATH
+#    -DCMAKE_SKIP_RPATH=TRUE \
+
+if [ "$DEBUG" = 0 ]; then
+  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
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/renderdoc/renderdoc.info b/graphics/renderdoc/renderdoc.info
index 951655327a..5fcede2da5 100644
--- a/graphics/renderdoc/renderdoc.info
+++ b/graphics/renderdoc/renderdoc.info
@@ -1,11 +1,11 @@
 PRGNAM="renderdoc"
-VERSION="1.10"
+VERSION="1.11"
 HOMEPAGE="https://renderdoc.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/baldurk/renderdoc/archive/v1.10/renderdoc-1.10.tar.gz \
+DOWNLOAD_x86_64="https://github.com/baldurk/renderdoc/archive/v1.11/renderdoc-1.11.tar.gz \
                  https://github.com/baldurk/swig/archive/renderdoc-modified-7/swig-renderdoc-modified-7.tar.gz"
-MD5SUM_x86_64="e7007dcb83197431af85ce73f0c0565d \
+MD5SUM_x86_64="023a7cb3d7980a1aa054695059262b86 \
                5558ee4e2fcf33b8dceb191ed4795a23"
 REQUIRES=""
 MAINTAINER="Hunter Sezen"
diff --git a/graphics/shaderc/shaderc.SlackBuild b/graphics/shaderc/shaderc.SlackBuild
index 3ea0590f2b..9cb723fb0e 100644
--- a/graphics/shaderc/shaderc.SlackBuild
+++ b/graphics/shaderc/shaderc.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shaderc
-VERSION=${VERSION:-2020.3}
+VERSION=${VERSION:-2020.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,9 +73,6 @@ find -L . \
 sed -i '/examples/d;/third_party/d' CMakeLists.txt
 sed -i '/build-version/d' glslc/CMakeLists.txt
 
-# Use the system install path for spirv.hpp
-sed -i 's|spirv/unified1/spirv.hpp|SPIRV/spirv.hpp|' libshaderc/src/shaderc.cc
-
 glslang_version="$(glslangValidator -v | grep 'Glslang Version')"
 
 # Create build-version.inc since git versioning is disabled.
diff --git a/graphics/shaderc/shaderc.info b/graphics/shaderc/shaderc.info
index f37c316340..398339dcec 100644
--- a/graphics/shaderc/shaderc.info
+++ b/graphics/shaderc/shaderc.info
@@ -1,8 +1,8 @@
 PRGNAM="shaderc"
-VERSION="2020.3"
+VERSION="2020.4"
 HOMEPAGE="https://github.com/google/shaderc"
-DOWNLOAD="https://github.com/google/shaderc/archive/v2020.3/shaderc-2020.3.tar.gz"
-MD5SUM="7415b7c5376dd36c610b9cc53c7dbe1b"
+DOWNLOAD="https://github.com/google/shaderc/archive/v2020.4/shaderc-2020.4.tar.gz"
+MD5SUM="5c587cb6bd3b7e8745ca2e0dd46bb284"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="glslang"
diff --git a/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild b/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild
index 1e413e9321..7ef94508f5 100644
--- a/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild
+++ b/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild
@@ -6,7 +6,7 @@
 # updated by Tim Dickson (dickson.tim@googlemail.com)
 
 PRGNAM=tuxpaint-stamps
-VERSION=${VERSION:-2020.05.29}
+VERSION=${VERSION:-2020.12.27}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/graphics/tuxpaint-stamps/tuxpaint-stamps.info b/graphics/tuxpaint-stamps/tuxpaint-stamps.info
index b6acbad2ca..45cfd52869 100644
--- a/graphics/tuxpaint-stamps/tuxpaint-stamps.info
+++ b/graphics/tuxpaint-stamps/tuxpaint-stamps.info
@@ -1,8 +1,8 @@
 PRGNAM="tuxpaint-stamps"
-VERSION="2020.05.29"
+VERSION="2020.12.27"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-stamps-2020.05.29.tar.gz"
-MD5SUM="65782a974a16219425c223bbbe2f6775"
+DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-stamps-2020.12.27.tar.gz"
+MD5SUM="99fbdd34e0e5cb1cf07742d55f797382"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tuxpaint"
diff --git a/graphics/tuxpaint/README b/graphics/tuxpaint/README
index 3641e2360a..1884956536 100644
--- a/graphics/tuxpaint/README
+++ b/graphics/tuxpaint/README
@@ -9,5 +9,7 @@ and has entertaining, child-oriented additions such as sound effects.
 tuxpaint-config is now also included as a gui tool to configure
 tuxpaint.
 
-tuxpaint-config is now included, a gui for setting up tuxpaint.
-SDL_Pango is an optional dependency.
+Note: end users will need to create a Pictures directory in their home
+directory in order to export slideshows as animated GIFs. This bug has
+been reported and will hopefully get fixed for the next version.
+
diff --git a/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild
index b486609124..92dccd38b8 100644
--- a/graphics/tuxpaint/tuxpaint.SlackBuild
+++ b/graphics/tuxpaint/tuxpaint.SlackBuild
@@ -8,8 +8,8 @@
 # added tuxpaint-config 2019-02-11
 
 PRGNAM=tuxpaint
-VERSION=${VERSION:-0.9.24}
-CONFVER=${CONFVER:-0.0.15}
+VERSION=${VERSION:-0.9.25}
+CONFVER=${CONFVER:-0.0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info
index d3076044d3..b73b6afc0e 100644
--- a/graphics/tuxpaint/tuxpaint.info
+++ b/graphics/tuxpaint/tuxpaint.info
@@ -1,12 +1,12 @@
 PRGNAM="tuxpaint"
-VERSION="0.9.24"
+VERSION="0.9.25"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.24.tar.gz \
-          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.15.tar.gz"
-MD5SUM="966c6348714369aa573764703d6d961f \
-        aab5ea7f2f5d41a2bc66ebf78b15356b"
+DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.25.tar.gz \
+          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.16.tar.gz"
+MD5SUM="85e017d6e13f0c9cf53ff79eba97e11a \
+        684408801d4be92fe7d0b989a6cac8d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libpaper SDL_Pango fltk"
+REQUIRES="libpaper SDL_Pango fltk pngquant"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/graphics/ueberzug/ueberzug.SlackBuild b/graphics/ueberzug/ueberzug.SlackBuild
index 04e93452d6..1885df6697 100644
--- a/graphics/ueberzug/ueberzug.SlackBuild
+++ b/graphics/ueberzug/ueberzug.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ueberzug
-VERSION=${VERSION:-18.1.6}
+VERSION=${VERSION:-18.1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/ueberzug/ueberzug.info b/graphics/ueberzug/ueberzug.info
index 3a29e1a21b..1dedf4676f 100644
--- a/graphics/ueberzug/ueberzug.info
+++ b/graphics/ueberzug/ueberzug.info
@@ -1,8 +1,8 @@
 PRGNAM="ueberzug"
-VERSION="18.1.6"
+VERSION="18.1.8"
 HOMEPAGE="https://github.com/seebye/ueberzug"
-DOWNLOAD="https://github.com/seebye/ueberzug/archive/18.1.6/ueberzug-18.1.6.tar.gz"
-MD5SUM="69c8c823a867676d81f8cab31397dfc8"
+DOWNLOAD="https://github.com/seebye/ueberzug/archive/18.1.8/ueberzug-18.1.8.tar.gz"
+MD5SUM="796b500c6cbbf9e0432d4bf9b616f388"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="docopt psutil python-xlib python3-attrs python3-pillow"
diff --git a/graphics/vuescan/vuescan.SlackBuild b/graphics/vuescan/vuescan.SlackBuild
index 333969a7a3..aca0a51a11 100644
--- a/graphics/vuescan/vuescan.SlackBuild
+++ b/graphics/vuescan/vuescan.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for vuescan
 
 # Copyright 2013-2017 Heiko Rosemann, Germany
-# Copyright 2019-2020 Andrew Clemons, Wellington, New Zealand
+# Copyright 2019-2021 Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vuescan
-VERSION=${VERSION:-9.7.35}
+VERSION=${VERSION:-9.7.52}
 SRCVER=${SRCVER:-$(echo "$VERSION" | sed -e 's/\.//' -e 's/\..*//')}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/graphics/vuescan/vuescan.info b/graphics/vuescan/vuescan.info
index 5c86b0edfc..83e983e8ff 100644
--- a/graphics/vuescan/vuescan.info
+++ b/graphics/vuescan/vuescan.info
@@ -1,10 +1,10 @@
 PRGNAM="vuescan"
-VERSION="9.7.35"
+VERSION="9.7.52"
 HOMEPAGE="https://www.hamrick.com"
 DOWNLOAD="https://www.hamrick.com/files/vuex3297.tgz"
-MD5SUM="930eaafe1fd3b1d04ee9aa2fc32023c2"
+MD5SUM="7e9f7469b22142f85f46b262baa9f45f"
 DOWNLOAD_x86_64="https://www.hamrick.com/files/vuex6497.tgz"
-MD5SUM_x86_64="1e1c216d3e0d5921bac8c3b1136623c8"
+MD5SUM_x86_64="f90313b1192930d8ee4145a2a7973684"
 REQUIRES=""
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/graphics/vulkan-sdk-bin/vulkan-sdk-bin.SlackBuild b/graphics/vulkan-sdk-bin/vulkan-sdk-bin.SlackBuild
index 4fce2361e2..9573026548 100644
--- a/graphics/vulkan-sdk-bin/vulkan-sdk-bin.SlackBuild
+++ b/graphics/vulkan-sdk-bin/vulkan-sdk-bin.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=vulkan-sdk-bin
 SRCNAM=vulkansdk
-VERSION=${VERSION:-1.1.70.0}
+VERSION=${VERSION:-1.2.162.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,11 +53,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf VulkanSDK $PRGNAM-linux-$ARCH-$VERSION.run
-cp $CWD/$SRCNAM-linux-$ARCH-$VERSION.run .
-chmod +x $SRCNAM-linux-$ARCH-$VERSION.run
-./$SRCNAM-linux-$ARCH-$VERSION.run
-cd VulkanSDK
+rm -rf $VERSION
+tar xfv $CWD/vulkansdk-linux-x86_64-1.2.162.1.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -74,7 +71,7 @@ cp -r $VERSION/$ARCH/include/* $PKG/usr/include
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $VERSION/{*.html,doc/,samples/,examples} \
+  $VERSION/{samples,*.txt} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/vulkan-sdk-bin/vulkan-sdk-bin.info b/graphics/vulkan-sdk-bin/vulkan-sdk-bin.info
index 6aaa38cfa3..1955ae707b 100644
--- a/graphics/vulkan-sdk-bin/vulkan-sdk-bin.info
+++ b/graphics/vulkan-sdk-bin/vulkan-sdk-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="vulkan-sdk-bin"
-VERSION="1.1.70.0"
+VERSION="1.2.162.1"
 HOMEPAGE="https://www.lunarg.com/vulkan-sdk/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://vulkan.lunarg.com/sdk/download/1.1.70.0/linux/vulkansdk-linux-x86_64-1.1.70.0.run"
-MD5SUM_x86_64="98c6614ecd0979466bde74b88aa1e420"
+DOWNLOAD_x86_64="https://sdk.lunarg.com/sdk/download/1.2.162.1/linux/vulkansdk-linux-x86_64-1.2.162.1.tar.gz"
+MD5SUM_x86_64="ee59ff763ead2790562e55a2b123aec4"
 REQUIRES=""
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/graphics/vulkan-sdk/README b/graphics/vulkan-sdk/README
index 3226fd36df..0796ec1f1a 100644
--- a/graphics/vulkan-sdk/README
+++ b/graphics/vulkan-sdk/README
@@ -4,6 +4,8 @@ level Vulkan commands. Additionally, the loader manages inserting Vulkan
 layer libraries, including validation layers between the application and
 the ICD.
 
+qt5 is an optional dependency for vkconfig.
+
 This will not provide a vulkan driver which must be acquired elsewhere.
 
 This SlackBuild will compile vulkan-sdk from source.
diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
index 05ee7d559f..86909bc79f 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vulkan-sdk
-VERSION=${VERSION:-1.2.154.0}
+VERSION=${VERSION:-1.2.162.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,30 +59,52 @@ fi
 
 set -eu
 
+# VulkanTools from LunarG doesn't support an external jsoncpp
+JSONCPP_VERSION=${JSONCPP_VERSION:-1.8.0}
+
 chdir () { cd -- "$SRC/$1"; printf %s\\n '' "Building $1" ''; }
 
 cmake_build () {
   mkdir -p build
   cd build
   cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release \
     "${@:-}" ..
   make
   make install DESTDIR=$PKG
 }
 
+copydocs () {
+  dir="$1"
+  mkdir -p -- "$PKG/usr/doc/$PRGNAM-$VERSION/$dir"
+  shift
+  for i do
+    cp -a -- "$dir-sdk-$VERSION/$i" "$PKG/usr/doc/$PRGNAM-$VERSION/$dir/"
+  done
+}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvf $CWD/Vulkan-Headers-sdk-$VERSION.tar.gz
 tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz
 tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz
-tar xvf $CWD/Vulkan-Tools-sdk-$VERSION.tar.gz
+tar xvf $CWD/VulkanTools-sdk-$VERSION.tar.gz
+tar xvf $CWD/gfxreconstruct-sdk-$VERSION.tar.gz
+
+(
+  cd VulkanTools-sdk-$VERSION/submodules
+  tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.gz
+  rm -rf jsoncpp
+  mv jsoncpp-$JSONCPP_VERSION jsoncpp
+)
 
 chown -R root:root .
 find -L . \
@@ -91,17 +113,6 @@ 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 {} \+
 
-######################
-### vulkan-headers ###
-######################
-
-chdir Vulkan-Headers-sdk-$VERSION
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-cmake_build
-
 #####################
 ### vulkan-loader ###
 #####################
@@ -115,12 +126,11 @@ sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 patch -p1 < $CWD/vulkan-loader-cmake.patch
 
 cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_SKIP_RPATH=TRUE \
   -DBUILD_TESTS=OFF \
+  -DBUILD_WSI_XCB_SUPPORT=ON \
+  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr
 
 ###############################
 ### vulkan-validationlayers ###
@@ -128,56 +138,76 @@ cmake_build \
 
 chdir Vulkan-ValidationLayers-sdk-$VERSION
 
-# Use the system install path for spirv.hpp
-grep -rl spirv/unified1/spirv.hpp |
-  xargs sed -i 's|spirv/unified1/spirv.hpp|SPIRV/spirv.hpp|'
-
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 
-# Disable hardcoded errors
-patch -p1 < $CWD/vulkan-validationlayers-cmake.patch
-
 cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_DATADIR=share \
-  -DCMAKE_SKIP_RPATH=TRUE \
+  -DBUILD_LAYER_SUPPORT_FILES=ON \
   -DBUILD_TESTS=OFF \
-  -DBUILD_WSI_XLIB_SUPPORT=ON \
+  -DBUILD_WERROR=OFF \
   -DBUILD_WSI_XCB_SUPPORT=ON \
+  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
   -DGLSLANG_INSTALL_DIR=/usr \
-  -DSPIRV_HEADERS_INSTALL_DIR=/usr/include/glslang \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
+  -DSPIRV_HEADERS_INSTALL_DIR=/usr \
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr
+
+###################
+### vulkantools ###
+###################
 
-####################
-### vulkan-tools ###
-####################
+chdir VulkanTools-sdk-$VERSION
 
-chdir Vulkan-Tools-sdk-$VERSION
+# Generate missing jsoncpp sources
+(
+  cd submodules/jsoncpp
+  python3 ./amalgamate.py
+)
 
 # Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+find . -type f -name CMakeLists.txt | xargs grep -l '3\.10\.2' |
+  xargs sed -i 's/3.10.2/3.5.2/'
 
 cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_SKIP_RPATH=TRUE \
+  -DBUILD_GMOCK=OFF \
+  -DBUILD_WSI_XCB_SUPPORT=ON \
+  -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
+  -DINSTALL_GTEST=OFF \
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr \
   -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
-  -DGLSLANG_INSTALL_DIR=/usr
+  -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr
+
+######################
+### gfxreconstruct ###
+######################
+
+chdir gfxreconstruct-sdk-$VERSION
+
+# Require an older cmake version.
+sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+
+# cmake 3.5.2 does not have FILTER for the list command
+sed -i '/generate_target_source_files(/d' cmake/CodeStyle.cmake
+
+cmake_build \
+  -DBUILD_WERROR=OFF \
+  -DVULKAN_HEADER=/usr/include/vulkan
 
 cd -- "$SRC"
 
 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 Vulkan-Loader-sdk-$VERSION/*.txt \
-  Vulkan-Loader-sdk-$VERSION/loader/LoaderAndLayerInterface.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+copydocs Vulkan-Loader CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md \
+  LICENSE.txt README.md
+copydocs Vulkan-ValidationLayers CODE_OF_CONDUCT.md CONTRIBUTING.md \
+  GOVERNANCE.md LAYER_CONFIGURATION.md LICENSE.txt README.md
+copydocs VulkanTools CONTRIBUTING.md GOVERNANCE.md LICENSE.txt README.md
+copydocs gfxreconstruct CONTRIBUTING.md LICENSE.txt LICENSE_ThirdParty.txt \
+  README.md USAGE_android.md USAGE_desktop.md
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
index 690a0ba39b..879c8f7d73 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ b/graphics/vulkan-sdk/vulkan-sdk.info
@@ -1,16 +1,18 @@
 PRGNAM="vulkan-sdk"
-VERSION="1.2.154.0"
+VERSION="1.2.162.0"
 HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.154.0/Vulkan-Headers-sdk-1.2.154.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.154.0/Vulkan-Loader-sdk-1.2.154.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.154.0/Vulkan-Tools-sdk-1.2.154.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.154.0/Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz"
-MD5SUM="f5905669df03cf99aad45707e066c2c2 \
-        26e6ad81252d01f27322851c01ea4ed4 \
-        8d499320da34b08206c762f5ce34fd72 \
-        922b963cc146acee9246927f4b79255b"
+DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.162.0/Vulkan-Loader-sdk-1.2.162.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.162.0/Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz \
+          https://github.com/LunarG/VulkanTools/archive/sdk-1.2.162.0/VulkanTools-sdk-1.2.162.0.tar.gz \
+          https://github.com/LunarG/gfxreconstruct/archive/sdk-1.2.162.0/gfxreconstruct-sdk-1.2.162.0.tar.gz \
+          https://github.com/open-source-parsers/jsoncpp/archive/1.8.0/jsoncpp-1.8.0.tar.gz"
+MD5SUM="97de90f2b599979ea492a3ed92c025fb \
+        5c0c6daedacd2d535bb0cd41dcbd2995 \
+        aa116fff3ef50d7c299bc168953eacec \
+        7d48f5d115f8baad2ed800769545f21a \
+        6d6cbd82b5fe4a9cbae4ffef01f9e9fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="glslang"
+REQUIRES="Vulkan-Headers glslang"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch b/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch
deleted file mode 100644
index 797b1435e1..0000000000
--- a/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f328d7c7..45895dd4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,14 +117,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-                         -fno-builtin-memcmp
-                         -fvisibility=hidden)
- 
--    # Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older.
--    if((CMAKE_COMPILER_IS_GNUCXX AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.3.0)) OR
--       (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND
--        (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0) AND
--        (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.0.0)))
--        add_compile_options(-Werror)
--    endif()
--
-     set(CMAKE_C_STANDARD 99)
-     set(CMAKE_CXX_STANDARD 11)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
diff --git a/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild b/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild
index 7fe308d1fa..5927c3191b 100644
--- a/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild
+++ b/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine-nine-standalone
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,33 +57,54 @@ fi
 set -eu
 
 exists () {
-  v=1
+  r=0; cwd="$(pwd)"
   while [ $# -gt 0 ]; do
-    arg="$1"; shift
+    v=1; arg="$1"; shift
     case "$arg" in
       ''|*/ )
         :
       ;;
-      */* )
+      /* )
         if [ -f "$arg" ] && [ -x "$arg" ]; then
           printf %s\\n "$arg"
           v=0
         fi
       ;;
+      ./* )
+        if [ -f "$arg" ] && [ -x "$arg" ]; then
+          pre="$(cd -- "${arg%%/*}/" && pwd)"
+          printf %s\\n "${pre%/}/$arg"
+          v=0
+        fi
+      ;;
+      */* )
+        if [ -f "$arg" ] && [ -x "$arg" ]; then
+          printf %s\\n "$(cd -- "${arg%%/*}/.." && pwd)/$arg"
+          v=0
+        fi
+      ;;
       * )
-        p=":$PATH"
-        while [ "$p" != "${p#*:}" ]; do
-          p="${p#*:}"; d="${p%%:*}/$arg"
-          if [ -f "$d" ] && [ -x "$d" ]; then
-            printf %s\\n "$d"
-            v=0
-            break
-          fi
-        done
+        if [ -n "${PATH+x}" ]; then
+          p=":${PATH:-$cwd}"
+          while [ "$p" != "${p#*:}" ] && [ -n "${p#*:}" ]; do
+            p="${p#*:}"; x="${p%%:*}"; z="${x:-$cwd}"; d="${z%/}/$arg"
+            if [ -f "$d" ] && [ -x "$d" ]; then
+              case "$d" in
+                /* ) : ;;
+                ./* ) pre="$(cd -- "${d%/*}/" && pwd)"; d="${pre%/}/$d" ;;
+                * ) d="$(cd -- "${d%/*}/" && pwd)/$arg" ;;
+              esac
+              printf %s\\n "$d"
+              v=0
+              break
+            fi
+          done
+        fi
       ;;
     esac
+  [ $v = 0 ] || r=1
   done
-  return $v
+  return $r
 }
 
 rm -rf $PKG
diff --git a/graphics/wine-nine-standalone/wine-nine-standalone.info b/graphics/wine-nine-standalone/wine-nine-standalone.info
index d9b0f34c1a..cb55c58bf5 100644
--- a/graphics/wine-nine-standalone/wine-nine-standalone.info
+++ b/graphics/wine-nine-standalone/wine-nine-standalone.info
@@ -1,8 +1,8 @@
 PRGNAM="wine-nine-standalone"
-VERSION="0.6"
+VERSION="0.7"
 HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-DOWNLOAD="https://github.com/iXit/wine-nine-standalone/archive/v0.6/wine-nine-standalone-0.6.tar.gz"
-MD5SUM="edd1753caa9d281c5dba2d56e8a115f0"
+DOWNLOAD="https://github.com/iXit/wine-nine-standalone/archive/v0.7/wine-nine-standalone-0.7.tar.gz"
+MD5SUM="285d7d1ffa746ec4016e7f9244fe5842"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson wine"
diff --git a/graphics/xdot/xdot.SlackBuild b/graphics/xdot/xdot.SlackBuild
index 569f8fab3d..76c4ca34ca 100644
--- a/graphics/xdot/xdot.SlackBuild
+++ b/graphics/xdot/xdot.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for xdot
 #
 # Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2015-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=xdot
 SRCNAM=xdot.py
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,6 +55,14 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
+# xdot expects named tuples to be returned by some GDK functions, else it
+# spams stderr with stack traces.  Likely changed in version 3.19.1 of
+# pygobject3-python3, but SBo is still on 3.18.2.  Use regular tuples for now.
+sed -i \
+  -e 's/pointer.x/pointer[1]/' \
+  -e 's/pointer.y/pointer[2]/' \
+  xdot/ui/actions.py
+
 python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/xdot/xdot.info b/graphics/xdot/xdot.info
index 87fdf507dd..95aa9dd57f 100644
--- a/graphics/xdot/xdot.info
+++ b/graphics/xdot/xdot.info
@@ -1,10 +1,10 @@
 PRGNAM="xdot"
-VERSION="1.1"
+VERSION="1.2"
 HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-DOWNLOAD="https://github.com/jrfonseca/xdot.py/archive/1.1/xdot.py-1.1.tar.gz"
-MD5SUM="600a17f4832c88b34b4ae618999da214"
+DOWNLOAD="https://github.com/jrfonseca/xdot.py/archive/1.2/xdot.py-1.2.tar.gz"
+MD5SUM="2ba702657b050ee351630ac25f014855"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 pygobject3-python3 graphviz"
+REQUIRES="python3 pygobject3-python3 numpy3 graphviz"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/graphics/xmedcon/README b/graphics/xmedcon/README
index a5f54bba55..ff7debd7e7 100644
--- a/graphics/xmedcon/README
+++ b/graphics/xmedcon/README
@@ -1,4 +1,4 @@
 (X)MedCon (Medical Image Conversion)
 
-A medical image conversion utility & library; hereby hoping to lower at least
-one barrier in medical research projects.
+A medical image conversion utility & library; hereby hoping to lower at
+least one barrier in medical research projects.
diff --git a/graphics/xmedcon/doinst.sh b/graphics/xmedcon/doinst.sh
index 9b66a71f65..9a8ded3c60 100644
--- a/graphics/xmedcon/doinst.sh
+++ b/graphics/xmedcon/doinst.sh
@@ -1,29 +1,3 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-config etc/xmedconrc.new
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/graphics/xmedcon/slack-desc b/graphics/xmedcon/slack-desc
index 2e1192cf80..febee6646e 100644
--- a/graphics/xmedcon/slack-desc
+++ b/graphics/xmedcon/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-xmedcon: xmedcon (X)
+xmedcon: (X)MedCon (Medical Image Conversion)
 xmedcon:
 xmedcon: a medical image conversion utility & library; hereby hoping to lower
 xmedcon: at least one barrier in medical research projects.
diff --git a/graphics/xmedcon/xmedcon.SlackBuild b/graphics/xmedcon/xmedcon.SlackBuild
index 36e47cb3d1..74c04c01e5 100644
--- a/graphics/xmedcon/xmedcon.SlackBuild
+++ b/graphics/xmedcon/xmedcon.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for (X)MedCon
 #
-# Copyright 2016 Marek Srejma (sam_web@yahoo.de)
+# Copyright 2016-2021 Marek Srejma (sam@modweb.de)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmedcon
-VERSION=${VERSION:-0.16.2}
+VERSION=${VERSION:-0.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,11 +84,16 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
+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
+  
 
 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
+for i in $( find $PKG/usr/man -type l )
+do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
 
 mv $PKG/usr/etc $PKG/
 mv $PKG/etc/xmedconrc $PKG/etc/xmedconrc.new
@@ -101,7 +106,7 @@ install -m644 $CWD/xmedcon.desktop $PKG/usr/share/applications/xmedcon.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README REMARKS \
+  AUTHORS COPYING COPYING.LIB INSTALL NEWS README REMARKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/xmedcon/xmedcon.desktop b/graphics/xmedcon/xmedcon.desktop
index d1c267ec46..95e6adf0e1 100644
--- a/graphics/xmedcon/xmedcon.desktop
+++ b/graphics/xmedcon/xmedcon.desktop
@@ -5,3 +5,4 @@ GenericName=Medical Image Conversion
 Exec=xmedcon
 Icon=xmedcon
 Categories=Graphics;Utility;
+MimeType=application/dicom;
diff --git a/graphics/xmedcon/xmedcon.info b/graphics/xmedcon/xmedcon.info
index 633c3fdbc6..6c97e4f52e 100644
--- a/graphics/xmedcon/xmedcon.info
+++ b/graphics/xmedcon/xmedcon.info
@@ -1,10 +1,10 @@
 PRGNAM="xmedcon"
-VERSION="0.16.2"
+VERSION="0.17.0"
 HOMEPAGE="http://xmedcon.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/xmedcon/XMedCon-Source/0.16.2/xmedcon-0.16.2.tar.bz2"
-MD5SUM="e07c37688eb949953273d3d48fb2ab38"
+DOWNLOAD="https://downloads.sourceforge.net/project/xmedcon/XMedCon-Source/0.17.0/xmedcon-0.17.0.tar.bz2"
+MD5SUM="5193242f66fb2a393902c332ef74e9b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Marek Srejma"
-EMAIL="sam_web@yahoo.de"
+EMAIL="sam@modweb.de"
diff --git a/graphics/yed/README b/graphics/yed/README
index 78b7197c6e..6d394711d6 100644
--- a/graphics/yed/README
+++ b/graphics/yed/README
@@ -3,3 +3,5 @@ and effectively generate high-quality diagrams. Create diagrams
 manually, or import your external data for analysis. Automatic
 layout algorithms arrange even large data sets with just the press
 of a button.
+
+* Please read licenses informations below or in /usr/share/doc/yed-? *
diff --git a/graphics/yed/license_agreement.txt b/graphics/yed/license_agreement.txt
new file mode 100644
index 0000000000..53e9ede1d3
--- /dev/null
+++ b/graphics/yed/license_agreement.txt
@@ -0,0 +1,61 @@
+
+yEd Software License Agreement
+
+Version 1.2
+
+This is a legal agreement ("this Agreement") between yWorks GmbH ("yWorks") and the licensee ("the Licensee"). yWorks licenses the yEd Software ("the Software") only if all the following terms are accepted by the Licensee. The Software includes the yEd byte code executable and any files and documents associated with it.
+
+By installing the Software, the Licensee is indicating that he/she has read and understands this Agreement and agrees to be bound by its terms and conditions. If this Agreement is unacceptable to the Licensee, the Licensee must destroy any copies of the Software in the Licensee's possession immediately.
+1. LICENSE CONDITIONS
+
+The Licensee is granted a non-exclusive and non-transferable right to install one copy of the Software and use it as an application. The Software may not be used as part of an automated process. The Licensee may not reverse engineer, disassemble, decompile, or unjar the Software, or otherwise attempt to derive the source code of the Software.
+
+The Licensee acknowledges that Software furnished hereunder is under test and may be defective. No claims whatsoever can be made on yWorks based on any expectation about the Software.
+2. TERM, TERMINATION AND SURVIVAL
+
+The Licensee may terminate this Agreement at any time by destroying all copies of the Software in possession.
+
+If the Licensee fails to comply with any term of this Agreement, this Agreement is terminated and the Licensee has no further right to use the Software.
+
+On termination, the Licensee shall have no claim on or arising from the Software. The Software and any copies shall be destroyed.
+3. NO WARRANTY
+
+The Software is licensed to the Licensee on an "AS IS" basis. The Licensee is solely responsible for determining the suitability of the Software and accepts full responsibility and risks associated with the use of the Software.
+4. MAINTENANCE AND SUPPORT
+
+yWorks is not required to provide maintenance or support to the Licensee.
+5. LIMITATION OF LIABILITY
+
+In no event will yWorks be liable for any damages, including but not limited to any loss of revenue, profit, or data, however caused, directly or indirectly, by the Software or by this Agreement.
+6. DISTRIBUTION
+
+No distribution is to be made of the Software by the Licensee. The Licensee may make one copy of the Software for backup purpose only.
+7. AVAILABILITY
+
+The Software is not available to those not permitted by law to have access to the Software.
+8. INSERTION OF MARKER
+
+The Software may insert some markers into any output files to identify that the files are generated by the Software. yWorks bears no responsibility for any damages arising.
+9. MISCELLANEOUS
+
+This agreement is made and shall be construed in accordance with the laws of Germany.
+
+ 
+
+ 
+THIRD-PARTY SOFTWARE AND LICENSES
+
+This Software uses the Batik SVG Toolkit, Apache XMLBeans, Apache POI, and FreeHEP VectorGraphics library which are licensed under The Apache Software License.
+
+This Software uses the JIDE Docking Framework and the JIDE Action Framework licensed from JIDE Software.
+
+This Software uses icons licensed from Incors GmbH.
+
+This Software includes a parser generated with ANTLR v3, a Swing LnF created by JGoodies, and the TwelveMonkeys library. The BSD License applies to them.
+
+The Swing LnF created by JGoodies uses some icons from the Tango project licensed under the Creative Commons Attribution Share-Alike license.
+
+This Software uses the svg-viewer rendering engine. The MIT License applies to it.
+
+This Software uses the JavaHelp System v2.0_02. The Sun Microsystems, Inc. Binary Code License Agreement with JavaHelp Version 2.0 Supplemental License Terms applies to it.
+
diff --git a/graphics/yed/slack-desc b/graphics/yed/slack-desc
index 0a71d8ca3b..5124a03918 100644
--- a/graphics/yed/slack-desc
+++ b/graphics/yed/slack-desc
@@ -16,4 +16,4 @@ yed: of a button.
 yed:
 yed: Homepage: https://www.yworks.com/products/yed
 yed:
-yed:
+yed:* Please read licenses informations below or in /usr/share/doc/yed-? *
diff --git a/graphics/yed/yed.SlackBuild b/graphics/yed/yed.SlackBuild
index a5dba6144c..d6332575dc 100644
--- a/graphics/yed/yed.SlackBuild
+++ b/graphics/yed/yed.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for yEd
 
 # Copyright 2012-2015  Fridrich von Stauffenberg <cancellor2@gmail.com>
+# Copyright 2021 Michel Begue <mab974@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yed
-VERSION=${VERSION:-3.14.2}
+VERSION=${VERSION:-3.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,7 +52,7 @@ mv lib *.jar $PKG/usr/share/$PRGNAM
 
 for SIZE in 16 32; do
   mkdir -p $PKG/usr/share/icons/hicolor/$SIZE'x'$SIZE/apps
-  mv icons/yicon$SIZE.png $PKG/usr/share/icons/hicolor/$SIZE'x'$SIZE/apps/$PRGNAM.png
+  mv icons/yed$SIZE.png $PKG/usr/share/icons/hicolor/$SIZE'x'$SIZE/apps/$PRGNAM.png
 done
 
 mkdir -p $PKG/usr/bin
diff --git a/graphics/yed/yed.info b/graphics/yed/yed.info
index 09b14873ff..13d6c1dfcd 100644
--- a/graphics/yed/yed.info
+++ b/graphics/yed/yed.info
@@ -1,10 +1,10 @@
 PRGNAM="yed"
-VERSION="3.14.2"
+VERSION="3.20.1"
 HOMEPAGE="https://www.yworks.com/products/yed"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/yEd-3.14.2.zip"
-MD5SUM="ed8b0c766148d0855d2620b6d352317e"
+DOWNLOAD="https://www.yworks.com/resources/yed/demo/yEd-3.20.1.zip"
+MD5SUM="513d4b0031b35e1a12116df3b61eae07"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/ham/chirp/chirp.SlackBuild b/ham/chirp/chirp.SlackBuild
index 9a2f697507..6e96d0c9b6 100644
--- a/ham/chirp/chirp.SlackBuild
+++ b/ham/chirp/chirp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=chirp
-VERSION=${VERSION:-20200409}
+VERSION=${VERSION:-20201128}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/chirp/chirp.info b/ham/chirp/chirp.info
index e27c1ea79e..466cab41cf 100644
--- a/ham/chirp/chirp.info
+++ b/ham/chirp/chirp.info
@@ -1,8 +1,8 @@
 PRGNAM="chirp"
-VERSION="20200409"
+VERSION="20201128"
 HOMEPAGE="https://chirp.danplanet.com/projects/chirp/wiki/Home"
-DOWNLOAD="https://trac.chirp.danplanet.com/chirp_daily/daily-20200409/chirp-daily-20200409.tar.gz"
-MD5SUM="418bb804dd92448ab5187eb521e24d50"
+DOWNLOAD="https://trac.chirp.danplanet.com/chirp_daily/daily-20201128/chirp-daily-20201128.tar.gz"
+MD5SUM="f9a165bed46c86af312786d3eee50e24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyserial"
diff --git a/haskell/haskell-double-conversion/README b/haskell/haskell-double-conversion/README
new file mode 100644
index 0000000000..02c9f9af43
--- /dev/null
+++ b/haskell/haskell-double-conversion/README
@@ -0,0 +1,16 @@
+A library that performs fast, accurate conversion between double
+precision floating point and text.
+
+This library is implemented as bindings to the C++ double-conversion
+library written by Florian Loitsch at Google:
+https://github.com/floitsch/double-conversion.
+
+The Text versions of these functions are about 30 times faster than the
+default show implementation for the Double type.
+
+The ByteString versions are slower than the Text versions; roughly half
+the speed. (This seems to be due to the cost of allocating ByteString
+values via malloc.)
+
+As a final note, be aware that the bytestring-show package is about 50%
+slower than simply using show.
diff --git a/haskell/haskell-double-conversion/doinst.sh b/haskell/haskell-double-conversion/doinst.sh
new file mode 100644
index 0000000000..c89a71b771
--- /dev/null
+++ b/haskell/haskell-double-conversion/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/ghc-pkg ]; then
+  chroot . /usr/bin/ghc-pkg recache
+fi
+
diff --git a/haskell/haskell-double-conversion/haskell-double-conversion.SlackBuild b/haskell/haskell-double-conversion/haskell-double-conversion.SlackBuild
new file mode 100644
index 0000000000..a44f273a9e
--- /dev/null
+++ b/haskell/haskell-double-conversion/haskell-double-conversion.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for haskell double-conversion
+
+# Copyright 2021, Jan-willem De Bleser, Pasadena, CA, USA
+# 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=haskell-double-conversion
+VERSION=${VERSION:-2.0.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
+
+GHC_VERSION=$(ghc --numeric-version)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+runghc Setup configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
+  --enable-shared \
+  --enable-library-profiling \
+  --docdir=/usr/doc/$PRGNAM-$VERSION
+
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
+
+PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+mkdir -p $PKG/$PKGCONFD
+mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
+
+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 README.markdown \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/haskell/haskell-double-conversion/haskell-double-conversion.info b/haskell/haskell-double-conversion/haskell-double-conversion.info
new file mode 100644
index 0000000000..310ae36392
--- /dev/null
+++ b/haskell/haskell-double-conversion/haskell-double-conversion.info
@@ -0,0 +1,10 @@
+PRGNAM="haskell-double-conversion"
+VERSION="2.0.2.0"
+HOMEPAGE="https://hackage.haskell.org/package/double-conversion"
+DOWNLOAD="https://hackage.haskell.org/package/double-conversion-2.0.2.0/double-conversion-2.0.2.0.tar.gz"
+MD5SUM="0c62a35daeaec90999922d4eb3b13c39"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ghc"
+MAINTAINER="Jan-willem De Bleser"
+EMAIL="jw@thescrapyard.org"
diff --git a/haskell/haskell-double-conversion/slack-desc b/haskell/haskell-double-conversion/slack-desc
new file mode 100644
index 0000000000..65a3910e35
--- /dev/null
+++ b/haskell/haskell-double-conversion/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                         |-----handy-ruler------------------------------------------------------|
+haskell-double-conversion: haskell-double-conversion (convert between float and text strings)
+haskell-double-conversion:
+haskell-double-conversion: double-conversion is a fast Haskell library for converting between
+haskell-double-conversion: double precision floating point numbers and text strings. It is
+haskell-double-conversion: implemented as a binding to the V8-derived C++ double-conversion
+haskell-double-conversion: library.
+haskell-double-conversion:
+haskell-double-conversion:
+haskell-double-conversion:
+haskell-double-conversion: https://hackage.haskell.org/package/double-conversion
+haskell-double-conversion:
diff --git a/libraries/Botan/Botan.SlackBuild b/libraries/Botan/Botan.SlackBuild
index 7cd332711a..295fb78aef 100644
--- a/libraries/Botan/Botan.SlackBuild
+++ b/libraries/Botan/Botan.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Botan
 
-# Copyright (c) 2010-2020  Markus Reichelt, Aachen, DE
+# Copyright (c) 2010-2021  Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -26,7 +26,7 @@
 # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=Botan
-VERSION=${VERSION:-2.16.0}
+VERSION=${VERSION:-2.17.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,6 +95,9 @@ make install DESTDIR=$PKG
 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
 
+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
+
 cp -a *.rst *.txt doc/ $PKG/usr/doc/$PRGNAMI-$VERSION/
 
 rm -rf $PKG/usr/doc/$PRGNAMI-$VERSION/doc
diff --git a/libraries/Botan/Botan.info b/libraries/Botan/Botan.info
index 6d9b539dc0..a7ab7f4c1c 100644
--- a/libraries/Botan/Botan.info
+++ b/libraries/Botan/Botan.info
@@ -1,8 +1,8 @@
 PRGNAM="Botan"
-VERSION="2.16.0"
+VERSION="2.17.3"
 HOMEPAGE="https://botan.randombit.net/"
-DOWNLOAD="https://botan.randombit.net/releases/Botan-2.16.0.tar.xz"
-MD5SUM="88bbb33f5e13efb5e9019cb990a81e27"
+DOWNLOAD="https://botan.randombit.net/releases/Botan-2.17.3.tar.xz"
+MD5SUM="ada7bc7dc7451f356e1e80433c675f6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/Jinja2/Jinja2.SlackBuild b/libraries/Jinja2/Jinja2.SlackBuild
index a68c5016bc..7584f1e35f 100644
--- a/libraries/Jinja2/Jinja2.SlackBuild
+++ b/libraries/Jinja2/Jinja2.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Jinja2
 
 # Copyright 2014 Mikko Värri, Finland
-# Copyright 2018-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Jinja2
-VERSION=${VERSION:-2.11.2}
+VERSION=${VERSION:-2.11.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/Jinja2/Jinja2.info b/libraries/Jinja2/Jinja2.info
index 66ef2d1eac..6c63f6d0b8 100644
--- a/libraries/Jinja2/Jinja2.info
+++ b/libraries/Jinja2/Jinja2.info
@@ -1,8 +1,8 @@
 PRGNAM="Jinja2"
-VERSION="2.11.2"
+VERSION="2.11.3"
 HOMEPAGE="https://pypi.python.org/pypi/Jinja2"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-2.11.2.tar.gz"
-MD5SUM="0362203b22547abca06ed1082bc1e7b4"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-2.11.3.tar.gz"
+MD5SUM="231dc00d34afb2672c497713fa9cdaaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="MarkupSafe"
diff --git a/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild b/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild
index adc205acf4..4466204933 100644
--- a/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild
+++ b/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LucenePlusPlus
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=LucenePlusPlus
-VERSION=${VERSION:-3.0.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,12 +69,11 @@ 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 {} \;
 
-# Disable building internal gtest
-sed -i "s/include(CMakeExternal.txt)/#include(CMakeExternal.txt)/" CMakeLists.txt
-sed -i "s/enable_testing()/#enable_testing()/" CMakeLists.txt
+patch -p1 < $CWD/soname.patch
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/libraries/LucenePlusPlus/LucenePlusPlus.info b/libraries/LucenePlusPlus/LucenePlusPlus.info
index 0d48b7d561..683eb22c76 100644
--- a/libraries/LucenePlusPlus/LucenePlusPlus.info
+++ b/libraries/LucenePlusPlus/LucenePlusPlus.info
@@ -1,10 +1,10 @@
 PRGNAM="LucenePlusPlus"
-VERSION="3.0.7"
+VERSION="3.0.8"
 HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
-DOWNLOAD="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz"
-MD5SUM="e260c1ff9c10af7070faee29f325f955"
+DOWNLOAD="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.8.tar.gz"
+MD5SUM="cb9b2e7cb37b7dd68c1e24a65c6eda9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtest"
+REQUIRES="gtest cmake-202x"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/LucenePlusPlus/soname.patch b/libraries/LucenePlusPlus/soname.patch
new file mode 100644
index 0000000000..d8ddf04955
--- /dev/null
+++ b/libraries/LucenePlusPlus/soname.patch
@@ -0,0 +1,219 @@
+commit 1cd2509ed74ae47965006d16de3c09db029b4efe
+Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date:   Mon Jan 4 23:45:13 2021 +0100
+
+    Fix various cmake issues:
+    "CMAKE_INSTALL_FULL_LIBDIR" not being correctly evaluated and used
+    pkgconfig directory wrongly set to include instead of lib
+    cmake directory wrongly set to include instead of lib
+    core_libname contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR variables not being substituted to cmake.in files
+    cmake helpers not being correctly set
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41de688..71dbbd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ endif()
+ 
+ set(LIB_DESTINATION
+-  "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory name")
++  "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Define lib output directory name")
+ 
+ 
+ ####################################
+diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
+index e5e6624..fe8e8b8 100644
+--- a/src/config/CMakeLists.txt
++++ b/src/config/CMakeLists.txt
+@@ -1,16 +1,16 @@
+ ####################################
+ # Set config vars
+ ####################################
+-set(core_libname, "lucene++")
+-set(contrib_libname, "lucene++-contrib")
++set(core_libname "lucene++")
++set(contrib_libname "lucene++-contrib")
+ 
+ set(
+-    PACKAGE_CMAKE_INSTALL_INCLUDEDIR,
+-    "${lucene++_INCLUDE_DIR}/lucene++/")
++    PACKAGE_CMAKE_INSTALL_INCLUDEDIR
++    "${CMAKE_INSTALL_INCLUDEDIR}/lucene++/")
+ 
+ set(
+-    PACKAGE_CMAKE_INSTALL_LIBDIR,
+-    "${LIB_INSTALL_DIR}/cmake")
++    PACKAGE_CMAKE_INSTALL_LIBDIR
++    "${LIB_DESTINATION}")
+ 
+ 
+ ####################################
+diff --git a/src/config/contrib/CMakeLists.txt b/src/config/contrib/CMakeLists.txt
+index c0dd86f..b4a4391 100644
+--- a/src/config/contrib/CMakeLists.txt
++++ b/src/config/contrib/CMakeLists.txt
+@@ -9,7 +9,7 @@ if(NOT WIN32)
+   install(
+     FILES
+       "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
+-    DESTINATION "include/pkgconfig")
++    DESTINATION "${LIB_DESTINATION}/pkgconfig")
+ endif()
+ 
+ 
+@@ -19,7 +19,8 @@ endif()
+ configure_package_config_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contribConfig.cmake.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake"
+-  INSTALL_DESTINATION "${LIB_DESTINATION}/cmake")
++  INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib"
++  PATH_VARS contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR)
+ 
+ write_basic_package_version_file(
+   "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake"
+@@ -30,4 +31,4 @@ install(
+   FILES
+     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake"
+-  DESTINATION "include/cmake")
++  DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib")
+diff --git a/src/config/contrib/liblucene++-contribConfig.cmake.in b/src/config/contrib/liblucene++-contribConfig.cmake.in
+index f92f683..85fdfd2 100644
+--- a/src/config/contrib/liblucene++-contribConfig.cmake.in
++++ b/src/config/contrib/liblucene++-contribConfig.cmake.in
+@@ -20,6 +20,6 @@ if (NOT DEFINED set_and_check)
+ endif()
+ 
+ 
+-set_and_check(liblucene++-contrib_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@contrib_libname@")
+-set_and_check(liblucene++-contrib_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+-set(liblucene++-contrib_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@contrib_libname@")
++set_and_check(liblucene++-contrib_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(liblucene++-contrib_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set(liblucene++-contrib_LIBRARIES "@contrib_libname@")
+diff --git a/src/config/core/CMakeLists.txt b/src/config/core/CMakeLists.txt
+index a3eb17a..65376f5 100644
+--- a/src/config/core/CMakeLists.txt
++++ b/src/config/core/CMakeLists.txt
+@@ -9,7 +9,7 @@ if(NOT WIN32)
+   install(
+     FILES
+       "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
+-    DESTINATION "include/pkgconfig")
++    DESTINATION "${LIB_DESTINATION}/pkgconfig")
+ endif()
+ 
+ 
+@@ -19,7 +19,8 @@ endif()
+ configure_package_config_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++Config.cmake.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake"
+-  INSTALL_DESTINATION "${LIB_DESTINATION}/cmake")
++  INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++"
++  PATH_VARS core_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR)
+ 
+ write_basic_package_version_file(
+   ${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake
+@@ -30,4 +31,4 @@ install(
+   FILES
+     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake"
+-  DESTINATION "include/cmake")
++  DESTINATION "${LIB_DESTINATION}/cmake/liblucene++")
+diff --git a/src/config/core/liblucene++Config.cmake.in b/src/config/core/liblucene++Config.cmake.in
+index 89b48a3..574f812 100644
+--- a/src/config/core/liblucene++Config.cmake.in
++++ b/src/config/core/liblucene++Config.cmake.in
+@@ -20,8 +20,8 @@ if (NOT DEFINED set_and_check)
+ endif()
+ 
+ 
+-set_and_check(liblucene++_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@core_libname@")
+-set_and_check(liblucene++_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+-set(liblucene++_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@core_libname@")
++set_and_check(liblucene++_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(liblucene++_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set(liblucene++_LIBRARIES "@core_libname@")
+ 
+ 
+
+commit 127492f1ab85fd74ab9f9dff0be5b0a63bf7c271
+Merge: df65bf5 fd9eaf1
+Author: Alan Wright <85800+alanw@users.noreply.github.com>
+Date:   Tue Dec 29 17:46:39 2020 +0000
+
+    Merge pull request #160 from Kakueeen/master
+    
+    fix a bug of ChineseTokenizer
+
+
+commit fd9eaf10c49239d700af848062acc1d5efd54aa8
+Author: liuzhangjian <liuzhangjian@uniontech.com>
+Date:   Fri Dec 4 15:41:31 2020 +0800
+
+    Title:fix a bug of ChineseTokenizer
+    
+    Description:When I use ChineseAnalyzer for Chinese word segmentation, I find that English and numbers are treated as one word and I think they should be separated.
+    
+    RootCause:Null
+    
+    Solution:
+
+diff --git a/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp b/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp
+index d2a19f3..8313445 100644
+--- a/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp
++++ b/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp
+@@ -38,7 +38,7 @@ bool ChineseFilter::incrementToken() {
+                 if (text.length() > 1) {
+                     return true;
+                 }
+-            } else if (UnicodeUtil::isOther(text[0])) {
++            } else if (UnicodeUtil::isOther(text[0]) || UnicodeUtil::isDigit(text[0])) {
+                 // One Chinese character as one Chinese word.
+                 // Chinese word extraction to be added later here.
+                 return true;
+diff --git a/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp b/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp
+index 38bf987..3b4de74 100644
+--- a/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp
++++ b/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp
+@@ -65,6 +65,7 @@ bool ChineseTokenizer::incrementToken() {
+ 
+     length = 0;
+     start = offset;
++    bool last_is_en = false, last_is_num = false;
+ 
+     while (true) {
+         wchar_t c;
+@@ -82,11 +83,30 @@ bool ChineseTokenizer::incrementToken() {
+             c = ioBuffer[bufferIndex++];
+         }
+ 
+-        if (UnicodeUtil::isDigit(c) || UnicodeUtil::isLower(c) || UnicodeUtil::isUpper(c)) {
++        if (UnicodeUtil::isLower(c) || UnicodeUtil::isUpper(c)) {
++            if (last_is_num) {
++                --bufferIndex;
++                --offset;
++                return flush();
++            }
++
++            push(c);
++            if (length == MAX_WORD_LEN) {
++                return flush();
++            }
++            last_is_en = true;
++        } else if (UnicodeUtil::isDigit(c)) {
++            if (last_is_en) {
++                --bufferIndex;
++                --offset;
++                return flush();
++            }
++
+             push(c);
+             if (length == MAX_WORD_LEN) {
+                 return flush();
+             }
++            last_is_num = true;
+         } else if (UnicodeUtil::isOther(c)) {
+             if (length > 0) {
+                 --bufferIndex;
diff --git a/libraries/MyGUI/MyGUI.SlackBuild b/libraries/MyGUI/MyGUI.SlackBuild
index 6a0ad93db9..d60e684a36 100644
--- a/libraries/MyGUI/MyGUI.SlackBuild
+++ b/libraries/MyGUI/MyGUI.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM$VERSION
-tar xvf $CWD/$PRGNAM$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM$VERSION.tar.gz
 cd $SRCNAM$VERSION
 chown -R root:root .
 find -L . \
diff --git a/libraries/MyGUI/MyGUI.info b/libraries/MyGUI/MyGUI.info
index 3f1871d800..48e2964a78 100644
--- a/libraries/MyGUI/MyGUI.info
+++ b/libraries/MyGUI/MyGUI.info
@@ -1,7 +1,7 @@
 PRGNAM="MyGUI"
 VERSION="3.4.0"
 HOMEPAGE="http://mygui.info"
-DOWNLOAD="https://github.com/MyGUI/mygui/archive/MyGUI3.4.0.tar.gz"
+DOWNLOAD="https://github.com/MyGUI/mygui/archive/MyGUI3.4.0/mygui-MyGUI3.4.0.tar.gz"
 MD5SUM="30e64cdb3dc09a209259a5ffd13dc2ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/OpenBLAS/OpenBLAS.SlackBuild b/libraries/OpenBLAS/OpenBLAS.SlackBuild
index 5025a75415..7e87ec2691 100644
--- a/libraries/OpenBLAS/OpenBLAS.SlackBuild
+++ b/libraries/OpenBLAS/OpenBLAS.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Mário Antunes (mariolpantunes@gmail.com)
 
 PRGNAM="OpenBLAS"
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/OpenBLAS/OpenBLAS.info b/libraries/OpenBLAS/OpenBLAS.info
index a8abb790ff..115e26916e 100644
--- a/libraries/OpenBLAS/OpenBLAS.info
+++ b/libraries/OpenBLAS/OpenBLAS.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenBLAS"
-VERSION="0.3.3"
-HOMEPAGE="https://github.com/xianyi/OpenBLAS"
-DOWNLOAD="https://github.com/xianyi/OpenBLAS/archive/v0.3.3/OpenBLAS-0.3.3.tar.gz"
-MD5SUM="30e2f8d7317e84dde5a37152173848f1"
+VERSION="0.3.12"
+HOMEPAGE="http://www.openblas.net/"
+DOWNLOAD="https://github.com/xianyi/OpenBLAS/releases/download/v0.3.12/OpenBLAS-0.3.12.tar.gz"
+MD5SUM="baf8c58c0ef6ebe0f9eb74a5c4acd662"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/QR-Code-generator/QR-Code-generator.SlackBuild b/libraries/QR-Code-generator/QR-Code-generator.SlackBuild
new file mode 100644
index 0000000000..5fda6717ef
--- /dev/null
+++ b/libraries/QR-Code-generator/QR-Code-generator.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Slackware build script for QR-Code-generator
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=QR-Code-generator
+VERSION=${VERSION:-1.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Fix makefiles (Modified from Fedora)
+# https://src.fedoraproject.org/rpms/qr-code-generator
+patch -p1 < $CWD/qr-code-generator-build-fixes.patch
+
+(
+  cd c
+  make CFLAGS="$SLKCFLAGS"
+  make install \
+    PREFIX=/usr \
+    LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    DESTDIR=$PKG
+)
+
+(
+  cd cpp
+  make CXXFLAGS="$SLKCFLAGS"
+  make install \
+    PREFIX=/usr \
+    LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    DESTDIR=$PKG
+)
+
+if python3 -c 'import sys' 2>/dev/null; then
+  (
+    cd python
+    python3 setup.py install --root=$PKG
+  )
+fi
+
+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 Readme.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/QR-Code-generator/QR-Code-generator.info b/libraries/QR-Code-generator/QR-Code-generator.info
new file mode 100644
index 0000000000..a06cf5775b
--- /dev/null
+++ b/libraries/QR-Code-generator/QR-Code-generator.info
@@ -0,0 +1,10 @@
+PRGNAM="QR-Code-generator"
+VERSION="1.6.0"
+HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"
+DOWNLOAD="https://github.com/nayuki/QR-Code-generator/archive/v1.6.0/QR-Code-generator-1.6.0.tar.gz"
+MD5SUM="b0015162c613dea118c69d34b77fea7a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/libraries/QR-Code-generator/README b/libraries/QR-Code-generator/README
new file mode 100644
index 0000000000..e281d4ab3e
--- /dev/null
+++ b/libraries/QR-Code-generator/README
@@ -0,0 +1,6 @@
+This project aims to be the best, clearest library for generating
+QR Codes. My primary goals are flexible options and absolute
+correctness. Secondary goals are compact implementation size and good
+documentation comments.
+
+python3 is an optional dependency.
diff --git a/libraries/QR-Code-generator/qr-code-generator-build-fixes.patch b/libraries/QR-Code-generator/qr-code-generator-build-fixes.patch
new file mode 100644
index 0000000000..4acdfe4999
--- /dev/null
+++ b/libraries/QR-Code-generator/qr-code-generator-build-fixes.patch
@@ -0,0 +1,156 @@
+diff -urN QR-Code-generator-1.6.0.orig/c/Makefile QR-Code-generator-1.6.0/c/Makefile
+--- QR-Code-generator-1.6.0.orig/c/Makefile	2020-10-28 13:44:11.561734024 -0700
++++ QR-Code-generator-1.6.0/c/Makefile	2020-10-28 13:47:38.512702152 -0700
+@@ -29,11 +29,15 @@
+ # - CFLAGS: Any extra user-specified compiler flags (can be blank).
+ 
+ # Recommended compiler flags:
+-CFLAGS += -std=c99 -O
++CFLAGS += -O2
++
++MAIN_FLAGS := -std=c99 -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion
+ 
+ # Extra flags for diagnostics:
+-# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
++# MAIN_FLAGS += -g -fsanitize=undefined,address
+ 
++# Version information
++VERSION = 1.6.0
+ 
+ # ---- Controlling make ----
+ 
+@@ -51,10 +55,19 @@
+ # ---- Targets to build ----
+ 
+ LIB = qrcodegen
+-LIBFILE = lib$(LIB).a
++LIBFILE = lib$(LIB).so
++# Bump the soname number when the ABI changes and gets incompatible
++SO_NAME = $(LIBFILE).1
++REAL_NAME = $(LIBFILE).$(VERSION)
++HEADERS = qrcodegen.h
+ LIBOBJ = qrcodegen.o
+ MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
+ 
++# define paths to install
++PREFIX ?= /usr/local
++INCLUDEDIR ?= $(PREFIX)/include/qrcodegen
++LIBDIR ?= $(PREFIX)/lib
++
+ # Build all binaries
+ all: $(LIBFILE) $(MAINS)
+ 
+@@ -63,21 +76,33 @@
+ 	rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS)
+ 	rm -rf .deps
+ 
++install-shared: $(LIBFILE)
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	install -m 0755 $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(REAL_NAME)
++	ln -s $(REAL_NAME) $(DESTDIR)$(LIBDIR)/$(SO_NAME)
++	ln -s $(SO_NAME) $(DESTDIR)$(LIBDIR)/$(LIBFILE)
++
++install-header: $(HEADERS)
++	mkdir -p $(DESTDIR)$(INCLUDEDIR)
++	install -m 0644 $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/
++
++install: install-shared install-header
++
+ # Executable files
+ %: %.o $(LIBFILE)
+ 	$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
+ 
+ # Special executable
+ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
+-	$(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^
++	$(CC) $(CFLAGS) $(MAIN_FLAGS) -DQRCODEGEN_TEST -o $@ $^
+ 
+ # The library
+ $(LIBFILE): $(LIBOBJ)
+-	$(AR) -crs $@ -- $^
++	$(CC) $(CFLAGS) $(MAIN_FLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
+ 
+ # Object files
+ %.o: %.c .deps/timestamp
+-	$(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
++	$(CC) $(CFLAGS) $(MAIN_FLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
+ 
+ # Have a place to store header dependencies automatically generated by compiler
+ .deps/timestamp:
+diff -urN QR-Code-generator-1.6.0.orig/cpp/Makefile QR-Code-generator-1.6.0/cpp/Makefile
+--- QR-Code-generator-1.6.0.orig/cpp/Makefile	2020-10-28 13:44:11.561734024 -0700
++++ QR-Code-generator-1.6.0/cpp/Makefile	2020-10-28 13:48:27.218164945 -0700
+@@ -29,11 +29,15 @@
+ # - CXXFLAGS: Any extra user-specified compiler flags (can be blank).
+ 
+ # Recommended compiler flags:
+-CXXFLAGS += -std=c++11 -O
++CXXFLAGS ?= -O2
++
++MAIN_FLAGS := -std=c++11 -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion
+ 
+ # Extra flags for diagnostics:
+-# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
++# MAIN_FLAGS += -g -fsanitize=undefined,address
+ 
++# Version information
++VERSION = 1.6.0
+ 
+ # ---- Controlling make ----
+ 
+@@ -50,11 +54,20 @@
+ 
+ # ---- Targets to build ----
+ 
+-LIB = qrcodegen
+-LIBFILE = lib$(LIB).a
++LIB = qrcodegencpp
++LIBFILE = lib$(LIB).so
++# Bump the soname number when the ABI changes and gets incompatible
++SO_NAME = $(LIBFILE).1
++REAL_NAME = $(LIBFILE).$(VERSION)
++HEADERS = QrCode.hpp
+ LIBOBJ = QrCode.o
+ MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker
+ 
++# define paths to install
++PREFIX ?= /usr/local
++INCLUDEDIR ?= $(PREFIX)/include/qrcodegen
++LIBDIR ?= $(PREFIX)/lib
++
+ # Build all binaries
+ all: $(LIBFILE) $(MAINS)
+ 
+@@ -63,17 +76,29 @@
+ 	rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS)
+ 	rm -rf .deps
+ 
++install-shared: $(LIBFILE)
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	install -m 0755 $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(REAL_NAME)
++	ln -s $(REAL_NAME) $(DESTDIR)$(LIBDIR)/$(SO_NAME)
++	ln -s $(SO_NAME) $(DESTDIR)$(LIBDIR)/$(LIBFILE)
++
++install-header: $(HEADERS)
++	mkdir -p $(DESTDIR)$(INCLUDEDIR)
++	install -m 0644 $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/
++
++install: install-shared install-header
++
+ # Executable files
+ %: %.o $(LIBFILE)
+-	$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
++	$(CXX) $(CXXFLAGS) $(MAIN_FLAGS) -o $@ $< -L . -l $(LIB)
+ 
+ # The library
+ $(LIBFILE): $(LIBOBJ)
+-	$(AR) -crs $@ -- $^
++	$(CXX) $(CXXFLAGS) $(MAIN_FLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
+ 
+ # Object files
+ %.o: %.cpp .deps/timestamp
+-	$(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
++	$(CXX) $(CXXFLAGS) $(MAIN_FLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
+ 
+ # Have a place to store header dependencies automatically generated by compiler
+ .deps/timestamp:
diff --git a/network/dissenter-browser/slack-desc b/libraries/QR-Code-generator/slack-desc
index e2446ed6b2..4b8b1d02c7 100644
--- a/network/dissenter-browser/slack-desc
+++ b/libraries/QR-Code-generator/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                  |-----handy-ruler------------------------------------------------------|
-dissenter-browser: dissenter-browser (the free speech web browser)
-dissenter-browser:
-dissenter-browser: Browse faster by blocking ads and trackers that violate your privacy
-dissenter-browser: and cost you time and money.
-dissenter-browser:
-dissenter-browser:
-dissenter-browser:
-dissenter-browser:
-dissenter-browser:
-dissenter-browser: https://dissenter.com
-dissenter-browser:
+QR-Code-generator: QR-Code-generator (QR Code generator library)
+QR-Code-generator:
+QR-Code-generator: High-quality QR Code generator library.
+QR-Code-generator:
+QR-Code-generator: Homepage: https://www.nayuki.io/page/qr-code-generator-library
+QR-Code-generator:
+QR-Code-generator:
+QR-Code-generator:
+QR-Code-generator:
+QR-Code-generator:
+QR-Code-generator:
diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
index 475f0bf2fc..f1c927be4a 100644
--- a/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
+++ b/libraries/QScintilla-qt5/QScintilla-qt5.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for QScintilla-qt5
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=QScintilla-qt5
 SRCNAM=QScintilla
-VERSION=${VERSION:-2.11.5}
+VERSION=${VERSION:-2.11.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/QScintilla-qt5/QScintilla-qt5.info b/libraries/QScintilla-qt5/QScintilla-qt5.info
index c6a4be0f0e..75acbf5437 100644
--- a/libraries/QScintilla-qt5/QScintilla-qt5.info
+++ b/libraries/QScintilla-qt5/QScintilla-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="QScintilla-qt5"
-VERSION="2.11.5"
+VERSION="2.11.6"
 HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/QScintilla-2.11.5.tar.gz"
-MD5SUM="c31d77e1fcc218ed3f27458fa80d4dc9"
+DOWNLOAD="https://jaxartes.net/files/QScintilla-2.11.6.tar.gz"
+MD5SUM="343cd0c2c8b425518df2e51eb994fbc6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-PyQt5"
diff --git a/libraries/SDL2/README b/libraries/SDL2/README
index 7fa6c9b740..027bf390b1 100644
--- a/libraries/SDL2/README
+++ b/libraries/SDL2/README
@@ -1,8 +1,8 @@
 SDL2 (Simple DirectMedia Layer Version 2)
 
-Simple DirectMedia Layer is a cross-platform development library designed to
-provide low-level access to audio, keyboard, mouse, joystick, and graphics
-hardware via OpenGL.
+Simple DirectMedia Layer is a cross-platform development library
+designed to provide low-level access to audio, keyboard, mouse,
+joystick, and graphics hardware via OpenGL.
 
 SDL is written in C and works natively with C++.
 
diff --git a/libraries/SDL2/SDL2.SlackBuild b/libraries/SDL2/SDL2.SlackBuild
index 9172772783..f8758ec607 100644
--- a/libraries/SDL2/SDL2.SlackBuild
+++ b/libraries/SDL2/SDL2.SlackBuild
@@ -24,6 +24,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210204 bkw: update for v2.0.14, reflow README.
 # 20200415 bkw:
 # - take over maintenance
 # - don't install static libSDL2.a
@@ -32,8 +33,8 @@
 # - BUILD=2
 
 PRGNAM=SDL2
-VERSION=${VERSION:-2.0.12}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.0.14}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/libraries/SDL2/SDL2.info b/libraries/SDL2/SDL2.info
index a245b7b23a..fb33399243 100644
--- a/libraries/SDL2/SDL2.info
+++ b/libraries/SDL2/SDL2.info
@@ -1,8 +1,8 @@
 PRGNAM="SDL2"
-VERSION="2.0.12"
+VERSION="2.0.14"
 HOMEPAGE="https://libsdl.org"
-DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.12.tar.gz"
-MD5SUM="783b6f2df8ff02b19bb5ce492b99c8ff"
+DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.14.tar.gz"
+MD5SUM="76ed4e6da9c07bd168b2acd9bfefab1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/SOPE/SOPE.SlackBuild b/libraries/SOPE/SOPE.SlackBuild
index 5607e2974d..1ae0c44d0a 100644
--- a/libraries/SOPE/SOPE.SlackBuild
+++ b/libraries/SOPE/SOPE.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SOPE
-VERSION=${VERSION:-4.3.2}
+VERSION=${VERSION:-5.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/SOPE/SOPE.info b/libraries/SOPE/SOPE.info
index 4fd30b3894..50ea51c5b2 100644
--- a/libraries/SOPE/SOPE.info
+++ b/libraries/SOPE/SOPE.info
@@ -1,8 +1,8 @@
 PRGNAM="SOPE"
-VERSION="4.3.2"
+VERSION="5.0.1"
 HOMEPAGE="https://github.com/inverse-inc/sope"
-DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOPE-4.3.2.tar.gz"
-MD5SUM="5f80d0ea8eccbc5c9a19e8820ff851f1"
+DOWNLOAD="https://packages.inverse.ca/SOGo/sources/SOPE-5.0.1.tar.gz"
+MD5SUM="0458dd8f4be1c50ec8ee5f6ea6f49c13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnustep-base"
diff --git a/libraries/SPIRV-Headers/README b/libraries/SPIRV-Headers/README
new file mode 100644
index 0000000000..233a700fbd
--- /dev/null
+++ b/libraries/SPIRV-Headers/README
@@ -0,0 +1 @@
+Machine-readable files for the SPIR-V Registry.
diff --git a/libraries/SPIRV-Headers/SPIRV-Headers.SlackBuild b/libraries/SPIRV-Headers/SPIRV-Headers.SlackBuild
new file mode 100644
index 0000000000..b27858f22b
--- /dev/null
+++ b/libraries/SPIRV-Headers/SPIRV-Headers.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for SPIRV-Headers
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=SPIRV-Headers
+VERSION=${VERSION:-1.5.4}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION.raytracing.fixed
+tar xvf $CWD/$PRGNAM-$VERSION.raytracing.fixed.tar.gz
+cd $PRGNAM-$VERSION.raytracing.fixed
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# cmake: Install cmake files to CMAKE_INSTALL_DATADIR
+# https://github.com/KhronosGroup/SPIRV-Headers/pull/178
+patch -p1 < $CWD/datadir.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SPIRV-Headers/SPIRV-Headers.info b/libraries/SPIRV-Headers/SPIRV-Headers.info
new file mode 100644
index 0000000000..c41512ea51
--- /dev/null
+++ b/libraries/SPIRV-Headers/SPIRV-Headers.info
@@ -0,0 +1,10 @@
+PRGNAM="SPIRV-Headers"
+VERSION="1.5.4"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Headers"
+DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.4.raytracing.fixed/SPIRV-Headers-1.5.4.raytracing.fixed.tar.gz"
+MD5SUM="f49a22584eeb2609169970c2c3c1eb6e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/libraries/SPIRV-Headers/datadir.patch b/libraries/SPIRV-Headers/datadir.patch
new file mode 100644
index 0000000000..071f8c140e
--- /dev/null
+++ b/libraries/SPIRV-Headers/datadir.patch
@@ -0,0 +1,19 @@
+commit eae955f0525724526fa602fd126623b9d84599fa
+Author: orbea <orbea@riseup.net>
+Date:   Thu Nov 5 22:08:24 2020 -0800
+
+    cmake: Install cmake files to CMAKE_INSTALL_DATADIR
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb46947..6f01ef0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,7 +79,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
+ if (SPIRV_HEADERS_ENABLE_INSTALL)
+     message(STATUS "Installing SPIRV-Header")
+ 
+-    set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
++    set(config_install_dir "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}")
+ 
+     set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+ 
diff --git a/libraries/SPIRV-Headers/slack-desc b/libraries/SPIRV-Headers/slack-desc
new file mode 100644
index 0000000000..c6f6711345
--- /dev/null
+++ b/libraries/SPIRV-Headers/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+SPIRV-Headers: SPIRV-Headers (SPIRV Header files)
+SPIRV-Headers:
+SPIRV-Headers: Machine-readable files for the SPIR-V Registry.
+SPIRV-Headers:
+SPIRV-Headers: Homepage: https://github.com/KhronosGroup/SPIRV-Headers
+SPIRV-Headers:
+SPIRV-Headers:
+SPIRV-Headers:
+SPIRV-Headers:
+SPIRV-Headers:
+SPIRV-Headers:
diff --git a/libraries/SimGear/README b/libraries/SimGear/README
index a67f428044..ee218c1353 100644
--- a/libraries/SimGear/README
+++ b/libraries/SimGear/README
@@ -1,6 +1,3 @@
-SimGear is a set of open-source libraries designed to be used as building
-blocks for quickly assembling 3d simulations, games, and visualization
-applications.
-
-For those wanting to build this in current (15.0 EXPERIMENTAL), pass
-CURRENT=yes to the script.
+SimGear is a set of open-source libraries designed to be used as
+building blocks for quickly assembling 3d simulations, games, and
+visualization applications.
diff --git a/libraries/SimGear/SimGear-version.patch b/libraries/SimGear/SimGear-version.patch
deleted file mode 100644
index 3af230ffd3..0000000000
--- a/libraries/SimGear/SimGear-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur simgear-2020.1.2/CMakeLists.txt simgear-2020.1.2.new/CMakeLists.txt
---- simgear-2020.1.2/CMakeLists.txt	2020-05-24 11:13:35.000000000 -0400
-+++ simgear-2020.1.2.new/CMakeLists.txt	2020-06-01 09:36:21.608814301 -0400
-@@ -43,13 +43,13 @@
- set(CMAKE_CXX_STANDARD_REQUIRED YES)
- 
- # read 'version' file into a variable (stripping any newlines or spaces)
--file(READ version versionFile)
-+file(READ simgear-version versionFile)
- string(STRIP ${versionFile} SIMGEAR_VERSION)
- 
- project(SimGear VERSION ${SIMGEAR_VERSION} LANGUAGES C CXX)
- 
- # add a dependency on the version file
--set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS version)
-+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS simgear-version)
- 
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
- 
-diff -Naur simgear-2020.1.2/simgear-version simgear-2020.1.2.new/simgear-version
---- simgear-2020.1.2/simgear-version	1969-12-31 19:00:00.000000000 -0500
-+++ simgear-2020.1.2.new/simgear-version	2020-05-24 11:13:36.000000000 -0400
-@@ -0,0 +1 @@
-+2020.1.2
-diff -Naur simgear-2020.1.2/version simgear-2020.1.2.new/version
---- simgear-2020.1.2/version	2020-05-24 11:13:36.000000000 -0400
-+++ simgear-2020.1.2.new/version	1969-12-31 19:00:00.000000000 -0500
-@@ -1 +0,0 @@
--2020.1.2
diff --git a/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild
index 23d302a34d..93ae1e611e 100644
--- a/libraries/SimGear/SimGear.SlackBuild
+++ b/libraries/SimGear/SimGear.SlackBuild
@@ -3,6 +3,7 @@
 
 # Copyright before version 2016.3.1 by Diego Pantano  <poplin.dp@gmail.com>
 # Copyright 2016-2018 Panagiotis Nikolaou, Culver City, CA
+# Copyright 2020 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 
 PRGNAM=SimGear
 SRCNAM=simgear
-VERSION=${VERSION:-2020.1.2}
+VERSION=${VERSION:-2020.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,27 +71,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 {} \;
 
-# Option to build on -current
-if [ "${CURRENT:-no}" = "yes" ]; then
-  BOOSTOPT="-DBoost_NO_BOOST_CMAKE=ON"
-  # patch for the new boost:
-  patch -p1 < $CWD/simgear-enable-if.patch
-  # Thanks Gentoo for this one
-  patch -p1 < $CWD/SimGear-version.patch
-else
-  BOOSTOPT=""
-fi
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSIMGEAR_SHARED=ON \
     -DSYSTEM_EXPAT=ON \
     -DENABLE_TESTS=OFF \
-    $BOOSTOPT \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/libraries/SimGear/SimGear.info b/libraries/SimGear/SimGear.info
index 24847f2153..e76bcb8dca 100644
--- a/libraries/SimGear/SimGear.info
+++ b/libraries/SimGear/SimGear.info
@@ -1,8 +1,8 @@
 PRGNAM="SimGear"
-VERSION="2020.1.2"
+VERSION="2020.3.6"
 HOMEPAGE="http://wiki.flightgear.org/SimGear"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.1.2.tar.bz2"
-MD5SUM="72b30525f3c9f538535574403ea3d4ab"
+DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.3.6.tar.bz2"
+MD5SUM="b78dfc1f09229ada5a6506d82803a134"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenSceneGraph freealut plib"
diff --git a/libraries/SimGear/simgear-enable-if.patch b/libraries/SimGear/simgear-enable-if.patch
deleted file mode 100644
index 2cf69cefe9..0000000000
--- a/libraries/SimGear/simgear-enable-if.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
-index aac672fd..2ee7d044 100644
---- a/simgear/nasal/cppbind/NasalHash.hxx
-+++ b/simgear/nasal/cppbind/NasalHash.hxx
-@@ -23,6 +23,7 @@
- #include "to_nasal.hxx"
- 
- #include <simgear/structure/map.hxx>
-+#include <boost/core/enable_if.hpp>
- #include <boost/iterator/iterator_facade.hpp>
- 
- namespace nasal
diff --git a/libraries/Vulkan-Headers/README b/libraries/Vulkan-Headers/README
new file mode 100644
index 0000000000..8234e5637d
--- /dev/null
+++ b/libraries/Vulkan-Headers/README
@@ -0,0 +1 @@
+Vulkan Header files and API registry.
diff --git a/libraries/Vulkan-Headers/Vulkan-Headers.SlackBuild b/libraries/Vulkan-Headers/Vulkan-Headers.SlackBuild
new file mode 100644
index 0000000000..bbc18fe703
--- /dev/null
+++ b/libraries/Vulkan-Headers/Vulkan-Headers.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Slackware build script for Vulkan-Headers
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=Vulkan-Headers
+VERSION=${VERSION:-1.2.162.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-sdk-$VERSION
+tar xvf $CWD/$PRGNAM-sdk-$VERSION.tar.gz
+cd $PRGNAM-sdk-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Require an older cmake version.
+sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/Vulkan-Headers/Vulkan-Headers.info b/libraries/Vulkan-Headers/Vulkan-Headers.info
new file mode 100644
index 0000000000..f95de607ec
--- /dev/null
+++ b/libraries/Vulkan-Headers/Vulkan-Headers.info
@@ -0,0 +1,10 @@
+PRGNAM="Vulkan-Headers"
+VERSION="1.2.162.0"
+HOMEPAGE="https://www.khronos.org/vulkan/"
+DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.162.0/Vulkan-Headers-sdk-1.2.162.0.tar.gz"
+MD5SUM="a26c15a4bd1c683226c4e74b1f265248"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/libraries/Vulkan-Headers/slack-desc b/libraries/Vulkan-Headers/slack-desc
new file mode 100644
index 0000000000..9ddab23070
--- /dev/null
+++ b/libraries/Vulkan-Headers/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+Vulkan-Headers: Vulkan-Headers (Vulkan Header files and API registry)
+Vulkan-Headers:
+Vulkan-Headers: Vulkan header files and API registry.
+Vulkan-Headers:
+Vulkan-Headers: Homepage: https://www.khronos.org/vulkan/
+Vulkan-Headers:
+Vulkan-Headers:
+Vulkan-Headers:
+Vulkan-Headers:
+Vulkan-Headers:
+Vulkan-Headers:
diff --git a/libraries/allegro/README b/libraries/allegro/README
index 920768e002..6abdda452c 100644
--- a/libraries/allegro/README
+++ b/libraries/allegro/README
@@ -12,3 +12,16 @@ contributions from all over the world! Some of its key features include:
     * Open Source - anyone can contribute, including you!
     * Free - it won't cost you a dime, and there are no restrictions on
       its usage
+
+You can disable native_dialog addon by passing this option :
+ALLEGRO_NATIVE_DIALOG=off ./allegro.Slackbuild
+
+Since it depends on gtk3, and slackware-14.2's gtk3 is too old, this addon
+prevents allegro 5.2.7+ to build on slackware-14.2.
+So if you want, or need, to build allegro 5.2.7.0 on slackware-14.2 you have
+to disable this addon by running this command :
+VERSION=2.5.7.0 ALLEGRO_NATIVE_DIALOG=off ./allegro.Slackbuild
+
+On slackware-current, the simple version bump is enough, and the native_dialog
+addon works pretty fine :
+VERSION=2.5.7.0 ./allegro.Slackbuild
diff --git a/libraries/allegro/allegro.SlackBuild b/libraries/allegro/allegro.SlackBuild
index 7c4ca6c4df..1c6d8c9db4 100644
--- a/libraries/allegro/allegro.SlackBuild
+++ b/libraries/allegro/allegro.SlackBuild
@@ -80,6 +80,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+	-DWANT_NATIVE_DIALOG=${ALLEGRO_NATIVE_DIALOG:-on} \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
diff --git a/libraries/aspnetcore-runtime/README b/libraries/aspnetcore-runtime/README
index ebff9763a6..c4c5764000 100644
--- a/libraries/aspnetcore-runtime/README
+++ b/libraries/aspnetcore-runtime/README
@@ -3,7 +3,7 @@ maintained by Microsoft and the .NET community on GitHub.
 It's cross-platform (supporting Windows, macOS, and Linux)
 and can be used to build device, cloud, and IoT applications.
 
-This package contains everything you need to run a ASP.NET application. 
+This package contains everything you need to run a ASP.NET application.
 It includes ASP.NET Core runtime and .NET Core runtime.
 If you want to build apps, install .NET Core SDK (dotnet-sdk), which
-contais these runtimes too.
+contains these runtimes too.
diff --git a/libraries/aspnetcore-runtime/aspnetcore-runtime.SlackBuild b/libraries/aspnetcore-runtime/aspnetcore-runtime.SlackBuild
index 5203fe054c..769e809a5c 100644
--- a/libraries/aspnetcore-runtime/aspnetcore-runtime.SlackBuild
+++ b/libraries/aspnetcore-runtime/aspnetcore-runtime.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+
 # Slackware build script for aspnetcore-runtime.
 #
 # Copyright 2019 Reza Talebi, Shahin Shahr, Iran.
@@ -23,16 +23,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=aspnetcore-runtime
-VERSION=${VERSION:-3.1.8}
+VERSION=${VERSION:-3.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHITECTURE="x64"
+else
+  echo "Package for $ARCH architecture is not available."
+  exit 1
 fi
 
 CWD=$(pwd)
@@ -40,20 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 set -e
 
-if [ "$( uname -m )" = "x86_64" ]; then
-  ARCH="x86_64"
-  ARCHITECTURE="x64"
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,12 +55,14 @@ mkdir -p usr/share/dotnet
 tar -zxf $CWD/$PRGNAM-${VERSION}-linux-${ARCHITECTURE}.tar.gz -C usr/share/dotnet
 chown -R root:root usr/share/dotnet
 
+mkdir -p usr/bin
+ln -s /usr/share/dotnet/dotnet usr/bin/dotnet
+
 mkdir -p usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/aspnetcore-runtime/aspnetcore-runtime.info b/libraries/aspnetcore-runtime/aspnetcore-runtime.info
index 5f0642a4b0..354758aeec 100644
--- a/libraries/aspnetcore-runtime/aspnetcore-runtime.info
+++ b/libraries/aspnetcore-runtime/aspnetcore-runtime.info
@@ -1,10 +1,10 @@
 PRGNAM="aspnetcore-runtime"
-VERSION="3.1.8"
+VERSION="3.1.13"
 HOMEPAGE="https://dotnet.microsoft.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/f7c8f82a-8c47-497d-875b-2ac210599ec5/e8aea0c195efed8a9aff2ba687db8c26/aspnetcore-runtime-3.1.8-linux-x64.tar.gz"
-MD5SUM_x86_64="e116dd29ebf80792a2246c66fb729cd1"
+DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/a11a4be1-2a51-4ddc-a23a-56348ea45101/20085ae5fbefd18642babcee279a74e4/aspnetcore-runtime-3.1.13-linux-x64.tar.gz"
+MD5SUM_x86_64="7cde6a5e7e018638c249e721138a526f"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/libraries/aspnetcore-runtime/doinst.sh b/libraries/aspnetcore-runtime/doinst.sh
deleted file mode 100644
index ec1d7e5165..0000000000
--- a/libraries/aspnetcore-runtime/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/libraries/blas/blas.SlackBuild b/libraries/blas/blas.SlackBuild
index 6b960bd140..b59c576236 100644
--- a/libraries/blas/blas.SlackBuild
+++ b/libraries/blas/blas.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for BLAS
 
-# Copyright 2014-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=blas
 SRCNAM=lapack
-VERSION=${VERSION:-3.9.0}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/blas/blas.info b/libraries/blas/blas.info
index 57b93cea87..48d83b69d7 100644
--- a/libraries/blas/blas.info
+++ b/libraries/blas/blas.info
@@ -1,8 +1,8 @@
 PRGNAM="blas"
-VERSION="3.9.0"
-HOMEPAGE="http://www.netlib.org/blas/"
-DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz"
-MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2"
+VERSION="3.9.1"
+HOMEPAGE="https://www.netlib.org/blas/"
+DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz"
+MD5SUM="47ab2d11652045145df37ddbe2a32d71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/blas/patches/cmake-piecewise.diff b/libraries/blas/patches/cmake-piecewise.diff
index b1bdfaec1e..378acc8769 100644
--- a/libraries/blas/patches/cmake-piecewise.diff
+++ b/libraries/blas/patches/cmake-piecewise.diff
@@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
  message(STATUS "CBLAS enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 -
  # Create a header file cblas.h for the routines called in my C programs
  include(FortranCInterface)
  ## Ensure that the fortran compiler and c compiler specified are compatible
-@@ -41,54 +39,8 @@
+@@ -45,54 +43,8 @@
    add_subdirectory(examples)
  endif()
  
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -# Export cblas targets from the
 -# install tree, if any.
 -set(_cblas_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT cblas-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  install(EXPORT ${CBLASLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -  # Choose one of the cblas targets to use as a guard for
@@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -# Export cblas targets from the build tree, if any.
 -set(_cblas_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake)
 -
 -  # Choose one of the cblas targets to use as a guard
 -  # for cblas-config.cmake to load targets from the build tree.
@@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -endif()
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY)
 -
 -
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY)
    install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc
    DESTINATION ${PKG_CONFIG_DIR}
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -  )
 -
--#install(EXPORT cblas-targets
--#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-#install(EXPORT ${CBLASLIB}-targets
+-#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -#  COMPONENT Development
 -#  )
 diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
@@ -76,14 +76,14 @@ deleted file mode 100644
 -
 -# Load lapack targets from the build tree, including lapacke targets.
 -if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Report cblas header search locations from build tree.
 -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report cblas libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
 deleted file mode 100644
 --- a/CBLAS/cmake/cblas-config-install.cmake.in
@@ -96,19 +96,19 @@ deleted file mode 100644
 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET cblas)
--  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-if(NOT TARGET @CBLASLIB@)
+-  include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake)
 -endif()
 -
 -# Report lapacke header search locations.
 -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 -
 -unset(_CBLAS_PREFIX)
 -unset(_CBLAS_SELF_DIR)
@@ -128,16 +128,16 @@ deleted file mode 100644
 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
 --- a/CBLAS/src/CMakeLists.txt
 +++ b/CBLAS/src/CMakeLists.txt
-@@ -120,9 +120,5 @@
-   VERSION ${LAPACK_VERSION}
-   SOVERSION ${LAPACK_MAJOR_VERSION}
-   )
--target_include_directories(cblas PUBLIC
+@@ -123,9 +123,5 @@
+ if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+   target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+ endif()
+-target_include_directories(${CBLASLIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 -  $<INSTALL_INTERFACE:include>
 -)
- target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
- lapack_install_library(cblas)
+ target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES})
+ lapack_install_library(${CBLASLIB})
 diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
 deleted file mode 100644
 --- a/CMAKE/lapack-config-build.cmake.in
@@ -146,7 +146,7 @@ deleted file mode 100644
 -# Load lapack targets from the build tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -168,7 +168,7 @@ deleted file mode 100644
 -# Load lapack targets from the install tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-  include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -184,11 +184,11 @@ deleted file mode 100644
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,11 +112,8 @@
+@@ -160,11 +160,8 @@
  
  
  # --------------------------------------------------
--set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
 -
  macro(lapack_install_library lib)
    install(TARGETS ${lib}
@@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
-@@ -155,21 +152,6 @@
+@@ -204,21 +201,6 @@
  include(CheckLAPACKCompilerFlags)
  CheckLAPACKCompilerFlags()
  
@@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Check second function
 -
 -include(CheckTimeFunction)
--set(TIME_FUNC NONE ${TIME_FUNC})
+-set(NONE ${TIME_FUNC})
 -CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  # deprecated LAPACK and LAPACKE routines
  option(BUILD_DEPRECATED "Build deprecated routines" OFF)
  message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}")
-@@ -193,8 +175,9 @@
+@@ -242,8 +224,9 @@
  endif()
  
  # --------------------------------------------------
@@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  
  # Check the usage of the user provided BLAS libraries
  if(BLAS_LIBRARIES)
-@@ -205,113 +188,108 @@
+@@ -254,113 +237,108 @@
    if(BLAS_FOUND)
      message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
    else()
@@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -  message(STATUS "Using supplied NETLIB BLAS implementation")
 -  add_subdirectory(BLAS)
 +elseif(BUILD_BLAS)
-   set(BLAS_LIBRARIES blas)
+   set(BLAS_LIBRARIES ${BLASLIB})
 -else()
 -  set(CMAKE_EXE_LINKER_FLAGS
 -    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
@@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +  find_package(LAPACK)
 +
 +elseif(BUILD_LAPACK)
-   set(LAPACK_LIBRARIES lapack)
+   set(LAPACK_LIBRARIES ${LAPACKLIB})
 +  set(LAPACK_FOUND TRUE)
 +
 +  set(NEED_BLAS TRUE)
 +
 +  # Check second function
 +  include(CheckTimeFunction)
-+  set(TIME_FUNC NONE ${TIME_FUNC})
++  set(NONE ${TIME_FUNC})
 +  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 +  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 +  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +    add_subdirectory(TESTING)
 +  endif()
 +
-+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 +    install(FILES
-+    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 +    DESTINATION ${PKG_CONFIG_DIR}
 +    COMPONENT Development
 +    )
@@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
    add_subdirectory(LAPACKE)
  endif()
  
-@@ -338,109 +316,12 @@
-   _display_cpp_implementation_msg("LAPACK")
+@@ -414,111 +392,16 @@
+   ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
  endif()
  
 -# --------------------------------------------------
@@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# --------------------------------------------------
 -
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -if(NOT LATESTLAPACK_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
 -endif()
 -
 -if(BUILD_TESTING OR LAPACKE_WITH_TMG)
--  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
 -endif()
 -
 -# Export lapack targets, not including lapacke, from the
 -# install tree, if any.
 -set(_lapack_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT lapack-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  install(EXPORT ${LAPACKLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -
@@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -
 -# Include cblas in targets exported from the build tree.
 -if(CBLAS)
--  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB})
 -endif()
 -
 -# Include lapacke in targets exported from the build tree.
 -if(LAPACKE)
--  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB})
 +# Neither user specified or optimized BLAS libraries can be used
 +if(NEED_BLAS AND NOT BLAS_FOUND)
 +  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
@@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Export lapack and lapacke targets from the build tree, if any.
 -set(_lapack_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake)
 -
 -  # Choose one of the lapack or lapacke targets to use as a guard
 -  # for lapack-config.cmake to load targets from the build tree.
@@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +if(NEED_LAPACK AND NOT LAPACK_FOUND)
 +  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
  endif()
--
+ 
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY)
 -
 -
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 -  install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 -  DESTINATION ${PKG_CONFIG_DIR}
 -  COMPONENT Development
 -  )
 -
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY)
 -
 -include(CMakePackageConfigHelpers)
 -write_basic_package_version_file(
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
 -  VERSION ${LAPACK_VERSION}
 -  COMPATIBILITY SameMajorVersion
 -  )
 -
 -install(FILES
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
--  
-\ No newline at end of file
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
 diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
 --- a/LAPACKE/CMakeLists.txt
 +++ b/LAPACKE/CMakeLists.txt
@@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
  message(STATUS "LAPACKE enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 -
  # Create a header file lapacke_mangling.h for the routines called in my C programs
  include(FortranCInterface)
@@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
    VERSION ${LAPACK_VERSION}
    SOVERSION ${LAPACK_MAJOR_VERSION}
    )
--target_include_directories(lapacke PUBLIC
+-target_include_directories(${LAPACKELIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 -  $<INSTALL_INTERFACE:include>
 -)
 -if(WIN32 AND NOT UNIX)
--  target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
+-  target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
 -  message(STATUS "Windows BUILD")
 -endif()
  
  if(LAPACKE_WITH_TMG)
-   target_link_libraries(lapacke PRIVATE tmglib)
+   target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB})
 @@ -111,22 +101,3 @@
    DESTINATION ${PKG_CONFIG_DIR}
    COMPONENT Development
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY)
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 -
--install(EXPORT lapacke-targets
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-install(EXPORT ${LAPACKELIB}-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
@@ -570,8 +571,8 @@ deleted file mode 100644
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapack targets from the build tree, including lapacke targets.
--if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-if(NOT TARGET @LAPACKELIB@)
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Hint for project building against lapack
@@ -581,7 +582,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
 deleted file mode 100644
 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in
@@ -594,12 +595,12 @@ deleted file mode 100644
 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET lapacke)
--  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-if(NOT TARGET @LAPACKELIB@)
+-  include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake)
 -endif()
 -
 -# Hint for project building against lapack
@@ -609,7 +610,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 -
 -unset(_LAPACKE_PREFIX)
 -unset(_LAPACKE_SELF_DIR)
diff --git a/libraries/bullet/bullet.SlackBuild b/libraries/bullet/bullet.SlackBuild
index f49ceb6bdf..4ab9e411c1 100644
--- a/libraries/bullet/bullet.SlackBuild
+++ b/libraries/bullet/bullet.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Bullet Physics
 
 # Originally Written by Jože Zobec <jozze.zepl@gmail.com>
-# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All Right Reserved
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bullet
-VERSION=${VERSION:-3.06}
+VERSION=${VERSION:-3.09}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/bullet/bullet.info b/libraries/bullet/bullet.info
index 51c00fddc4..3f241b0e5e 100644
--- a/libraries/bullet/bullet.info
+++ b/libraries/bullet/bullet.info
@@ -1,8 +1,8 @@
 PRGNAM="bullet"
-VERSION="3.06"
+VERSION="3.09"
 HOMEPAGE="http://www.bulletphysics.com/Bullet/"
-DOWNLOAD="https://github.com/bulletphysics/bullet3/archive/3.06/bullet3-3.06.tar.gz"
-MD5SUM="369407bb68a2d8898789a280acb067ac"
+DOWNLOAD="https://github.com/bulletphysics/bullet3/archive/3.09/bullet3-3.09.tar.gz"
+MD5SUM="7d1b8c685006a311895f7675d4757acd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cfitsio/cfitsio.SlackBuild b/libraries/cfitsio/cfitsio.SlackBuild
index 80ca4fdf5e..a03fd5cf34 100644
--- a/libraries/cfitsio/cfitsio.SlackBuild
+++ b/libraries/cfitsio/cfitsio.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cfitsio
-VERSION=${VERSION:-3.48}
+VERSION=${VERSION:-3.49}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/cfitsio/cfitsio.info b/libraries/cfitsio/cfitsio.info
index fdfe4a97cd..57e6cee76e 100644
--- a/libraries/cfitsio/cfitsio.info
+++ b/libraries/cfitsio/cfitsio.info
@@ -1,8 +1,8 @@
 PRGNAM="cfitsio"
-VERSION="3.48"
+VERSION="3.49"
 HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/"
-DOWNLOAD="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.48.tar.gz"
-MD5SUM="1d0b3fff1259f829013c56a1efbe9c50"
+DOWNLOAD="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz"
+MD5SUM="171860ffed8c1a396fc497d853f285c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cryptopp/cryptopp.SlackBuild b/libraries/cryptopp/cryptopp.SlackBuild
index b981acd403..3f5a569364 100644
--- a/libraries/cryptopp/cryptopp.SlackBuild
+++ b/libraries/cryptopp/cryptopp.SlackBuild
@@ -6,7 +6,7 @@
 # Maintained by Markus Reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
 
 PRGNAM=cryptopp
-VERSION=${VERSION:-8.2.0}
+VERSION=${VERSION:-8.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/cryptopp/cryptopp.info b/libraries/cryptopp/cryptopp.info
index 95c3dc6b59..e5f0afa890 100644
--- a/libraries/cryptopp/cryptopp.info
+++ b/libraries/cryptopp/cryptopp.info
@@ -1,8 +1,8 @@
 PRGNAM="cryptopp"
-VERSION="8.2.0"
+VERSION="8.5.0"
 HOMEPAGE="https://www.cryptopp.com/"
-DOWNLOAD="https://www.cryptopp.com/cryptopp820.zip"
-MD5SUM="8a8bcb436af83e16d2227bd4ac642243"
+DOWNLOAD="https://www.cryptopp.com/cryptopp850.zip"
+MD5SUM="43d448bf8e11c24f808e3a1006f5cc97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/dcmtk/dcmtk.SlackBuild b/libraries/dcmtk/dcmtk.SlackBuild
index 32f0c69a34..291e7b3a73 100644
--- a/libraries/dcmtk/dcmtk.SlackBuild
+++ b/libraries/dcmtk/dcmtk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dcmtk
 
-# Copyright 2018-2019 Christoph Willing,  Brisbane Australia
+# Copyright 2018-2021 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=dcmtk
 SRCNAM=dcmtk-DCMTK
-VERSION=${VERSION:-3.6.5}
+VERSION=${VERSION:-3.6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/dcmtk/dcmtk.info b/libraries/dcmtk/dcmtk.info
index 09e0222bfb..1a9ab1781e 100644
--- a/libraries/dcmtk/dcmtk.info
+++ b/libraries/dcmtk/dcmtk.info
@@ -1,8 +1,8 @@
 PRGNAM="dcmtk"
-VERSION="3.6.5"
+VERSION="3.6.6"
 HOMEPAGE="https://dicom.offis.de/dcmtk"
-DOWNLOAD="https://github.com/DCMTK/dcmtk/archive/DCMTK-3.6.5/dcmtk-DCMTK-3.6.5.tar.gz"
-MD5SUM="5e16d05ed958fd1089dfd6cc7ce9a569"
+DOWNLOAD="https://github.com/DCMTK/dcmtk/archive/DCMTK-3.6.6/dcmtk-DCMTK-3.6.6.tar.gz"
+MD5SUM="a9682030c95caea67e32c824ccf3de07"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild
index 7ccceaf58b..7c9121b038 100644
--- a/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild
+++ b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild
@@ -23,8 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=digimend-kernel-drivers
-VERSION=${VERSION:-20200429}
-COMMITVER=9c217fcb8ed0a729ad9f758399dd01d828840fb6
+VERSION=${VERSION:-10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$COMMITVER
-unzip $CWD/$PRGNAM-$COMMITVER.zip
-cd $PRGNAM-$COMMITVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/digimend-kernel-drivers/digimend-kernel-drivers.info b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.info
index a420215a48..f57b391071 100644
--- a/libraries/digimend-kernel-drivers/digimend-kernel-drivers.info
+++ b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.info
@@ -1,8 +1,8 @@
 PRGNAM="digimend-kernel-drivers"
-VERSION="20200429"
+VERSION="10"
 HOMEPAGE="https://github.com/DIGImend/digimend-kernel-drivers"
-DOWNLOAD="https://github.com/DIGImend/digimend-kernel-drivers/archive/9c217fcb8ed0a729ad9f758399dd01d828840fb6/digimend-kernel-drivers-9c217fcb8ed0a729ad9f758399dd01d828840fb6.zip"
-MD5SUM="95d9c5c7eddbfa05fa6adf9319938d3d"
+DOWNLOAD="https://github.com/DIGImend/digimend-kernel-drivers/archive/v10/digimend-kernel-drivers-10.tar.gz"
+MD5SUM="07ab6d40624e1c3df276690f50b84b99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/libraries/dumb/README b/libraries/dumb/README
new file mode 100644
index 0000000000..13b06f4789
--- /dev/null
+++ b/libraries/dumb/README
@@ -0,0 +1,4 @@
+DUMB is a module audio renderer library.
+
+It reads module files and outputs audio that can be dumped to the actual
+audio playback library.
diff --git a/libraries/dumb/dumb.SlackBuild b/libraries/dumb/dumb.SlackBuild
new file mode 100644
index 0000000000..f336e409f6
--- /dev/null
+++ b/libraries/dumb/dumb.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for dumb
+
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
+# 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=dumb
+VERSION=${VERSION:-2.0.3}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir build
+cd build
+cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DBUILD_ALLEGRO4:BOOL=ON \
+	-DCMAKE_BUILD_TYPE=Release ..
+make install DESTDIR=$PKG
+cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DBUILD_SHARED_LIBS:BOOL=OFF \
+	-DBUILD_ALLEGRO4:BOOL=ON \
+	-DCMAKE_BUILD_TYPE=Release ..
+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 *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/dumb/dumb.info b/libraries/dumb/dumb.info
new file mode 100644
index 0000000000..54eda094ce
--- /dev/null
+++ b/libraries/dumb/dumb.info
@@ -0,0 +1,10 @@
+PRGNAM="dumb"
+VERSION="2.0.3"
+HOMEPAGE="https://github.com/kode54/dumb"
+DOWNLOAD="https://github.com/kode54/dumb/archive/2.0.3/dumb-2.0.3.tar.gz"
+MD5SUM="367fe8a04a7d102ed57810c757694403"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="allegro4 argtable SDL2"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/libraries/dumb/slack-desc b/libraries/dumb/slack-desc
new file mode 100644
index 0000000000..a57d4b6839
--- /dev/null
+++ b/libraries/dumb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+dumb: dumb (Dynamic Universal Music Bibliotheque)
+dumb:
+dumb: DUMB is a module audio renderer library.
+dumb:
+dumb: It reads module files and outputs audio that can be dumped to the
+dumb: actual audio playback library.
+dumb:
+dumb:
+dumb:
+dumb:
+dumb:
diff --git a/libraries/fmt/fmt.SlackBuild b/libraries/fmt/fmt.SlackBuild
index 0ea76506b9..313f5a1f2c 100644
--- a/libraries/fmt/fmt.SlackBuild
+++ b/libraries/fmt/fmt.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fmt
-VERSION=${VERSION:-6.1.2}
+VERSION=${VERSION:-7.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,6 +76,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
     -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/libraries/fmt/fmt.info b/libraries/fmt/fmt.info
index a1431eba7b..e3036ba499 100644
--- a/libraries/fmt/fmt.info
+++ b/libraries/fmt/fmt.info
@@ -1,8 +1,8 @@
 PRGNAM="fmt"
-VERSION="6.1.2"
+VERSION="7.1.3"
 HOMEPAGE="https://fmt.dev/latest/index.html"
-DOWNLOAD="https://github.com/fmtlib/fmt/archive/6.1.2/fmt-6.1.2.tar.gz"
-MD5SUM="2914e3ac33595103d6b27c87364b034f"
+DOWNLOAD="https://github.com/fmtlib/fmt/archive/7.1.3/fmt-7.1.3.tar.gz"
+MD5SUM="2522ec65070c0bda0ca288677ded2831"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/gdl/gdl.SlackBuild b/libraries/gdl/gdl.SlackBuild
index 6ad5f2032c..4969e07df4 100644
--- a/libraries/gdl/gdl.SlackBuild
+++ b/libraries/gdl/gdl.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=gdl
 VERSION=${VERSION:-3.26.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ 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 {} \;
 
+# Don't create the __pycache__ directory.
+export PYTHONDONTWRITEBYTECODE=1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/gtkglarea/gtkglarea.info b/libraries/gtkglarea/gtkglarea.info
index 2b83fc0caa..f605e173d6 100644
--- a/libraries/gtkglarea/gtkglarea.info
+++ b/libraries/gtkglarea/gtkglarea.info
@@ -1,7 +1,7 @@
 PRGNAM="gtkglarea"
 VERSION="2.1.0"
-HOMEPAGE="https://github.com/GNOME/gtkglarea"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gtkglarea/2.1/gtkglarea-2.1.0.tar.xz"
+HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
+DOWNLOAD="https://download.gnome.org/sources/gtkglarea/2.1/gtkglarea-2.1.0.tar.xz"
 MD5SUM="60d4470107d4faa9fc916c9a0d05bb9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/gumbo-parser/README b/libraries/gumbo-parser/README
new file mode 100644
index 0000000000..db1f271bd5
--- /dev/null
+++ b/libraries/gumbo-parser/README
@@ -0,0 +1,5 @@
+Gumbo is an implementation of the HTML5 parsing algorithm implemented
+as a pure C99 library with no outside dependencies. It's designed
+to serve as a building block for other tools and libraries such
+as linters, validators, templating languages, and refactoring and
+analysis tools.
diff --git a/libraries/libgltf/libgltf.SlackBuild b/libraries/gumbo-parser/gumbo-parser.SlackBuild
index e3359ce345..2bf238d264 100644
--- a/libraries/libgltf/libgltf.SlackBuild
+++ b/libraries/gumbo-parser/gumbo-parser.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for libgltf
+# Slackware build script for gumbo-parser
 
-# Copyright 2015, 2017 Hunter Sezen California, USA
+# Copyright 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=libgltf
-VERSION=${VERSION:-0.1.0}
+PRGNAM=gumbo-parser
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,23 +69,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 {} \;
 
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
-  --disable-werror \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-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
+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 AUTHORS COPYING ChangeLog LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.md CONTRIBUTING.md COPYING DEBUGGING.md README.md THANKS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/gumbo-parser/gumbo-parser.info b/libraries/gumbo-parser/gumbo-parser.info
new file mode 100644
index 0000000000..2937052ec6
--- /dev/null
+++ b/libraries/gumbo-parser/gumbo-parser.info
@@ -0,0 +1,10 @@
+PRGNAM="gumbo-parser"
+VERSION="0.10.1"
+HOMEPAGE="https://github.com/google/gumbo-parser"
+DOWNLOAD="https://github.com/google/gumbo-parser/archive/v0.10.1/gumbo-parser-0.10.1.tar.gz"
+MD5SUM="c6f75c9eda65e897c242f8958a34aed0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/libraries/gumbo-parser/slack-desc b/libraries/gumbo-parser/slack-desc
new file mode 100644
index 0000000000..88c2f4059a
--- /dev/null
+++ b/libraries/gumbo-parser/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+gumbo-parser: gumbo-parser (An HTML5 parsing library in pure C99)
+gumbo-parser:
+gumbo-parser: Gumbo is an implementation of the HTML5 parsing algorithm implemented
+gumbo-parser: as a pure C99 library with no outside dependencies. It's designed to
+gumbo-parser: serve as a building block for other tools and libraries such as
+gumbo-parser: linters, validators, templating languages, and refactoring and
+gumbo-parser: analysis tools.
+gumbo-parser:
+gumbo-parser: Homepage: https://github.com/google/gumbo-parser
+gumbo-parser:
+gumbo-parser:
diff --git a/libraries/hoel/hoel.SlackBuild b/libraries/hoel/hoel.SlackBuild
index 2b1dd0706e..1175ca7bcf 100644
--- a/libraries/hoel/hoel.SlackBuild
+++ b/libraries/hoel/hoel.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hoel
-VERSION=${VERSION:-1.4.16}
+VERSION=${VERSION:-1.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/hoel/hoel.info b/libraries/hoel/hoel.info
index c59208a032..90fdbc3d7e 100644
--- a/libraries/hoel/hoel.info
+++ b/libraries/hoel/hoel.info
@@ -1,8 +1,8 @@
 PRGNAM="hoel"
-VERSION="1.4.16"
+VERSION="1.4.17"
 HOMEPAGE="https://github.com/babelouest/hoel"
-DOWNLOAD="https://github.com/babelouest/hoel/archive/v1.4.16/hoel-1.4.16.tar.gz"
-MD5SUM="ace1daa34692f7b97230edb4265422cf"
+DOWNLOAD="https://github.com/babelouest/hoel/archive/v1.4.17/hoel-1.4.17.tar.gz"
+MD5SUM="a62223aead2944fed9e734efde52af29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ulfius"
diff --git a/libraries/htslib/htslib.SlackBuild b/libraries/htslib/htslib.SlackBuild
index a41bca6523..aca959998c 100644
--- a/libraries/htslib/htslib.SlackBuild
+++ b/libraries/htslib/htslib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for htslib
 
-# Copyright 2018-2020 Rob van Nues # All rights reserved.
+# Copyright 2018-2021 Rob van Nues # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=htslib
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/htslib/htslib.info b/libraries/htslib/htslib.info
index 334085905e..6254e8b507 100644
--- a/libraries/htslib/htslib.info
+++ b/libraries/htslib/htslib.info
@@ -1,8 +1,8 @@
 PRGNAM="htslib"
-VERSION="1.11"
+VERSION="1.12"
 HOMEPAGE="http://www.htslib.org"
-DOWNLOAD="https://github.com/samtools/htslib/releases/download/1.11/htslib-1.11.tar.bz2"
-MD5SUM="c488c7a79283e5252c04cae335ee80e8"
+DOWNLOAD="https://github.com/samtools/htslib/releases/download/1.12/htslib-1.12.tar.bz2"
+MD5SUM="c55c73099e2c5d71b084c267a9f20258"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/iddawc/iddawc.SlackBuild b/libraries/iddawc/iddawc.SlackBuild
index af878a4e88..e5df2f49e7 100644
--- a/libraries/iddawc/iddawc.SlackBuild
+++ b/libraries/iddawc/iddawc.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=iddawc
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-0.9.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,16 +39,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 fi
 
@@ -81,6 +81,11 @@ 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
 
+mv $PKG/usr/share/man $PKG/usr
+
+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
 DOCS="LICENSE README.md"
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/iddawc/iddawc.info b/libraries/iddawc/iddawc.info
index 1f7f139e09..8e5e882da7 100644
--- a/libraries/iddawc/iddawc.info
+++ b/libraries/iddawc/iddawc.info
@@ -1,8 +1,8 @@
 PRGNAM="iddawc"
-VERSION="0.9.6"
+VERSION="0.9.9"
 HOMEPAGE="https://github.com/babelouest/iddawc"
-DOWNLOAD="https://github.com/babelouest/iddawc/archive/v0.9.6/iddawc-0.9.6.tar.gz"
-MD5SUM="29d32e4ec6d6b3510caaa2f2ac191ad0"
+DOWNLOAD="https://github.com/babelouest/iddawc/archive/v0.9.9/iddawc-0.9.9.tar.gz"
+MD5SUM="74e4c09dcaa21ccfae3ecc69525ad116"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rhonabwy"
diff --git a/libraries/imlib2/imlib2.SlackBuild b/libraries/imlib2/imlib2.SlackBuild
index ddef089a99..d59261821e 100644
--- a/libraries/imlib2/imlib2.SlackBuild
+++ b/libraries/imlib2/imlib2.SlackBuild
@@ -4,7 +4,7 @@
 # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
 # Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
 # Copyright 2011-2017 Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-# Copyright 2017-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -22,10 +22,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated to version 1.7.0 by Igor Alexandrov <igor.alexandrov@outlook.com>
-
 PRGNAM=imlib2
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -94,6 +92,9 @@ make install DESTDIR=$PKG
 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
 
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*/*/*.la
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/imlib2/imlib2.info b/libraries/imlib2/imlib2.info
index 33c9d9662c..68960a8fb1 100644
--- a/libraries/imlib2/imlib2.info
+++ b/libraries/imlib2/imlib2.info
@@ -1,8 +1,8 @@
 PRGNAM="imlib2"
-VERSION="1.7.0"
+VERSION="1.7.1"
 HOMEPAGE="https://www.enlightenment.org"
-DOWNLOAD="https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.7.0/imlib2-1.7.0.tar.bz2"
-MD5SUM="65a1fc5f6a50ffc54aa8f6758e725973"
+DOWNLOAD="https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.7.1/imlib2-1.7.1.tar.bz2"
+MD5SUM="98569de9b10bcb6fd5d13e4d331ddd81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/jbig2dec/jbig2dec.SlackBuild b/libraries/jbig2dec/jbig2dec.SlackBuild
index 9177851def..591eebdd99 100644
--- a/libraries/jbig2dec/jbig2dec.SlackBuild
+++ b/libraries/jbig2dec/jbig2dec.SlackBuild
@@ -10,6 +10,7 @@
 # licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
 # for details.
 
+# 20201103 bkw: update for v0.19
 # 20200314 bkw: update for v0.18
 # 20191208 bkw: update for v0.17
 # 20180904 bkw: update for v0.15
@@ -39,7 +40,7 @@
 # - Added 'how to edit' stuff to slack-desc
 
 PRGNAM=jbig2dec
-VERSION=${VERSION:-0.18}
+VERSION=${VERSION:-0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/jbig2dec/jbig2dec.info b/libraries/jbig2dec/jbig2dec.info
index 250828bf48..a044af7d89 100644
--- a/libraries/jbig2dec/jbig2dec.info
+++ b/libraries/jbig2dec/jbig2dec.info
@@ -1,8 +1,8 @@
 PRGNAM="jbig2dec"
-VERSION="0.18"
+VERSION="0.19"
 HOMEPAGE="https://github.com/ArtifexSoftware/jbig2dec"
-DOWNLOAD="https://github.com/ArtifexSoftware/jbig2dec/archive/0.18/jbig2dec-0.18.tar.gz"
-MD5SUM="0d4a371137e9bda205c42a8d885e3f50"
+DOWNLOAD="https://github.com/ArtifexSoftware/jbig2dec/archive/0.19/jbig2dec-0.19.tar.gz"
+MD5SUM="31cc1465c0acd5a5e08acb898d4f31f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/lapack/README b/libraries/lapack/README
index 6cbfe89752..25b52b9faa 100644
--- a/libraries/lapack/README
+++ b/libraries/lapack/README
@@ -2,6 +2,8 @@ LAPACK provides routines for solving systems of simultaneous linear
 equations, least-squares solutions of linear systems of equations,
 eigenvalue problems, and singular value problems.
 
+xblas is an optional dependency.
+
 To build a static library in addition to the shared library,
 pass STATIC=yes to the script.
 
diff --git a/libraries/lapack/lapack.SlackBuild b/libraries/lapack/lapack.SlackBuild
index 492a7c8673..6bd93dafd5 100644
--- a/libraries/lapack/lapack.SlackBuild
+++ b/libraries/lapack/lapack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LAPACK
 
-# Copyright 2014-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=lapack
 SRCNAM=lapack
-VERSION=${VERSION:-3.9.0}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,10 @@ chmod -R u+w,go-w,a+rX-st .
 # Allow building only the LAPACK component.
 patch -p1 < $CWD/patches/cmake-piecewise.diff
 
+if pkg-config --exists xblas; then
+  use_xblas='-DUSE_XBLAS=ON'
+fi
+
 # Avoid adding an RPATH entry to the shared lib.  It's unnecessary (except for
 # running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX).
 mkdir -p shared
@@ -82,6 +86,7 @@ cd shared
     -DUSE_OPTIMIZED_BLAS=ON \
     -DBUILD_LAPACK=ON \
     -DBUILD_DEPRECATED=ON \
+    $use_xblas \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_SKIP_RPATH=YES \
     ..
@@ -104,6 +109,7 @@ if [ "${STATIC:-no}" != "no" ]; then
       -DUSE_OPTIMIZED_BLAS=ON \
       -DBUILD_LAPACK=ON \
       -DBUILD_DEPRECATED=ON \
+      $use_xblas \
       ..
     make
     make install/strip DESTDIR=$PKG
@@ -119,7 +125,7 @@ fi
 # 5.  Turn off MAN_LINKS.  See below.
 sed -i \
   -e ':a;/\\$/N;s/\\\n//;ta' \
-  -e 's/^\(INPUT *=\).*/\1 SRC/' \
+  -e 's/^\(INPUT *=\).*/\1 SRC SRC\/DEPRECATED/' \
   -e 's/^\(RECURSIVE *=\).*/\1 NO/' \
   -e 's/^\(EXCLUDE *=\).*/\1/' \
   -e 's/^\(REPEAT_BRIEF *=\).*/\1 NO/' \
diff --git a/libraries/lapack/lapack.info b/libraries/lapack/lapack.info
index e7b7945dcb..8774fd2558 100644
--- a/libraries/lapack/lapack.info
+++ b/libraries/lapack/lapack.info
@@ -1,8 +1,8 @@
 PRGNAM="lapack"
-VERSION="3.9.0"
-HOMEPAGE="http://www.netlib.org/lapack/"
-DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz"
-MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2"
+VERSION="3.9.1"
+HOMEPAGE="https://www.netlib.org/lapack/"
+DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz"
+MD5SUM="47ab2d11652045145df37ddbe2a32d71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas"
diff --git a/libraries/lapack/patches/cmake-piecewise.diff b/libraries/lapack/patches/cmake-piecewise.diff
index b1bdfaec1e..378acc8769 100644
--- a/libraries/lapack/patches/cmake-piecewise.diff
+++ b/libraries/lapack/patches/cmake-piecewise.diff
@@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
  message(STATUS "CBLAS enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 -
  # Create a header file cblas.h for the routines called in my C programs
  include(FortranCInterface)
  ## Ensure that the fortran compiler and c compiler specified are compatible
-@@ -41,54 +39,8 @@
+@@ -45,54 +43,8 @@
    add_subdirectory(examples)
  endif()
  
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -# Export cblas targets from the
 -# install tree, if any.
 -set(_cblas_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT cblas-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  install(EXPORT ${CBLASLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -  # Choose one of the cblas targets to use as a guard for
@@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -# Export cblas targets from the build tree, if any.
 -set(_cblas_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake)
 -
 -  # Choose one of the cblas targets to use as a guard
 -  # for cblas-config.cmake to load targets from the build tree.
@@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
 -endif()
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY)
 -
 -
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY)
    install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc
    DESTINATION ${PKG_CONFIG_DIR}
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
--  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -  )
 -
--#install(EXPORT cblas-targets
--#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+-#install(EXPORT ${CBLASLIB}-targets
+-#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION}
 -#  COMPONENT Development
 -#  )
 diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
@@ -76,14 +76,14 @@ deleted file mode 100644
 -
 -# Load lapack targets from the build tree, including lapacke targets.
 -if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Report cblas header search locations from build tree.
 -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report cblas libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
 deleted file mode 100644
 --- a/CBLAS/cmake/cblas-config-install.cmake.in
@@ -96,19 +96,19 @@ deleted file mode 100644
 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET cblas)
--  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-if(NOT TARGET @CBLASLIB@)
+-  include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake)
 -endif()
 -
 -# Report lapacke header search locations.
 -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(CBLAS_LIBRARIES cblas)
+-set(CBLAS_LIBRARIES @CBLASLIB@)
 -
 -unset(_CBLAS_PREFIX)
 -unset(_CBLAS_SELF_DIR)
@@ -128,16 +128,16 @@ deleted file mode 100644
 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
 --- a/CBLAS/src/CMakeLists.txt
 +++ b/CBLAS/src/CMakeLists.txt
-@@ -120,9 +120,5 @@
-   VERSION ${LAPACK_VERSION}
-   SOVERSION ${LAPACK_MAJOR_VERSION}
-   )
--target_include_directories(cblas PUBLIC
+@@ -123,9 +123,5 @@
+ if(HAS_ATTRIBUTE_WEAK_SUPPORT)
+   target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT)
+ endif()
+-target_include_directories(${CBLASLIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 -  $<INSTALL_INTERFACE:include>
 -)
- target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
- lapack_install_library(cblas)
+ target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES})
+ lapack_install_library(${CBLASLIB})
 diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
 deleted file mode 100644
 --- a/CMAKE/lapack-config-build.cmake.in
@@ -146,7 +146,7 @@ deleted file mode 100644
 -# Load lapack targets from the build tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -168,7 +168,7 @@ deleted file mode 100644
 -# Load lapack targets from the install tree if necessary.
 -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
 -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
--  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-  include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake")
 -endif()
 -unset(_LAPACK_TARGET)
 -
@@ -184,11 +184,11 @@ deleted file mode 100644
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,11 +112,8 @@
+@@ -160,11 +160,8 @@
  
  
  # --------------------------------------------------
--set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
 -
  macro(lapack_install_library lib)
    install(TARGETS ${lib}
@@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
-@@ -155,21 +152,6 @@
+@@ -204,21 +201,6 @@
  include(CheckLAPACKCompilerFlags)
  CheckLAPACKCompilerFlags()
  
@@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Check second function
 -
 -include(CheckTimeFunction)
--set(TIME_FUNC NONE ${TIME_FUNC})
+-set(NONE ${TIME_FUNC})
 -CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  # deprecated LAPACK and LAPACKE routines
  option(BUILD_DEPRECATED "Build deprecated routines" OFF)
  message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}")
-@@ -193,8 +175,9 @@
+@@ -242,8 +224,9 @@
  endif()
  
  # --------------------------------------------------
@@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  
  # Check the usage of the user provided BLAS libraries
  if(BLAS_LIBRARIES)
-@@ -205,113 +188,108 @@
+@@ -254,113 +237,108 @@
    if(BLAS_FOUND)
      message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
    else()
@@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -  message(STATUS "Using supplied NETLIB BLAS implementation")
 -  add_subdirectory(BLAS)
 +elseif(BUILD_BLAS)
-   set(BLAS_LIBRARIES blas)
+   set(BLAS_LIBRARIES ${BLASLIB})
 -else()
 -  set(CMAKE_EXE_LINKER_FLAGS
 -    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
@@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +  find_package(LAPACK)
 +
 +elseif(BUILD_LAPACK)
-   set(LAPACK_LIBRARIES lapack)
+   set(LAPACK_LIBRARIES ${LAPACKLIB})
 +  set(LAPACK_FOUND TRUE)
 +
 +  set(NEED_BLAS TRUE)
 +
 +  # Check second function
 +  include(CheckTimeFunction)
-+  set(TIME_FUNC NONE ${TIME_FUNC})
++  set(NONE ${TIME_FUNC})
 +  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
 +  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
 +  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
@@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +    add_subdirectory(TESTING)
 +  endif()
 +
-+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 +    install(FILES
-+    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 +    DESTINATION ${PKG_CONFIG_DIR}
 +    COMPONENT Development
 +    )
@@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
    add_subdirectory(LAPACKE)
  endif()
  
-@@ -338,109 +316,12 @@
-   _display_cpp_implementation_msg("LAPACK")
+@@ -414,111 +392,16 @@
+   ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
  endif()
  
 -# --------------------------------------------------
@@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# --------------------------------------------------
 -
 -if(NOT BLAS_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
 -endif()
 -
 -if(NOT LATESTLAPACK_FOUND)
--  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
 -endif()
 -
 -if(BUILD_TESTING OR LAPACKE_WITH_TMG)
--  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
 -endif()
 -
 -# Export lapack targets, not including lapacke, from the
 -# install tree, if any.
 -set(_lapack_config_install_guard_target "")
 -if(ALL_TARGETS)
--  install(EXPORT lapack-targets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  install(EXPORT ${LAPACKLIB}-targets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -    COMPONENT Development
 -    )
 -
@@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -
 -# Include cblas in targets exported from the build tree.
 -if(CBLAS)
--  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB})
 -endif()
 -
 -# Include lapacke in targets exported from the build tree.
 -if(LAPACKE)
--  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-  set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB})
 +# Neither user specified or optimized BLAS libraries can be used
 +if(NEED_BLAS AND NOT BLAS_FOUND)
 +  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
@@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -# Export lapack and lapacke targets from the build tree, if any.
 -set(_lapack_config_build_guard_target "")
 -if(ALL_TARGETS)
--  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-  export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake)
 -
 -  # Choose one of the lapack or lapacke targets to use as a guard
 -  # for lapack-config.cmake to load targets from the build tree.
@@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 +if(NEED_LAPACK AND NOT LAPACK_FOUND)
 +  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
  endif()
--
+ 
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY)
 -
 -
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
 -  install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc
 -  DESTINATION ${PKG_CONFIG_DIR}
 -  COMPONENT Development
 -  )
 -
 -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY)
 -
 -include(CMakePackageConfigHelpers)
 -write_basic_package_version_file(
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
 -  VERSION ${LAPACK_VERSION}
 -  COMPATIBILITY SameMajorVersion
 -  )
 -
 -install(FILES
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
--  
-\ No newline at end of file
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
 diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
 --- a/LAPACKE/CMakeLists.txt
 +++ b/LAPACKE/CMakeLists.txt
@@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
  message(STATUS "LAPACKE enable")
  enable_language(C)
  
--set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 -
  # Create a header file lapacke_mangling.h for the routines called in my C programs
  include(FortranCInterface)
@@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
    VERSION ${LAPACK_VERSION}
    SOVERSION ${LAPACK_MAJOR_VERSION}
    )
--target_include_directories(lapacke PUBLIC
+-target_include_directories(${LAPACKELIB} PUBLIC
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 -  $<INSTALL_INTERFACE:include>
 -)
 -if(WIN32 AND NOT UNIX)
--  target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
+-  target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE)
 -  message(STATUS "Windows BUILD")
 -endif()
  
  if(LAPACKE_WITH_TMG)
-   target_link_libraries(lapacke PRIVATE tmglib)
+   target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB})
 @@ -111,22 +101,3 @@
    DESTINATION ${PKG_CONFIG_DIR}
    COMPONENT Development
    )
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY)
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY)
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY)
 -install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
--  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake
+-  ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 -
--install(EXPORT lapacke-targets
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-install(EXPORT ${LAPACKELIB}-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
 diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
@@ -570,8 +571,8 @@ deleted file mode 100644
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapack targets from the build tree, including lapacke targets.
--if(NOT TARGET lapacke)
--  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-if(NOT TARGET @LAPACKELIB@)
+-  include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake")
 -endif()
 -
 -# Hint for project building against lapack
@@ -581,7 +582,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include")
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
 deleted file mode 100644
 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in
@@ -594,12 +595,12 @@ deleted file mode 100644
 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
 -
 -# Load the LAPACK package with which we were built.
--set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@")
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@")
 -find_package(LAPACK NO_MODULE)
 -
 -# Load lapacke targets from the install tree.
--if(NOT TARGET lapacke)
--  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-if(NOT TARGET @LAPACKELIB@)
+-  include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake)
 -endif()
 -
 -# Hint for project building against lapack
@@ -609,7 +610,7 @@ deleted file mode 100644
 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
 -
 -# Report lapacke libraries.
--set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES})
+-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES})
 -
 -unset(_LAPACKE_PREFIX)
 -unset(_LAPACKE_SELF_DIR)
diff --git a/libraries/libaom/README b/libraries/libaom/README
deleted file mode 100644
index 5d92532e29..0000000000
--- a/libraries/libaom/README
+++ /dev/null
@@ -1,12 +0,0 @@
-AOMedia Video 1 (AV1) is an Open Source video codec designed for
-video transmission over the Internet. AV1 is planned to surpass
-VP9 and also to eventually be a competitor with HEVC/H.265.
-
-This libaom SlackBuild builds two 'reference' applications:
-
-  1. aomenc: an AV1 encoder
-  2. aomdec: an AV1 decoder
-
-Libraries are available for those who wish to build an AV1 encoder 
-(libaom-av1) with a recent version of FFmpeg by specifying
-'--enable-libaom' in the FFmpeg ./configure string.
diff --git a/libraries/libaom/libaom.SlackBuild b/libraries/libaom/libaom.SlackBuild
deleted file mode 100644
index 398cc3d52d..0000000000
--- a/libraries/libaom/libaom.SlackBuild
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------
-# Copyright (c) 2018-2020 Andrew Strong, Blue Mountains, Australia.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# ----------------------------------------------------------------------
-
-# Version setting is extracted from the git source using the following:
-#
-#  Revision:   git rev-list --count --all
-#  Short Hash: git rev-parse --short HEAD
-#
-# Borrowed from our Arch colleagues with thanks :).
-
-PRGNAM=libaom
-VERSION=${VERSION:-1.0.0.r29281.10cdc996a}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -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 {} \;
-
-cd build
-
-  # I don't build either the HTML or the Latex docs as IMHO at this early
-  # stage of aom development they are not terribly useful for non-developers.
-  # To enable these change '-DENABLE_DOCS:BOOL=OFF' to 'ON' and then uncomment
-  # the 'extra docs' section below to install them...
-
-  cmake \
-    -G "Unix Makefiles" \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/lib${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_INCLUDEDIR=/include \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_NASM=ON \
-    -DENABLE_DOCS=OFF \
-    -DBUILD_SHARED_LIBS=ON \
-    ../
-  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 AUTHORS CHANGELOG LICENSE PATENTS README.md $PKG/usr/doc/$PRGNAM-$VERSION
-
-# These are the 'extra docs', more details above...
-# mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex}
-# cp -a build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html
-# cp -a build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libaom/libaom.info b/libraries/libaom/libaom.info
deleted file mode 100644
index 12bfd5b4fb..0000000000
--- a/libraries/libaom/libaom.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libaom"
-VERSION="1.0.0.r29281.10cdc996a"
-HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="http://www.andrews-corner.org/downloads/libaom-1.0.0.r29281.10cdc996a.tar.gz"
-MD5SUM="2a2c8163e2b74a0eb838492f0cbb3077"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrew Strong"
-EMAIL="andrew.david.strong@gmail.com"
diff --git a/libraries/libbson/README b/libraries/libbson/README
index 3c3c7b7dec..151c173687 100644
--- a/libraries/libbson/README
+++ b/libraries/libbson/README
@@ -5,3 +5,6 @@ format of MongoDB. It also converts BSON to and from JSON, and provides
 a platform compatibility layer for the MongoDB C Driver.
 
 libbson conflicts with mongo-c-driver.
+
+To build the libbson documentation, install Sphinx and set
+DOCS=yes
diff --git a/libraries/libbson/libbson.SlackBuild b/libraries/libbson/libbson.SlackBuild
index b0f490a6cf..77fccbf0aa 100644
--- a/libraries/libbson/libbson.SlackBuild
+++ b/libraries/libbson/libbson.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=libbson
 SRCNAM=mongo-c-driver
-VERSION=${VERSION:-1.17.0}
+VERSION=${VERSION:-1.17.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,6 @@ rm -rf $TMP/$PKGNAM-$VERSION $PKG
 mkdir -p $TMP/$PKGNAM-$VERSION $PKG $OUTPUT
 cd $TMP/$PKGNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-ar p $CWD/$PRGNAM-doc_${VERSION}-*_all.deb data.tar.xz | tar xvJ
 
 chown -R root:root .
 find -L . \
@@ -70,13 +69,14 @@ 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 {} \;
 
-mkdir -p $PKG/usr/man $PKG/usr/doc/$PRGNAM-$VERSION
-mv usr/share/man/man3 $PKG/usr/man
-mv usr/share/doc/libbson-dev/html $PKG/usr/doc/$PRGNAM-$VERSION
-
-cd $SRCNAM-$VERSION
+PDOCS=""
+MkDOCS=""
+if [ "${DOCS:-no}" = "yes" ]; then
+  PDOCS="-DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON"
+  MkDOCS="bson-doc"
+fi
 
-cd build
+cd $SRCNAM-$VERSION/build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -84,8 +84,9 @@ cd build
     -DENABLE_TESTS=OFF \
     -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
     -DENABLE_MONGOC=OFF \
+    $PDOCS \
     -DCMAKE_BUILD_TYPE=Release ..
-  make
+  make $MkDOCS
   make install DESTDIR=$PKG
 cd ..
 
@@ -94,11 +95,22 @@ rm -rf $PKG/usr/share
 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
 
-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
+
+if [ "${DOCS:-no}" = "yes" ]; then
+  mkdir -p $PKG/usr/man
+  cd src/$PRGNAM/doc
+  rm -f {html,man}/CMakeLists.txt
+  mv man $PKG/usr/man/man3
+  mv html $PKG/usr/doc/$PRGNAM-$VERSION
+  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
+fi
 
-cd src/$PRGNAM
-cp -a NEWS THIRD_PARTY_NOTICES examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NEWS THIRD_PARTY_NOTICES README.rst CONTRIBUTING.md \
+  src/libbson/examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libbson/libbson.info b/libraries/libbson/libbson.info
index 42522312d3..91ce2421d6 100644
--- a/libraries/libbson/libbson.info
+++ b/libraries/libbson/libbson.info
@@ -1,10 +1,8 @@
 PRGNAM="libbson"
-VERSION="1.17.0"
+VERSION="1.17.3"
 HOMEPAGE="https://mongoc.org/libbson/current/index.html"
-DOWNLOAD="https://github.com/mongodb/mongo-c-driver/releases/download/1.17.0/mongo-c-driver-1.17.0.tar.gz \
-          https://deb.debian.org/debian/pool/main/m/mongo-c-driver/libbson-doc_1.17.0-1_all.deb"
-MD5SUM="2201cea8f31c6e7a4215e736dd74627a \
-        49820d0101c3734a155234774b56392d"
+DOWNLOAD="https://github.com/mongodb/mongo-c-driver/releases/download/1.17.3/mongo-c-driver-1.17.3.tar.gz"
+MD5SUM="9babfd9883e7c02bd0d7624ea286ee82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libbson/slack-desc b/libraries/libbson/slack-desc
index 823e133486..291f5fe177 100644
--- a/libraries/libbson/slack-desc
+++ b/libraries/libbson/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 libbson: libbson (a cross platform BSON Library for C)
 libbson:
-libbson:
 libbson: libbson builds, parses, and iterates BSON documents, the native data
 libbson: format of MongoDB. It also converts BSON to and from JSON, and
 libbson: provides a platform compatibility layer for the MongoDB C Driver.
 libbson:
-libbson:
 libbson: Homepage: https://mongoc.org/libbson/current/index.html
 libbson:
 libbson:
+libbson:
+libbson:
diff --git a/libraries/libbtbb/libbtbb.SlackBuild b/libraries/libbtbb/libbtbb.SlackBuild
index 4107250286..3e72cf2228 100644
--- a/libraries/libbtbb/libbtbb.SlackBuild
+++ b/libraries/libbtbb/libbtbb.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libbtbb
-VERSION=${VERSION:-2018_12_R1}
+VERSION=${VERSION:-2020.12.R1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-${VERSION//_/-}
+cd $PRGNAM-${VERSION//./-}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/libbtbb/libbtbb.info b/libraries/libbtbb/libbtbb.info
index 7cde2947ef..9df541a78d 100644
--- a/libraries/libbtbb/libbtbb.info
+++ b/libraries/libbtbb/libbtbb.info
@@ -1,8 +1,8 @@
 PRGNAM="libbtbb"
-VERSION="2018_12_R1"
+VERSION="2020.12.R1"
 HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
-DOWNLOAD="https://github.com/greatscottgadgets/libbtbb/archive/2018-12-R1/libbtbb-2018_12_R1.tar.gz"
-MD5SUM="cfb0dd9d0af7e19d4526758d3bb203e2"
+DOWNLOAD="https://github.com/greatscottgadgets/libbtbb/archive/2020-12-R1/libbtbb-2020.12.R1.tar.gz"
+MD5SUM="d1c01829b1f32926065e72095641a6be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libcbor/libcbor.SlackBuild b/libraries/libcbor/libcbor.SlackBuild
index 3a8f758712..1d45eaebd3 100644
--- a/libraries/libcbor/libcbor.SlackBuild
+++ b/libraries/libcbor/libcbor.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libcbor
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libcbor/libcbor.info b/libraries/libcbor/libcbor.info
index 6cdf77b977..cfdb88deb7 100644
--- a/libraries/libcbor/libcbor.info
+++ b/libraries/libcbor/libcbor.info
@@ -1,8 +1,8 @@
 PRGNAM="libcbor"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="https://github.com/PJK/libcbor"
-DOWNLOAD="https://github.com/PJK/libcbor/archive/v0.7.0/libcbor-0.7.0.tar.gz"
-MD5SUM="a16f02e6855c3ed92982a6ff67129f52"
+DOWNLOAD="https://github.com/PJK/libcbor/archive/v0.8.0/libcbor-0.8.0.tar.gz"
+MD5SUM="28348bcbc40c5f0d9760099f87c547a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libcdr/libcdr.SlackBuild b/libraries/libcdr/libcdr.SlackBuild
index 0c73931890..492bb123e9 100644
--- a/libraries/libcdr/libcdr.SlackBuild
+++ b/libraries/libcdr/libcdr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libcdr
 
-# Copyright 2015-2017, 2019 Hunter Sezen California, USA
+# Copyright 2015-2017, 2019-2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libcdr
-VERSION=${VERSION:-0.1.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.1.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -80,6 +80,12 @@ else
   cppunit='--disable-tests'
 fi
 
+# Fix build with icu4c-68.1
+# https://unicode-org.atlassian.net/browse/ICU-21267
+sed -i 's/TRUE/true/' src/lib/libcdr_utils.cpp
+
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libcdr/libcdr.info b/libraries/libcdr/libcdr.info
index 957132b8c1..f777365553 100644
--- a/libraries/libcdr/libcdr.info
+++ b/libraries/libcdr/libcdr.info
@@ -1,8 +1,8 @@
 PRGNAM="libcdr"
-VERSION="0.1.5"
+VERSION="0.1.6"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-DOWNLOAD="http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.5.tar.xz"
-MD5SUM="3040295f7a027c5bcdffbdb5bbdfd00a"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.6.tar.xz"
+MD5SUM="5543719c505002e9da0535c7e4cf2321"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libcpuid/README b/libraries/libcpuid/README
index 80e031c94c..6184ae2206 100644
--- a/libraries/libcpuid/README
+++ b/libraries/libcpuid/README
@@ -1,13 +1,13 @@
 libcpuid (library for x86 CPU detection)
 
-libcpuid is a small C library for x86 CPU detection and feature extraction. 
-Using it, you can:
+libcpuid is a small C library for x86 CPU detection and feature
+extraction.  Using it, you can:
 
 * get the processor vendor, model, brand string, code name
 * get information about CPU features such as: number of cores or logical
   CPUs, cache sizes, CPU clock
-* check if the processor implements a specific instruction set such as SSE2
-  or 3DNow!
+* check if the processor implements a specific instruction set such as
+  SSE2 or 3DNow!
 * execute the CPUID and RDTSC instructions (portably!)
 * and have this all in your commercial application, without getting into
   trouble.
diff --git a/libraries/libcpuid/libcpuid.SlackBuild b/libraries/libcpuid/libcpuid.SlackBuild
index 8159fafad1..87e84b1623 100644
--- a/libraries/libcpuid/libcpuid.SlackBuild
+++ b/libraries/libcpuid/libcpuid.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libcpuid
-VERSION=${VERSION:-0.5.0}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libcpuid/libcpuid.info b/libraries/libcpuid/libcpuid.info
index 5e82d8e373..7863b7c7e9 100644
--- a/libraries/libcpuid/libcpuid.info
+++ b/libraries/libcpuid/libcpuid.info
@@ -1,8 +1,8 @@
 PRGNAM="libcpuid"
-VERSION="0.5.0"
+VERSION="0.5.1"
 HOMEPAGE="http://libcpuid.sourceforge.net"
-DOWNLOAD="https://github.com/anrieff/libcpuid/archive/v0.5.0/libcpuid-0.5.0.tar.gz"
-MD5SUM="7a52f935e9025421eec134f770f6c9e8"
+DOWNLOAD="https://github.com/anrieff/libcpuid/archive/v0.5.1/libcpuid-0.5.1.tar.gz"
+MD5SUM="1ca29f56482c4f4192875f5efac179a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libde265/libde265.SlackBuild b/libraries/libde265/libde265.SlackBuild
index a1937175ed..6f19eea06b 100644
--- a/libraries/libde265/libde265.SlackBuild
+++ b/libraries/libde265/libde265.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libde265
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libde265/libde265.info b/libraries/libde265/libde265.info
index e68cf75a20..dea33b2de1 100644
--- a/libraries/libde265/libde265.info
+++ b/libraries/libde265/libde265.info
@@ -1,8 +1,8 @@
 PRGNAM="libde265"
-VERSION="1.0.7"
+VERSION="1.0.8"
 HOMEPAGE="https://github.com/strukturag/libde265"
-DOWNLOAD="https://github.com/strukturag/libde265/releases/download/v1.0.7/libde265-1.0.7.tar.gz"
-MD5SUM="5e73acf5142667969456d7968305b8a6"
+DOWNLOAD="https://github.com/strukturag/libde265/releases/download/v1.0.8/libde265-1.0.8.tar.gz"
+MD5SUM="e5a8c91c533ae5926e5118087f78930f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libdispatch/README b/libraries/libdispatch/README
new file mode 100644
index 0000000000..200d007986
--- /dev/null
+++ b/libraries/libdispatch/README
@@ -0,0 +1,2 @@
+Grand Central Dispatch (GCD or libdispatch) provides comprehensive
+support for concurrent code execution on multicore hardware.
diff --git a/libraries/libdispatch/cmake.patch b/libraries/libdispatch/cmake.patch
new file mode 100644
index 0000000000..e14b03898a
--- /dev/null
+++ b/libraries/libdispatch/cmake.patch
@@ -0,0 +1,32 @@
+--- CMakeLists.txt.orig	2020-11-03 14:54:48.786455348 -0800
++++ CMakeLists.txt	2020-11-03 15:00:16.067445503 -0800
+@@ -197,7 +197,7 @@
+ check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
+ check_symbol_exists(program_invocation_name "errno.h" HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
+ if (HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
+-  add_compile_definitions($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:_GNU_SOURCE=1>)
++  add_definitions(-D_GNU_SOURCE=1)
+ endif()
+ check_symbol_exists(__printflike "bsd/sys/cdefs.h" HAVE_PRINTFLIKE)
+ 
+@@ -217,9 +217,9 @@
+ endif()
+ 
+ if(dtrace_EXECUTABLE)
+-  add_compile_definitions($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:DISPATCH_USE_DTRACE=1>)
++  add_definitions(-DDISPATCH_USE_DTRACE=1)
+ else()
+-  add_compile_definitions($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:DISPATCH_USE_DTRACE=0>)
++  add_definitions(-DDISPATCH_USE_DTRACE=0)
+ endif()
+ 
+ find_program(leaks_EXECUTABLE leaks)
+@@ -252,7 +252,7 @@
+ 
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/config.h.in"
+                "${PROJECT_BINARY_DIR}/config/config_ac.h")
+-add_compile_definitions($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:HAVE_CONFIG_H>)
++add_definitions(-DHAVE_CONFIG_H)
+ 
+ 
+ if(ENABLE_SWIFT)
diff --git a/libraries/libdispatch/libdispatch.SlackBuild b/libraries/libdispatch/libdispatch.SlackBuild
new file mode 100644
index 0000000000..6fd02fff42
--- /dev/null
+++ b/libraries/libdispatch/libdispatch.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for libdispatch
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=libdispatch
+VERSION=${VERSION:-5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf swift-corelibs-$PRGNAM-swift-$VERSION-RELEASE
+tar xvf $CWD/swift-corelibs-$PRGNAM-swift-$VERSION-RELEASE.tar.gz
+cd swift-corelibs-$PRGNAM-swift-$VERSION-RELEASE
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Disable -Werror.
+sed -i 's/-Werror//' src/CMakeLists.txt
+sed -i '/-Werror/d' cmake/modules/DispatchCompilerWarnings.cmake
+
+# Require an older cmake version.
+sed -i 's/3.15.1/3.5.2/' CMakeLists.txt
+
+# cmake 3.5.2 does not have the add_compile_definitions command
+patch -p0 < $CWD/cmake.patch
+
+# apple software really wants clang
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_COMPILER=clang \
+    -DCMAKE_CXX_COMPILER=clang++ \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=man \
+    -DCMAKE_SKIP_RPATH=TRUE \
+    -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
+
+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 CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libdispatch/libdispatch.info b/libraries/libdispatch/libdispatch.info
new file mode 100644
index 0000000000..093ad12ad4
--- /dev/null
+++ b/libraries/libdispatch/libdispatch.info
@@ -0,0 +1,10 @@
+PRGNAM="libdispatch"
+VERSION="5.3"
+HOMEPAGE="https://apple.github.io/swift-corelibs-libdispatch/"
+DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE/swift-corelibs-libdispatch-swift-5.3-RELEASE.tar.gz"
+MD5SUM="6ab94f19f3b29fe1970fd8471109f184"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/libraries/libdispatch/slack-desc b/libraries/libdispatch/slack-desc
new file mode 100644
index 0000000000..338d4380e2
--- /dev/null
+++ b/libraries/libdispatch/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+libdispatch: libdispatch (Grand Central Dispatch)
+libdispatch:
+libdispatch: Grand Central Dispatch (GCD or libdispatch) provides comprehensive
+libdispatch: support for concurrent code execution on multicore hardware.
+libdispatch:
+libdispatch: Homepage: https://apple.github.io/swift-corelibs-libdispatch/
+libdispatch:
+libdispatch:
+libdispatch:
+libdispatch:
+libdispatch:
diff --git a/libraries/libe-book/libe-book.SlackBuild b/libraries/libe-book/libe-book.SlackBuild
index 6204e52c82..b05faeb7e0 100644
--- a/libraries/libe-book/libe-book.SlackBuild
+++ b/libraries/libe-book/libe-book.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libe-book
 
-# Copyright 2015, 2017-2018 Hunter Sezen California, USA
+# Copyright 2015, 2017-2018, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=libe-book
 VERSION=${VERSION:-0.1.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -80,6 +80,13 @@ else
   cppunit='--disable-tests'
 fi
 
+# Fix build with icu4c-68.1
+# https://unicode-org.atlassian.net/browse/ICU-21267
+sed -i 's/TRUE/true/g' src/lib/EBOOKCharsetConverter.cpp
+
+autoreconf -fi
+
+CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -93,8 +100,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
+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 AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libetonyek/0001-add-missing-include-for-std-for_each.patch b/libraries/libetonyek/0001-add-missing-include-for-std-for_each.patch
new file mode 100644
index 0000000000..6a77e0677b
--- /dev/null
+++ b/libraries/libetonyek/0001-add-missing-include-for-std-for_each.patch
@@ -0,0 +1,32 @@
+From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001
+From: Roland Illig <roland.illig@gmx.de>
+Date: Tue, 19 May 2020 08:43:39 +0200
+Subject: [PATCH] add missing include for std::for_each
+
+On NetBSD 8.0 x86_64, gcc complains:
+ NUM3Parser.cpp: In member function 'virtual bool libetonyek::NUM3Parser::parseDocument()':
+ NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std'
+   std::for_each(sheetListRefs.begin(), sheetListRefs.end(), std::bind(&NUM3Parser::parseSheet, this, std::placeholders::_1));
+
+Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65
+Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450
+Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
+Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
+---
+ src/lib/NUM3Parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
+index 66fb195..c19b611 100644
+--- a/src/lib/NUM3Parser.cpp
++++ b/src/lib/NUM3Parser.cpp
+@@ -7,6 +7,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include <algorithm>
+ #include <functional>
+ 
+ #include "NUM3Parser.h"
+-- 
+2.26.2
diff --git a/libraries/libetonyek/libetonyek.SlackBuild b/libraries/libetonyek/libetonyek.SlackBuild
index 4eeb23a12d..9fbf5f5636 100644
--- a/libraries/libetonyek/libetonyek.SlackBuild
+++ b/libraries/libetonyek/libetonyek.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libetonyek
 
-# Copyright 2015-2019 Hunter Sezen California, USA
+# Copyright 2015-2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=libetonyek
 VERSION=${VERSION:-0.1.9}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -80,6 +80,10 @@ else
   cppunit='--disable-tests'
 fi
 
+# add missing include for std::for_each
+# https://gerrit.libreoffice.org/c/libetonyek/+/94450
+patch -p1 < $CWD/0001-add-missing-include-for-std-for_each.patch
+
 autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/libraries/libewf/libewf.SlackBuild b/libraries/libewf/libewf.SlackBuild
index 866e5fc1f7..9f34608294 100644
--- a/libraries/libewf/libewf.SlackBuild
+++ b/libraries/libewf/libewf.SlackBuild
@@ -22,10 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated v20140806, March 2019
+# Updated v20140811, December 2020. Barry J. Grundy (bgrundy<at>linuxleo.com)
 
 PRGNAM=libewf
-VERSION=${VERSION:-20140806}
+VERSION=${VERSION:-20140811}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,7 +90,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 -ar ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README* documents/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL README* documents/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libewf/libewf.info b/libraries/libewf/libewf.info
index c0c738c78c..352e28778e 100644
--- a/libraries/libewf/libewf.info
+++ b/libraries/libewf/libewf.info
@@ -1,8 +1,8 @@
 PRGNAM="libewf"
-VERSION="20140806"
+VERSION="20140811"
 HOMEPAGE="https://github.com/libyal/libewf/"
-DOWNLOAD="https://github.com/libyal/libewf-legacy/releases/download/20140806/libewf-20140806.tar.gz"
-MD5SUM="e5e09e368c3891340d69c955a3d6c9ec"
+DOWNLOAD="https://github.com/libyal/libewf-legacy/releases/download/20140811/libewf-20140811.tar.gz"
+MD5SUM="dd5f3369a1705178cb9c2a357fabf17b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libfaketime/libfaketime.SlackBuild b/libraries/libfaketime/libfaketime.SlackBuild
index d6aba11ab7..4787325ef6 100644
--- a/libraries/libfaketime/libfaketime.SlackBuild
+++ b/libraries/libfaketime/libfaketime.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libfaketime
 
-# Copyright 2016-2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2016-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libfaketime
-VERSION=${VERSION:-0.9.7}
+VERSION=${VERSION:-0.9.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libfaketime/libfaketime.info b/libraries/libfaketime/libfaketime.info
index 52144d4a38..6b7bed9c56 100644
--- a/libraries/libfaketime/libfaketime.info
+++ b/libraries/libfaketime/libfaketime.info
@@ -1,8 +1,8 @@
 PRGNAM="libfaketime"
-VERSION="0.9.7"
+VERSION="0.9.9"
 HOMEPAGE="https://github.com/wolfcw/libfaketime"
-DOWNLOAD="https://github.com/wolfcw/libfaketime/archive/v0.9.7/libfaketime-0.9.7.tar.gz"
-MD5SUM="8617e2c6caf0977b3ce9a271f867302c"
+DOWNLOAD="https://github.com/wolfcw/libfaketime/archive/v0.9.9/libfaketime-0.9.9.tar.gz"
+MD5SUM="1f784c9c0ec7807b9d1107d1730dbb41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libfastjson/libfastjson.SlackBuild b/libraries/libfastjson/libfastjson.SlackBuild
index 995fc2cbd4..72c550d181 100644
--- a/libraries/libfastjson/libfastjson.SlackBuild
+++ b/libraries/libfastjson/libfastjson.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libfastjson
 
-# Copyright (c) 2017, Christophe Trussardi, Paris, France
+# Copyright (c) 2021, Christophe Trussardi, Paris, France
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libfastjson
-VERSION=${VERSION:-0.99.8}
+VERSION=${VERSION:-0.99.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libfastjson/libfastjson.info b/libraries/libfastjson/libfastjson.info
index 24f5030e51..bdd97440de 100644
--- a/libraries/libfastjson/libfastjson.info
+++ b/libraries/libfastjson/libfastjson.info
@@ -1,8 +1,8 @@
 PRGNAM="libfastjson"
-VERSION="0.99.8"
+VERSION="0.99.9"
 HOMEPAGE="https://www.rsyslog.com/"
-DOWNLOAD="http://download.rsyslog.com/libfastjson/libfastjson-0.99.8.tar.gz"
-MD5SUM="fe7b4eae1bf40499f6f92b51d7e5899e"
+DOWNLOAD="http://download.rsyslog.com/libfastjson/libfastjson-0.99.9.tar.gz"
+MD5SUM="b4668f067145d4eb2a44433d5256f277"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libfm-extra/libfm-extra.SlackBuild b/libraries/libfm-extra/libfm-extra.SlackBuild
index 4ef42b2ceb..b651c1e04a 100644
--- a/libraries/libfm-extra/libfm-extra.SlackBuild
+++ b/libraries/libfm-extra/libfm-extra.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libfm-extra
 
-# Copyright 2014-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2014-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=libfm-extra
 SRCNAM=libfm
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libfm-extra/libfm-extra.info b/libraries/libfm-extra/libfm-extra.info
index 1e765af005..1ca4ae995d 100644
--- a/libraries/libfm-extra/libfm-extra.info
+++ b/libraries/libfm-extra/libfm-extra.info
@@ -1,8 +1,8 @@
 PRGNAM="libfm-extra"
-VERSION="1.3.1"
+VERSION="1.3.2"
 HOMEPAGE="https://wiki.lxde.org/en/Libfm"
-DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.1.tar.xz"
-MD5SUM="c15ecd2c9317e2c385cd3f046d0b61ba"
+DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz"
+MD5SUM="c87a0ff41ae77825079b2f785ec0741e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild
index 1555253ffb..fcc8e93ea7 100644
--- a/libraries/libfm/libfm.SlackBuild
+++ b/libraries/libfm/libfm.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libfm
 
 # Copyright 2010 Chris Abela <chris.abela@maltats.com>
-# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libfm
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info
index dd5fd90d6b..33d95cb239 100644
--- a/libraries/libfm/libfm.info
+++ b/libraries/libfm/libfm.info
@@ -1,8 +1,8 @@
 PRGNAM="libfm"
-VERSION="1.3.1"
+VERSION="1.3.2"
 HOMEPAGE="https://wiki.lxde.org/en/Libfm"
-DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.1.tar.xz"
-MD5SUM="c15ecd2c9317e2c385cd3f046d0b61ba"
+DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz"
+MD5SUM="c87a0ff41ae77825079b2f785ec0741e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lxmenu-data menu-cache"
diff --git a/libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch b/libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
new file mode 100644
index 0000000000..5d9c6b2da9
--- /dev/null
+++ b/libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
@@ -0,0 +1,28 @@
+From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 01:46:12 +0200
+Subject: [PATCH] Add missing semicolon to fix build with icu 65.1
+
+Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088
+Reviewed-on: https://gerrit.libreoffice.org/80224
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+Tested-by: Miklos Vajna <vmiklos@collabora.com>
+---
+ src/lib/libfreehand_utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp
+index 439c457..32f23e0 100644
+--- a/src/lib/libfreehand_utils.cpp
++++ b/src/lib/libfreehand_utils.cpp
+@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString &text, std::vector<unsigne
+   while (j < length)
+   {
+     UChar32 c;
+-    U16_NEXT(s, j, length, c)
++    U16_NEXT(s, j, length, c);
+     unsigned char outbuf[U8_MAX_LENGTH+1];
+     int i = 0;
+     U8_APPEND_UNSAFE(&outbuf[0], i, c);
+-- 
+2.23.0
diff --git a/libraries/libfreehand/libfreehand.SlackBuild b/libraries/libfreehand/libfreehand.SlackBuild
index 59c1ad8258..a339698735 100644
--- a/libraries/libfreehand/libfreehand.SlackBuild
+++ b/libraries/libfreehand/libfreehand.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libfreehand
 
-# Copyright 2015, 2017 Hunter Sezen California, USA
+# Copyright 2015, 2017, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=libfreehand
 VERSION=${VERSION:-0.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -39,6 +39,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -79,6 +80,12 @@ else
   cppunit='--disable-tests'
 fi
 
+# Add missing semicolon to fix build with icu 65.1
+# https://gerrit.libreoffice.org/c/libfreehand/+/80224/
+patch -p1 < $CWD/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
+
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -93,8 +100,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
+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 AUTHORS COPYING ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libgltf/README b/libraries/libgltf/README
deleted file mode 100644
index c81fbac675..0000000000
--- a/libraries/libgltf/README
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBGLTF is a C++ library for rendering OpenGL models stored in glTF
-format.
-
-The glTF, the GL Transmission Format, is the runtime asset format for
-the GL APIs: WebGL, OpenGL ES, and OpenGL. glTF bridges the gap between
-formats used by modeling tools and the GL APIs.
-
-LIBGLTF provides methods to load the OpenGL scene from glTF format and
-render it into an existing OpenGL context. LIBGLTF also allows to change
-the camera position so the scene can be displayed from different points
-of view.
diff --git a/libraries/libgltf/libgltf.info b/libraries/libgltf/libgltf.info
deleted file mode 100644
index 1ecc6d5a65..0000000000
--- a/libraries/libgltf/libgltf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libgltf"
-VERSION="0.1.0"
-HOMEPAGE="https://wiki.documentfoundation.org/Development/libgltf"
-DOWNLOAD="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"
-MD5SUM="63ae962d0c436909979826fce0fca2fd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="glm"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/libraries/libgxps/libgxps.SlackBuild b/libraries/libgxps/libgxps.SlackBuild
index 2248a71757..fb799cb013 100644
--- a/libraries/libgxps/libgxps.SlackBuild
+++ b/libraries/libgxps/libgxps.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libgxps
 
-# Copyright 2019 Igor Alexandrov <igor.s.alexandrov@gmail.com>
+# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libgxps
-VERSION=${VERSION:-0.3.1}
+VERSION=${VERSION:-0.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,9 @@ cd build
     --localstatedir=/var \
     --libdir=/usr/lib${LIBDIRSUFFIX} \
     --mandir=/usr/man \
-    --infodir=/usr/info
+    --infodir=/usr/info \
+    -Denable-gtk-doc=true \
+    -Denable-man=true
   ninja
   DESTDIR=$PKG ninja install
 cd ..
@@ -92,7 +94,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; 2> /dev/null || true
 for i in $(find $PKG/usr/man -type l 2> /dev/null) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $(find -maxdepth 1 -type f -name '[^a-z]*' | grep -iv make) $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING MAINTAINERS NEWS README RELEASING TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libgxps/libgxps.info b/libraries/libgxps/libgxps.info
index 09e2a31144..0037a09130 100644
--- a/libraries/libgxps/libgxps.info
+++ b/libraries/libgxps/libgxps.info
@@ -1,10 +1,10 @@
 PRGNAM="libgxps"
-VERSION="0.3.1"
+VERSION="0.3.2"
 HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
-DOWNLOAD="https://download.gnome.org/sources/libgxps/0.3/libgxps-0.3.1.tar.xz"
-MD5SUM="ade83c264b3af2551a0dff9144478df8"
+DOWNLOAD="https://download.gnome.org/sources/libgxps/0.3/libgxps-0.3.2.tar.xz"
+MD5SUM="0527ac7c8c405445e96a5baa6019a0c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson"
 MAINTAINER="Igor Alexandrov"
-EMAIL="igor.s.alexandrov@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/libraries/libheif/libheif.SlackBuild b/libraries/libheif/libheif.SlackBuild
index 4b4018995e..dce2a3567b 100644
--- a/libraries/libheif/libheif.SlackBuild
+++ b/libraries/libheif/libheif.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libheif
-VERSION=${VERSION:-1.9.1}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libheif/libheif.info b/libraries/libheif/libheif.info
index d1cf772854..bef047e2ef 100644
--- a/libraries/libheif/libheif.info
+++ b/libraries/libheif/libheif.info
@@ -1,10 +1,10 @@
 PRGNAM="libheif"
-VERSION="1.9.1"
+VERSION="1.10.0"
 HOMEPAGE="https://github.com/strukturag/libheif"
-DOWNLOAD="https://github.com/strukturag/libheif/releases/download/v1.9.1/libheif-1.9.1.tar.gz"
-MD5SUM="3e7462f4c864209c438256dc019cbbd0"
+DOWNLOAD="https://github.com/strukturag/libheif/releases/download/v1.10.0/libheif-1.10.0.tar.gz"
+MD5SUM="a472c5a71234569cb0ac6b9b065a94e0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libde265 x265 libaom google-go-lang"
+REQUIRES="libde265 x265 aom google-go-lang"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/libraries/libinput/libinput.SlackBuild b/libraries/libinput/libinput.SlackBuild
index 2271439f34..be7c46c925 100644
--- a/libraries/libinput/libinput.SlackBuild
+++ b/libraries/libinput/libinput.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for libinput.
 #
-# Copyright 2016-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libinput
-VERSION=${VERSION:-1.16.2}
+VERSION=${VERSION:-1.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libinput/libinput.info b/libraries/libinput/libinput.info
index 81a3433c07..4a64c2eb96 100644
--- a/libraries/libinput/libinput.info
+++ b/libraries/libinput/libinput.info
@@ -1,8 +1,8 @@
 PRGNAM="libinput"
-VERSION="1.16.2"
+VERSION="1.17.1"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput"
-DOWNLOAD="https://www.freedesktop.org/software/libinput/libinput-1.16.2.tar.xz"
-MD5SUM="7c0aca7bba3e8559a869ed15b2173b2e"
+DOWNLOAD="https://www.freedesktop.org/software/libinput/libinput-1.17.1.tar.xz"
+MD5SUM="284f078a1788a8ae947a5606087a5d92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwacom meson graphviz python-evdev pyudev"
diff --git a/libraries/libixion/fmt.patch b/libraries/libixion/fmt.patch
deleted file mode 100644
index c97576bbf4..0000000000
--- a/libraries/libixion/fmt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0891528c3ebbf59b0634d01b57499183bac1974b Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 23 Sep 2019 12:09:37 -0700
-Subject: [PATCH] Fix build with gcc and an external fmt.
-
----
- src/libixion/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libixion/Makefile.am b/src/libixion/Makefile.am
-index 1121e5f0..bb310b3f 100644
---- a/src/libixion/Makefile.am
-+++ b/src/libixion/Makefile.am
-@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/src/include \
- 	-DIXION_BUILD \
-+	-DFMT_HEADER_ONLY \
- 	$(MDDS_CFLAGS) \
- 	$(SPDLOG_CFLAGS) \
- 	$(BOOST_CPPFLAGS)
--- 
-2.22.0
-
diff --git a/libraries/libixion/libixion.SlackBuild b/libraries/libixion/libixion.SlackBuild
index 3b9407fa1e..890e6269f6 100644
--- a/libraries/libixion/libixion.SlackBuild
+++ b/libraries/libixion/libixion.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libixion
 
-# Copyright 2015-2019 Hunter Sezen California, USA
+# Copyright 2015-2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libixion
-VERSION=${VERSION:-0.15.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.16.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,14 +70,9 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix build with clang.
-# https://gitlab.com/ixion/ixion/merge_requests/9
-# https://gitlab.com/ixion/ixion/commit/a8fe2c542b16ee30723ab3d7f3b643ee479e9723
-sed -i 's/nullptr_t/std::nullptr_t/' include/ixion/model_context.hpp
-
-# Fix build with gcc and an external fmt.
-# https://gitlab.com/ixion/ixion/merge_requests/10
-# https://gitlab.com/ixion/ixion/commit/0891528c3ebbf59b0634d01b57499183bac1974b
-patch -p1 < $CWD/fmt.patch
+# https://gitlab.com/ixion/ixion/-/merge_requests/31
+# https://gitlab.com/ixion/ixion/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
+sed -i 's/nullptr_t/std::nullptr_t/' src/libixion/model_context.cpp
 
 autoreconf -fi
 
diff --git a/libraries/libixion/libixion.info b/libraries/libixion/libixion.info
index ff67d2d7f5..457bdde4c0 100644
--- a/libraries/libixion/libixion.info
+++ b/libraries/libixion/libixion.info
@@ -1,10 +1,10 @@
 PRGNAM="libixion"
-VERSION="0.15.0"
+VERSION="0.16.1"
 HOMEPAGE="https://gitlab.com/ixion/ixion"
-DOWNLOAD="https://kohei.us/files/ixion/src/libixion-0.15.0.tar.xz"
-MD5SUM="68edc5952ee1b172d83e5926ecc0554a"
+DOWNLOAD="https://kohei.us/files/ixion/src/libixion-0.16.1.tar.xz"
+MD5SUM="6aef823752990d193e5cf80a87d0ef58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mdds python3 spdlog"
+REQUIRES="mdds python3"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/libraries/libjwt/libjwt.SlackBuild b/libraries/libjwt/libjwt.SlackBuild
index 62c031c507..fc74aede87 100644
--- a/libraries/libjwt/libjwt.SlackBuild
+++ b/libraries/libjwt/libjwt.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libjwt
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-1.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -93,7 +93,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-DOCS="COPYING* MPL-2.0 README*"
+DOCS="LICENSE README*"
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libjwt/libjwt.info b/libraries/libjwt/libjwt.info
index 2f9ce87440..00aaa0d0d4 100644
--- a/libraries/libjwt/libjwt.info
+++ b/libraries/libjwt/libjwt.info
@@ -1,8 +1,8 @@
 PRGNAM="libjwt"
-VERSION="1.12.0"
+VERSION="1.12.1"
 HOMEPAGE="https://github.com/benmcollins/libjwt"
-DOWNLOAD="https://github.com/benmcollins/libjwt/archive/v1.12.0/libjwt-1.12.0.tar.gz"
-MD5SUM="72a77907af61337d492c5621e3c41dab"
+DOWNLOAD="https://github.com/benmcollins/libjwt/archive/v1.12.1/libjwt-1.12.1.tar.gz"
+MD5SUM="53de58c5429eeff93ff5db3ea17e42a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jansson"
diff --git a/libraries/libmediainfo/libmediainfo.SlackBuild b/libraries/libmediainfo/libmediainfo.SlackBuild
index 251cd41933..901ef2efc7 100644
--- a/libraries/libmediainfo/libmediainfo.SlackBuild
+++ b/libraries/libmediainfo/libmediainfo.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libmediainfo
-VERSION=${VERSION:-20.08}
+VERSION=${VERSION:-20.09}
 SRCNAM=MediaInfoLib
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/libraries/libmediainfo/libmediainfo.info b/libraries/libmediainfo/libmediainfo.info
index 4b5b8badf6..4169ca961a 100644
--- a/libraries/libmediainfo/libmediainfo.info
+++ b/libraries/libmediainfo/libmediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="libmediainfo"
-VERSION="20.08"
+VERSION="20.09"
 HOMEPAGE="https://mediaarea.net/MediaInfo"
-DOWNLOAD="https://github.com/MediaArea/MediaInfoLib/archive/v20.08/MediaInfoLib-20.08.tar.gz"
-MD5SUM="ab82bac06e1adf540c40937cac1de046"
+DOWNLOAD="https://github.com/MediaArea/MediaInfoLib/archive/v20.09/MediaInfoLib-20.09.tar.gz"
+MD5SUM="eeddad91ac2cf201f9b46e9e1b861c0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libzen"
diff --git a/libraries/libmwaw/libmwaw.SlackBuild b/libraries/libmwaw/libmwaw.SlackBuild
index 8019a62064..fbf3de0ac1 100644
--- a/libraries/libmwaw/libmwaw.SlackBuild
+++ b/libraries/libmwaw/libmwaw.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libmwaw
 
-# Copyright 2015-2019 Hunter Sezen California, USA
+# Copyright 2015-2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libmwaw
-VERSION=${VERSION:-0.3.15}
+VERSION=${VERSION:-0.3.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +74,8 @@ case "${DOC:-0}" in
   *) doc='--with-docs' ;;
 esac
 
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libmwaw/libmwaw.info b/libraries/libmwaw/libmwaw.info
index 66d34fc3bd..19ff4c9b47 100644
--- a/libraries/libmwaw/libmwaw.info
+++ b/libraries/libmwaw/libmwaw.info
@@ -1,8 +1,8 @@
 PRGNAM="libmwaw"
-VERSION="0.3.15"
+VERSION="0.3.17"
 HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-DOWNLOAD="https://sourceforge.net/projects/libmwaw/files/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"
-MD5SUM="ffe1479ecde9afd8ce86b791183183fd"
+DOWNLOAD="https://downloads.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.17/libmwaw-0.3.17.tar.xz"
+MD5SUM="44f219a1f758ca651f7610f182414b81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libnbcompat/README b/libraries/libnbcompat/README
new file mode 100644
index 0000000000..ee2637ff95
--- /dev/null
+++ b/libraries/libnbcompat/README
@@ -0,0 +1,8 @@
+libnbcompat (a portable NetBSD compat library)
+
+libnbcompat is a portable NetBSD-compatibility library that supplies
+routines used by NetBSD bootstrap tools that are missing on other
+operating systems.
+
+By default, the static library is not included. If you need it, feel
+free to pass STATIC=yes to the build script.
diff --git a/libraries/libnbcompat/libnbcompat.SlackBuild b/libraries/libnbcompat/libnbcompat.SlackBuild
new file mode 100644
index 0000000000..9c1a7dd294
--- /dev/null
+++ b/libraries/libnbcompat/libnbcompat.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for libnbcompat
+
+# @(#)libnbcompat.SlackBuild	1.1 20/10/24 06:03:18
+
+# Copyright 2020 Pomfland
+# 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=libnbcompat
+VERSION=${VERSION:-1.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# since it insists regardless of what we tell configure
+if test ${STATIC:-no} = no; then
+  rm $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM.a
+fi
+
+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 \
+  CHANGES README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libnbcompat/libnbcompat.info b/libraries/libnbcompat/libnbcompat.info
new file mode 100644
index 0000000000..a73da7ae06
--- /dev/null
+++ b/libraries/libnbcompat/libnbcompat.info
@@ -0,0 +1,10 @@
+PRGNAM="libnbcompat"
+VERSION="1.0.1"
+HOMEPAGE="https://github.com/archiecobbs/libnbcompat"
+DOWNLOAD="https://github.com/archiecobbs/libnbcompat/archive/1.0.1/libnbcompat-1.0.1.tar.gz"
+MD5SUM="774e86650505714614fed02d4d2fae9d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pomfland"
+EMAIL="pomfland@tfwno.gf"
diff --git a/libraries/libnbcompat/slack-desc b/libraries/libnbcompat/slack-desc
new file mode 100644
index 0000000000..e1f7a652a4
--- /dev/null
+++ b/libraries/libnbcompat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+libnbcompat: libnbcompat (a portable NetBSD compat library)
+libnbcompat:
+libnbcompat: libnbcompat is a portable NetBSD-compatibility library that supplies
+libnbcompat: routines used by NetBSD bootstrap tools that are missing on other
+libnbcompat: operating systems.
+libnbcompat:
+libnbcompat: Homepage: https://github.com/archiecobbs/libnbcompat
+libnbcompat:
+libnbcompat:
+libnbcompat:
+libnbcompat:
diff --git a/libraries/libnsgif/README b/libraries/libnsgif/README
new file mode 100644
index 0000000000..7ea6e67f8f
--- /dev/null
+++ b/libraries/libnsgif/README
@@ -0,0 +1,5 @@
+libnsgif (gif image decoder library)
+
+The functions provided by this library allow for efficient progressive
+GIF decoding. This library was originally part of the netsurf browser,
+before it was distributed as a standalone library.
diff --git a/libraries/libnsgif/git2tarxz.sh b/libraries/libnsgif/git2tarxz.sh
new file mode 100644
index 0000000000..d02b54ba5f
--- /dev/null
+++ b/libraries/libnsgif/git2tarxz.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+### Containg libnsgif specific stuff, do not use as-is for a template!
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=libnsgif
+CLONE_URL=https://github.com/jcupitt/libnsgif
+
+# The version of libnsgif from the netsurf project, that this autotools
+# version was forked from. Have to keep track of this manually unless
+# upstream starts using git tags.
+MAINVER=0.2.1
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${MAINVER}+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/libraries/libnsgif/libnsgif.SlackBuild b/libraries/libnsgif/libnsgif.SlackBuild
new file mode 100644
index 0000000000..18d73819ad
--- /dev/null
+++ b/libraries/libnsgif/libnsgif.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for libnsgif
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=libnsgif
+VERSION=${VERSION:-0.2.1+20200706_0cb9bfc}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Somehow the closing } of the last function of this file got removed (?)
+echo "}" >> src/$PRGNAM.c
+
+autoreconf -ivf
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+sed -i '/^includedir/s,$,/libnsgif,' \
+       $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc
+
+# we don't need this:
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la
+
+# examples/ has a broken perl script that doesn't even use libnsgif and
+# a shell script that doesn't work at all. Don't bother.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* CHANGELOG COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libnsgif/libnsgif.info b/libraries/libnsgif/libnsgif.info
new file mode 100644
index 0000000000..dcf42b963f
--- /dev/null
+++ b/libraries/libnsgif/libnsgif.info
@@ -0,0 +1,10 @@
+PRGNAM="libnsgif"
+VERSION="0.2.1+20200706_0cb9bfc"
+HOMEPAGE="https://github.com/jcupitt/libnsgif"
+DOWNLOAD="https://slackware.uk/~urchlay/src/libnsgif-0.2.1+20200706_0cb9bfc.tar.xz"
+MD5SUM="d06dc7be67f4f9e2614e4e131975c41f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/libnsgif/slack-desc b/libraries/libnsgif/slack-desc
new file mode 100644
index 0000000000..3906632288
--- /dev/null
+++ b/libraries/libnsgif/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libnsgif: libnsgif (gif image decoder library)
+libnsgif:
+libnsgif: The functions provided by this library allow for efficient progressive
+libnsgif: GIF decoding. This library was originally part of the netsurf browser,
+libnsgif: before it was distributed as a standalone library.
+libnsgif:
+libnsgif:
+libnsgif:
+libnsgif:
+libnsgif:
+libnsgif:
diff --git a/libraries/libnumbertext/libnumbertext.SlackBuild b/libraries/libnumbertext/libnumbertext.SlackBuild
index 66ad3090b7..3e77de5c7f 100644
--- a/libraries/libnumbertext/libnumbertext.SlackBuild
+++ b/libraries/libnumbertext/libnumbertext.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libnumbertext
 
-# Copyright 2018 Hunter Sezen California, USA
+# Copyright 2018, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libnumbertext
-VERSION=${VERSION:-1.0.5}
+VERSION=${VERSION:-1.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ 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 {} \;
 
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,8 +83,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
+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 AUTHORS COPYING ChangeLog NEWS README.md THANKS \
diff --git a/libraries/libnumbertext/libnumbertext.info b/libraries/libnumbertext/libnumbertext.info
index f77ef1fd79..44db433d07 100644
--- a/libraries/libnumbertext/libnumbertext.info
+++ b/libraries/libnumbertext/libnumbertext.info
@@ -1,8 +1,8 @@
 PRGNAM="libnumbertext"
-VERSION="1.0.5"
+VERSION="1.0.6"
 HOMEPAGE="https://numbertext.github.io/"
-DOWNLOAD="https://github.com/Numbertext/libnumbertext/releases/download/1.0.5/libnumbertext-1.0.5.tar.xz"
-MD5SUM="845c7ca37a6738e301073ad19ddc2602"
+DOWNLOAD="https://github.com/Numbertext/libnumbertext/releases/download/1.0.6/libnumbertext-1.0.6.tar.xz"
+MD5SUM="d5e70dd61deb138add3fe3e8b102197c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/liborcus/liborcus.SlackBuild b/libraries/liborcus/liborcus.SlackBuild
index f28834f9ae..4f8de29d78 100644
--- a/libraries/liborcus/liborcus.SlackBuild
+++ b/libraries/liborcus/liborcus.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=liborcus
-VERSION=${VERSION:-0.15.3}
+VERSION=${VERSION:-0.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +72,7 @@ find -L . \
 autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++14" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/liborcus/liborcus.info b/libraries/liborcus/liborcus.info
index 761177a751..cf31ff6915 100644
--- a/libraries/liborcus/liborcus.info
+++ b/libraries/liborcus/liborcus.info
@@ -1,8 +1,8 @@
 PRGNAM="liborcus"
-VERSION="0.15.3"
+VERSION="0.16.1"
 HOMEPAGE="https://gitlab.com/orcus/orcus"
-DOWNLOAD="https://kohei.us/files/orcus/src/liborcus-0.15.3.tar.xz"
-MD5SUM="2f59532dfcf8ba644d3c6a17d2cac584"
+DOWNLOAD="https://kohei.us/files/orcus/src/liborcus-0.16.1.tar.xz"
+MD5SUM="be30a66fa4249e5fea90db2872c5be68"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libixion"
diff --git a/libraries/libpgf/libpgf.info b/libraries/libpgf/libpgf.info
index 600285a30d..6903a1f071 100644
--- a/libraries/libpgf/libpgf.info
+++ b/libraries/libpgf/libpgf.info
@@ -1,7 +1,7 @@
 PRGNAM="libpgf"
 VERSION="7.19.3"
 HOMEPAGE="http://www.libpgf.org"
-DOWNLOAD="https://sourceforge.net/projects/libpgf/files/libpgf/7.19.3-latest/libPGF-codec-and-console-src.zip"
+DOWNLOAD="https://sourceforge.net/projects/libpgf/files/libpgf/7.19.3/libPGF-codec-and-console-src.zip"
 MD5SUM="795e3c1816f107ca3d763a6f40424fd3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/libprelude/README b/libraries/libprelude/README
new file mode 100644
index 0000000000..8c948f080b
--- /dev/null
+++ b/libraries/libprelude/README
@@ -0,0 +1,25 @@
+Prelude Library (https://www.prelude-siem.org)
+
+Prelude Library Overview
+========================
+
+The Prelude Library is used to make sensor developers' life better by
+providing features used by every sensor:
+
+    - Manager(s) Connection management (with fallback in case all
+      configured Managers are down, and automatic reconnection).
+
+    - Interface to communicate with the Prelude Manager.
+
+    - Asynchronous Message interface (allowing sensor to emit message
+      without blocking, even if there is latency on the wire).
+
+    - Asynchronous timer interface.
+
+    - Generic configuration API, providing a generic abstraction for
+      command-line, configuration file option, and wide option support.
+
+    - Wide option managment allowing sensor-exported options to be
+      directly accessible from the Manager administrative console.
+
+    - Generic plugin API.
diff --git a/libraries/libprelude/doinst.sh b/libraries/libprelude/doinst.sh
new file mode 100644
index 0000000000..0ca862d4db
--- /dev/null
+++ b/libraries/libprelude/doinst.sh
@@ -0,0 +1,17 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/prelude/default/client.conf.new
+config etc/prelude/default/global.conf.new
+config etc/prelude/default/idmef-client.conf.new
+config etc/prelude/default/tls.conf.new
diff --git a/libraries/libprelude/libprelude.SlackBuild b/libraries/libprelude/libprelude.SlackBuild
new file mode 100644
index 0000000000..5c1735faa5
--- /dev/null
+++ b/libraries/libprelude/libprelude.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for libprelude
+
+# Copyright 2021 pyllyukko
+# 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=libprelude
+VERSION=${VERSION:-5.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --with-python3 \
+  --without-ruby \
+  --with-perl-installdirs=vendor \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+for i in client global idmef-client tls
+do
+  mv -v ${PKG}/etc/prelude/default/${i}.conf ${PKG}/etc/prelude/default/${i}.conf.new
+done
+
+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
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING AUTHORS LICENSE.README HACKING.README README NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/libraries/libprelude/libprelude.info b/libraries/libprelude/libprelude.info
new file mode 100644
index 0000000000..25f228e5cc
--- /dev/null
+++ b/libraries/libprelude/libprelude.info
@@ -0,0 +1,10 @@
+PRGNAM="libprelude"
+VERSION="5.2.0"
+HOMEPAGE="https://www.prelude-siem.org"
+DOWNLOAD="https://www.prelude-siem.org/attachments/download/1395/libprelude-5.2.0.tar.gz"
+MD5SUM="4db429af160450dc37c7ade001abf8c4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/libraries/libprelude/slack-desc b/libraries/libprelude/slack-desc
new file mode 100644
index 0000000000..34c2ee4640
--- /dev/null
+++ b/libraries/libprelude/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+libprelude: libprelude (Prelude SIEM/sensor library)
+libprelude:
+libprelude: The Prelude Library is used to make sensor developers' life better by
+libprelude: providing features used by every sensor:
+libprelude: Manager(s) connection management, interface to communicate with
+libprelude: the Prelude Manager, asynchronous message interface, asynchronous
+libprelude: timer interface, generic configuration API, wide option managment
+libprelude: and generic plugin API.
+libprelude:
+libprelude: Homepage: https://www.prelude-siem.org
+libprelude:
diff --git a/libraries/libpst/libpst.SlackBuild b/libraries/libpst/libpst.SlackBuild
index 70236337c1..dec009a043 100644
--- a/libraries/libpst/libpst.SlackBuild
+++ b/libraries/libpst/libpst.SlackBuild
@@ -23,6 +23,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201025 bkw: upgrade to 0.6.75
 # 20200224 bkw: upgrade to 0.6.74
 # 20180917 bkw: upgrade to 0.6.72
 # 20170122 bkw: upgrade to 0.6.69
@@ -36,7 +37,7 @@
 # - make install-strip instead of slow find stuff
 
 PRGNAM=libpst
-VERSION=${VERSION:-0.6.74}
+VERSION=${VERSION:-0.6.75}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libpst/libpst.info b/libraries/libpst/libpst.info
index 538af13ada..a7ff45227d 100644
--- a/libraries/libpst/libpst.info
+++ b/libraries/libpst/libpst.info
@@ -1,8 +1,8 @@
 PRGNAM="libpst"
-VERSION="0.6.74"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-DOWNLOAD="http://www.five-ten-sg.com/libpst/packages/libpst-0.6.74.tar.gz"
-MD5SUM="c0fb28dc7d6b9d2af1701027dc7154fe"
+VERSION="0.6.75"
+HOMEPAGE="https://www.five-ten-sg.com/libpst/"
+DOWNLOAD="https://www.five-ten-sg.com/libpst/packages/libpst-0.6.75.tar.gz"
+MD5SUM="485b59dfb59416fdff47f72122cd87e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/librelp/librelp.SlackBuild b/libraries/librelp/librelp.SlackBuild
index eab2d12adb..2a3b51270c 100644
--- a/libraries/librelp/librelp.SlackBuild
+++ b/libraries/librelp/librelp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for librelp
 
-# Copyright (c) 2019, Christophe Trussardi, Paris, France
+# Copyright (c) 2021, Christophe Trussardi, Paris, France
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=librelp
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/librelp/librelp.info b/libraries/librelp/librelp.info
index 6ecc499eda..465abc3bca 100644
--- a/libraries/librelp/librelp.info
+++ b/libraries/librelp/librelp.info
@@ -1,8 +1,8 @@
 PRGNAM="librelp"
-VERSION="1.5.0"
+VERSION="1.10.0"
 HOMEPAGE="https://www.rsyslog.com/librelp/"
-DOWNLOAD="http://download.rsyslog.com/librelp/librelp-1.5.0.tar.gz"
-MD5SUM="d036b580078d188754b0bcc66b636318"
+DOWNLOAD="http://download.rsyslog.com/librelp/librelp-1.10.0.tar.gz"
+MD5SUM="ceec1b17ddbb24bbc8d40cdaa056c471"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libseccomp/libseccomp.SlackBuild b/libraries/libseccomp/libseccomp.SlackBuild
index 238a39423d..79aa602265 100644
--- a/libraries/libseccomp/libseccomp.SlackBuild
+++ b/libraries/libseccomp/libseccomp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libseccomp
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libseccomp/libseccomp.info b/libraries/libseccomp/libseccomp.info
index a80b5d2157..5a949e37e5 100644
--- a/libraries/libseccomp/libseccomp.info
+++ b/libraries/libseccomp/libseccomp.info
@@ -1,8 +1,8 @@
 PRGNAM="libseccomp"
-VERSION="2.5.0"
+VERSION="2.5.1"
 HOMEPAGE="https://github.com/seccomp/libseccomp"
-DOWNLOAD="https://github.com/seccomp/libseccomp/archive/v2.5.0/libseccomp-2.5.0.tar.gz"
-MD5SUM="8650aee6efeb6c63184bee0b35488623"
+DOWNLOAD="https://github.com/seccomp/libseccomp/archive/v2.5.1/libseccomp-2.5.1.tar.gz"
+MD5SUM="150ccf132ecf26598430c5addf3a543e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libsidplay/README b/libraries/libsidplay/README
new file mode 100644
index 0000000000..90768f0038
--- /dev/null
+++ b/libraries/libsidplay/README
@@ -0,0 +1,4 @@
+libsidplay is a library for playing SID music files, and it emulates
+the sound chip for the vintage Commodore 64.
+
+This library is an optional dependency for gst-plugins-ugly
diff --git a/libraries/libsidplay/files/avoid_narrowing_conversion.patch b/libraries/libsidplay/files/avoid_narrowing_conversion.patch
new file mode 100644
index 0000000000..07480518c6
--- /dev/null
+++ b/libraries/libsidplay/files/avoid_narrowing_conversion.patch
@@ -0,0 +1,20 @@
+--- a/src/samples.cpp
++++ b/src/samples.cpp
+@@ -75,7 +75,7 @@ struct sampleChannel
+ sampleChannel ch4, ch5;
+ 
+ 
+-const sbyte galwayNoiseTab1[16] =
++const ubyte galwayNoiseTab1[16] =
+ {
+ 	0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
+ 	0x08,0x19,0x2a,0x3b,0x4c,0x5d,0x6e,0x7f
+@@ -84,7 +84,7 @@ const sbyte galwayNoiseTab1[16] =
+ ubyte galwayNoiseVolTab[16];
+ sbyte galwayNoiseSamTab[16];
+ 
+-const sbyte sampleConvertTab[16] =
++const ubyte sampleConvertTab[16] =
+ {
+ //  0x81,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff,
+ //  0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x7f
diff --git a/libraries/libsidplay/files/remove_sid_have_ios_bin_block.patch b/libraries/libsidplay/files/remove_sid_have_ios_bin_block.patch
new file mode 100644
index 0000000000..f1fcc41cca
--- /dev/null
+++ b/libraries/libsidplay/files/remove_sid_have_ios_bin_block.patch
@@ -0,0 +1,38 @@
+--- a/src/sidtune.cpp
++++ b/src/sidtune.cpp
+@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
+         return 0;
+     }
+     // Open binary input file stream at end of file.
+-#if defined(SID_HAVE_IOS_BIN)
+-	ifstream myIn( fileName, ios::in|ios::bin|ios::ate );
+-#else
+ 	ifstream myIn( fileName, ios::in|ios::binary|ios::ate );
+-#endif
+ 	// As a replacement for !is_open(), bad() and the NOT-operator
+     // don't seem to work on all systems.
+ #if defined(SID_DONT_HAVE_IS_OPEN)
+@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
+         }
+ 		// Open binary output file stream.
+         else
+-#if defined(SID_HAVE_IOS_BIN)
+-            fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+             fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ 		if ( !fMyOut )
+ 		{ 
+ 			info.statusString = text_cantCreateFile;
+@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
+         }
+ 		// Open binary output file stream.
+         else
+-#if defined(SID_HAVE_IOS_BIN)
+-            fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+             fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ 		if ( !fMyOut )
+ 		{
+ 			info.statusString = text_cantCreateFile;
diff --git a/libraries/libsidplay/libsidplay.SlackBuild b/libraries/libsidplay/libsidplay.SlackBuild
new file mode 100644
index 0000000000..a079e4b64a
--- /dev/null
+++ b/libraries/libsidplay/libsidplay.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for libsidplay
+
+# Copyright 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
+# 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=libsidplay
+VERSION=${VERSION:-1.36.59}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$(uname -m) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+  \( -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 {} \;
+
+patch -p1 -i $CWD/files/remove_sid_have_ios_bin_block.patch
+patch -p1 -i $CWD/files/avoid_narrowing_conversion.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+make
+make install DESTDIR=$PKG
+
+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
+
+# remove .la file
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libsidplay.la
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING DEVELOPER INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libsidplay/libsidplay.info b/libraries/libsidplay/libsidplay.info
new file mode 100644
index 0000000000..3411a2e185
--- /dev/null
+++ b/libraries/libsidplay/libsidplay.info
@@ -0,0 +1,10 @@
+PRGNAM="libsidplay"
+VERSION="1.36.59"
+HOMEPAGE="https://critical.ch/distfiles/"
+DOWNLOAD="https://critical.ch/distfiles/libsidplay-1.36.59.tgz"
+MD5SUM="37c51ba4bd57164b1b0bb7b43b9adece"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Igor Alexandrov"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/libraries/libsidplay/slack-desc b/libraries/libsidplay/slack-desc
new file mode 100644
index 0000000000..8af5e4a38e
--- /dev/null
+++ b/libraries/libsidplay/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+libsidplay: libsidplay (library for playing SID music files)
+libsidplay:
+libsidplay: Library that emulates the sound chip for the vintage Commodore 64.
+libsidplay:
+libsidplay:
+libsidplay:
+libsidplay:
+libsidplay:
+libsidplay:
+libsidplay:
+libsidplay:
diff --git a/libraries/libslack/libslack.SlackBuild b/libraries/libslack/libslack.SlackBuild
index 62943ee552..a7457691f1 100644
--- a/libraries/libslack/libslack.SlackBuild
+++ b/libraries/libslack/libslack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libslack
 
-# Copyright 2012-2017 Christoph Willing, Australia
+# Copyright 2012-2021 Christoph Willing, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libslack
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/$PRGNAM-$VERSION.html.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-html.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -100,9 +100,9 @@ chmod 0755 $PKG/usr/bin/$PRGNAM-config
 # Man pages overwrite stuff (thanks XGizzmo), so we ignore them
 # and install only the html documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README LICENSE \
+cp -a COPYING LICENSE README.md REFERENCES \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.html \
+cp -a $TMP/$PRGNAM-$VERSION-html/* \
   $PKG/usr/doc/$PRGNAM-$VERSION/html/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libslack/libslack.info b/libraries/libslack/libslack.info
index 1063bbef12..c67adca3fc 100644
--- a/libraries/libslack/libslack.info
+++ b/libraries/libslack/libslack.info
@@ -1,10 +1,10 @@
 PRGNAM="libslack"
-VERSION="0.6"
+VERSION="0.7.1"
 HOMEPAGE="http://libslack.org"
-DOWNLOAD="http://libslack.org/download/libslack-0.6.tar.gz \
-	http://libslack.org/download/libslack-0.6.html.tar.gz"
-MD5SUM="0e22e1d38865be2d94372027e5c42b58 \
-	8687e661c8e3cf591bc33231a9aff553"
+DOWNLOAD="http://libslack.org/download/libslack-0.7.1.tar.gz \
+	http://libslack.org/download/libslack-0.7.1-html.tar.gz"
+MD5SUM="23787e4177fde3b6c90487a375d9bc16 \
+	7210ee80a2f213bc0810e82283e9f6c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libstaroffice/libstaroffice.SlackBuild b/libraries/libstaroffice/libstaroffice.SlackBuild
index dbee61e0fe..435b36a38b 100644
--- a/libraries/libstaroffice/libstaroffice.SlackBuild
+++ b/libraries/libstaroffice/libstaroffice.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libstaroffice
 
-# Copyright 2017-2018 Hunter Sezen California, USA
+# Copyright 2017-2018, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libstaroffice
-VERSION=${VERSION:-0.0.6}
+VERSION=${VERSION:-0.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +74,8 @@ case "${DOC:-0}" in
   *) doc='--with-docs' ;;
 esac
 
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,11 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
+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 COPYING.* CREDITS ChangeLog HACKING INSTALL NEWS README \
+cp -a COPYING.* CREDITS ChangeLog HACKING NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libstaroffice/libstaroffice.info b/libraries/libstaroffice/libstaroffice.info
index 0581dc914e..cc925c9aea 100644
--- a/libraries/libstaroffice/libstaroffice.info
+++ b/libraries/libstaroffice/libstaroffice.info
@@ -1,8 +1,8 @@
 PRGNAM="libstaroffice"
-VERSION="0.0.6"
+VERSION="0.0.7"
 HOMEPAGE="https://github.com/fosnola/libstaroffice"
-DOWNLOAD="https://github.com/fosnola/libstaroffice/releases/download/0.0.6/libstaroffice-0.0.6.tar.xz"
-MD5SUM="3db5ccd618b67df20adc9555fe89560a"
+DOWNLOAD="https://github.com/fosnola/libstaroffice/releases/download/0.0.7/libstaroffice-0.0.7.tar.xz"
+MD5SUM="340ace6dd1c0f95691a7dc554383c404"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libtommath/libtommath.SlackBuild b/libraries/libtommath/libtommath.SlackBuild
index 7cc46c2193..b037fc74fb 100644
--- a/libraries/libtommath/libtommath.SlackBuild
+++ b/libraries/libtommath/libtommath.SlackBuild
@@ -61,8 +61,7 @@ make -f makefile.shared install \
   DESTDIR=$PKG
 
 chmod 0644 $PKG/usr/include/*
-rm $PKG/usr/lib$LIBDIRSUFFIX/*.a
-rm $PKG/usr/lib$LIBDIRSUFFIX/*.la
+rm -rf $PKG/usr/lib$LIBDIRSUFFIX/*.a $PKG/usr/lib$LIBDIRSUFFIX/*.la
 strip $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.*.*
 chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.*.*
 
diff --git a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
index f032bc0fba..637abb7229 100644
--- a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
+++ b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libtorrent-rasterbar
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.info b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.info
index 78b59bba76..df25c7c830 100644
--- a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.info
+++ b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.info
@@ -1,8 +1,8 @@
 PRGNAM="libtorrent-rasterbar"
-VERSION="1.2.10"
+VERSION="1.2.11"
 HOMEPAGE="https://libtorrent.org/"
-DOWNLOAD="https://github.com/arvidn/libtorrent/releases/download/libtorrent-1.2.10/libtorrent-rasterbar-1.2.10.tar.gz"
-MD5SUM="ebacb206c8a9f76ce5d8da182c4a829b"
+DOWNLOAD="https://github.com/arvidn/libtorrent/releases/download/v1.2.11/libtorrent-rasterbar-1.2.11.tar.gz"
+MD5SUM="12a329a8a51b793fd21c3a03bb70459e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/liburcu/liburcu.SlackBuild b/libraries/liburcu/liburcu.SlackBuild
index 33b1e41747..0836db2705 100644
--- a/libraries/liburcu/liburcu.SlackBuild
+++ b/libraries/liburcu/liburcu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for liburcu
 
-# Copyright 2013-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=liburcu
-VERSION=${VERSION:-0.12.1}
+VERSION=${VERSION:-0.12.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCNAM=userspace-rcu
diff --git a/libraries/liburcu/liburcu.info b/libraries/liburcu/liburcu.info
index 8f80faa877..fa100760df 100644
--- a/libraries/liburcu/liburcu.info
+++ b/libraries/liburcu/liburcu.info
@@ -1,8 +1,8 @@
 PRGNAM="liburcu"
-VERSION="0.12.1"
+VERSION="0.12.2"
 HOMEPAGE="http://liburcu.org/"
-DOWNLOAD="https://www.lttng.org/files/urcu/userspace-rcu-0.12.1.tar.bz2"
-MD5SUM="5e419d7b30d0d98bffe0014c704ae936"
+DOWNLOAD="https://www.lttng.org/files/urcu/userspace-rcu-0.12.2.tar.bz2"
+MD5SUM="d94347df78e3f1aa744745eb85787df5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libuv/libuv.SlackBuild b/libraries/libuv/libuv.SlackBuild
index 0e6b9b004d..4dfaa9883a 100644
--- a/libraries/libuv/libuv.SlackBuild
+++ b/libraries/libuv/libuv.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for libuv
 
-# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libuv
-VERSION=${VERSION:-1.39.0}
+VERSION=${VERSION:-1.41.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libuv/libuv.info b/libraries/libuv/libuv.info
index 79ae5df7b4..c4c5764a4d 100644
--- a/libraries/libuv/libuv.info
+++ b/libraries/libuv/libuv.info
@@ -1,8 +1,8 @@
 PRGNAM="libuv"
-VERSION="1.39.0"
+VERSION="1.41.0"
 HOMEPAGE="http://libuv.org/"
-DOWNLOAD="https://dist.libuv.org/dist/v1.39.0/libuv-v1.39.0.tar.gz"
-MD5SUM="66bf6355e35a36fbe32729f8edc22648"
+DOWNLOAD="https://dist.libuv.org/dist/v1.41.0/libuv-v1.41.0.tar.gz"
+MD5SUM="d990b0770dd2b15f7a8399580d55d32c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libversion/libversion.SlackBuild b/libraries/libversion/libversion.SlackBuild
index a1353ac193..9cbdccfbf4 100644
--- a/libraries/libversion/libversion.SlackBuild
+++ b/libraries/libversion/libversion.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libversion
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libversion
-VERSION=${VERSION:-2.9.1}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,7 @@ find -L . \
 
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -88,7 +89,7 @@ fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES.md COPYING README.md TODO.md \
+  CHANGES.md COPYING README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libversion/libversion.info b/libraries/libversion/libversion.info
index 60fbb16516..de91cb7bc0 100644
--- a/libraries/libversion/libversion.info
+++ b/libraries/libversion/libversion.info
@@ -1,10 +1,10 @@
 PRGNAM="libversion"
-VERSION="2.9.1"
+VERSION="3.0.1"
 HOMEPAGE="https://github.com/repology/libversion"
-DOWNLOAD="https://github.com/repology/libversion/archive/2.9.1/libversion-2.9.1.tar.gz"
-MD5SUM="8c23275bc0e57b7958a696d533266f8b"
+DOWNLOAD="https://github.com/repology/libversion/archive/3.0.1/libversion-3.0.1.tar.gz"
+MD5SUM="b519c52e6fe6a59138d9182aff437b1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="cmake-202x"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/libraries/libvterm/libvterm.SlackBuild b/libraries/libvterm/libvterm.SlackBuild
index 85010e3854..7cad8b3be2 100644
--- a/libraries/libvterm/libvterm.SlackBuild
+++ b/libraries/libvterm/libvterm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libvterm
 
-# Copyright 2015-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2015-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libvterm
-VERSION=${VERSION:-0.1.3}
+VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libvterm/libvterm.info b/libraries/libvterm/libvterm.info
index 6699c5fa6b..c4019198d8 100644
--- a/libraries/libvterm/libvterm.info
+++ b/libraries/libvterm/libvterm.info
@@ -1,8 +1,8 @@
 PRGNAM="libvterm"
-VERSION="0.1.3"
+VERSION="0.1.4"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-DOWNLOAD="http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz"
-MD5SUM="4581aec6b621f5ca5cf5bff97dea6e05"
+DOWNLOAD="http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.4.tar.gz"
+MD5SUM="3bf5bbb91cd99adc523a954b10005511"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libwacom/libwacom.SlackBuild b/libraries/libwacom/libwacom.SlackBuild
index f0cbc3f69c..c76b558715 100644
--- a/libraries/libwacom/libwacom.SlackBuild
+++ b/libraries/libwacom/libwacom.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for libwacom.
 #
-# Copyright 2016-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libwacom
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libwacom/libwacom.info b/libraries/libwacom/libwacom.info
index d60b34991f..01d4b9bca4 100644
--- a/libraries/libwacom/libwacom.info
+++ b/libraries/libwacom/libwacom.info
@@ -1,8 +1,8 @@
 PRGNAM="libwacom"
-VERSION="1.5"
+VERSION="1.9"
 HOMEPAGE="https://github.com/linuxwacom/libwacom"
-DOWNLOAD="https://github.com/linuxwacom/libwacom/archive/libwacom-1.5/libwacom-libwacom-1.5.tar.gz"
-MD5SUM="0fd6b97fb145454960dfcee41158c379"
+DOWNLOAD="https://github.com/linuxwacom/libwacom/archive/libwacom-1.9/libwacom-libwacom-1.9.tar.gz"
+MD5SUM="79361dc08df3ee23a9366c3c0ddf3637"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libwps/libwps.SlackBuild b/libraries/libwps/libwps.SlackBuild
index 838e0c09dd..0e00d37b50 100644
--- a/libraries/libwps/libwps.SlackBuild
+++ b/libraries/libwps/libwps.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libwps
 
-# Copyright 2015-2018 Hunter Sezen California, USA
+# Copyright 2015-2018, 2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libwps
-VERSION=${VERSION:-0.4.10}
+VERSION=${VERSION:-0.4.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +74,8 @@ case "${DOC:-0}" in
   *) doc='--with-docs' ;;
 esac
 
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,11 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
+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 COPYING* CREDITS ChangeLog HACKING INSTALL NEWS README \
+cp -a COPYING* CREDITS ChangeLog HACKING NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libwps/libwps.info b/libraries/libwps/libwps.info
index c5fcbb963b..531e093942 100644
--- a/libraries/libwps/libwps.info
+++ b/libraries/libwps/libwps.info
@@ -1,8 +1,8 @@
 PRGNAM="libwps"
-VERSION="0.4.10"
+VERSION="0.4.12"
 HOMEPAGE="https://sourceforge.net/projects/libwps/"
-DOWNLOAD="https://sourceforge.net/projects/libwps/files/libwps/libwps-0.4.10/libwps-0.4.10.tar.xz"
-MD5SUM="55dd756d2769033e70ffaa0ec8a5e3a1"
+DOWNLOAD="https://downloads.sourceforge.net/project/libwps/libwps/libwps-0.4.12/libwps-0.4.12.tar.xz"
+MD5SUM="802439e84e6ce185f736c1f3dc0321a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libxkbcommon/libxkbcommon.SlackBuild b/libraries/libxkbcommon/libxkbcommon.SlackBuild
index 4e04b1c3c6..f9dc0f78c0 100644
--- a/libraries/libxkbcommon/libxkbcommon.SlackBuild
+++ b/libraries/libxkbcommon/libxkbcommon.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libxkbcommon
 
 # Copyright 2013 Anton Sil'uev, Russia
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libxkbcommon
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,6 +82,10 @@ meson --prefix /usr --mandir /usr/man --libdir lib${LIBDIRSUFFIX} -Denable-wayla
 
 DESTDIR=$PKG ninja -C build all install
 
+# Compress man files
+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 LICENSE README.md NEWS PACKAGING doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/libxkbcommon/libxkbcommon.info b/libraries/libxkbcommon/libxkbcommon.info
index 3eedf1a4f2..ee07e75c0b 100644
--- a/libraries/libxkbcommon/libxkbcommon.info
+++ b/libraries/libxkbcommon/libxkbcommon.info
@@ -1,8 +1,8 @@
 PRGNAM="libxkbcommon"
-VERSION="0.10.0"
+VERSION="1.2.1"
 HOMEPAGE="https://xkbcommon.org/"
-DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-0.10.0.tar.xz"
-MD5SUM="2d9ad3a46b317138b5e72a91cf105451"
+DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-1.2.1.tar.xz"
+MD5SUM="36b2803f3beedd0aeeb265072e9c3e5d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson"
diff --git a/libraries/libxlsxwriter/README b/libraries/libxlsxwriter/README
index 45567e168f..aa0f51b3c0 100644
--- a/libraries/libxlsxwriter/README
+++ b/libraries/libxlsxwriter/README
@@ -1,8 +1,8 @@
 A C library for creating Excel XLSX files
 
-Libxlsxwriter is a C library that can be used to write text, numbers, formulas
-and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file. It supports
-features such as:
+Libxlsxwriter is a C library that can be used to write text, numbers,
+formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX
+file. It supports features such as:
 
 * 100% compatible Excel XLSX files.
 * Full Excel formatting.
@@ -16,7 +16,8 @@ features such as:
 * Source code available on GitHub.
 * FreeBSD License.
 * ANSI C.
-* Works with GCC, Clang, Xcode, MSVC 2015, ICC, TCC, MinGW, MingGW-w64/32.
+* Works with GCC, Clang, Xcode, MSVC 2015, ICC, TCC, MinGW,
+  MingGW-w64/32.
 * Works on Linux, FreeBSD, OpenBSD, OS X, iOS and Windows. Also works on
   MSYS/MSYS2 and Cygwin.
 * Compiles for 32 and 64 bit.
diff --git a/libraries/libxlsxwriter/libxlsxwriter.SlackBuild b/libraries/libxlsxwriter/libxlsxwriter.SlackBuild
index 5ce9ceb6fe..35b69b2920 100644
--- a/libraries/libxlsxwriter/libxlsxwriter.SlackBuild
+++ b/libraries/libxlsxwriter/libxlsxwriter.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libxlsxwriter
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-1.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,6 +76,7 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/libraries/libxlsxwriter/libxlsxwriter.info b/libraries/libxlsxwriter/libxlsxwriter.info
index ccad2233ca..9d0ad39936 100644
--- a/libraries/libxlsxwriter/libxlsxwriter.info
+++ b/libraries/libxlsxwriter/libxlsxwriter.info
@@ -1,8 +1,8 @@
 PRGNAM="libxlsxwriter"
-VERSION="0.9.4"
+VERSION="1.0.2"
 HOMEPAGE="https://libxlsxwriter.github.io/"
-DOWNLOAD="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_0.9.4/libxlsxwriter-RELEASE_0.9.4.tar.gz"
-MD5SUM="08c799090ebf04e14d2e62d84a4e9000"
+DOWNLOAD="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.0.2/libxlsxwriter-RELEASE_1.0.2.tar.gz"
+MD5SUM="82b004c9a3b1b4af8313dfa8ed8ea094"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libxml++3/libxml++3.SlackBuild b/libraries/libxml++3/libxml++3.SlackBuild
index e6d5cb5f0f..8dba5148a0 100644
--- a/libraries/libxml++3/libxml++3.SlackBuild
+++ b/libraries/libxml++3/libxml++3.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=libxml++3
 SRCNAM=${PRGNAM%3}
-VERSION=${VERSION:-3.2.0}
+VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +70,9 @@ 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 {} \;
 
+# Generate sources
+mm-common-prepare -cf
+
 # Respect --docdir
 sed -i 's|$(datarootdir)/doc/$(book_name)|$(docdir)|' build/doc-reference.am
 
diff --git a/libraries/libxml++3/libxml++3.info b/libraries/libxml++3/libxml++3.info
index 38bf254e4a..5fca9736f3 100644
--- a/libraries/libxml++3/libxml++3.info
+++ b/libraries/libxml++3/libxml++3.info
@@ -1,8 +1,8 @@
 PRGNAM="libxml++3"
-VERSION="3.2.0"
+VERSION="3.2.2"
 HOMEPAGE="http://libxmlplusplus.sourceforge.net"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libxml++/3.2/libxml++-3.2.0.tar.xz"
-MD5SUM="c22a62cebbbb3b360ef4ddbe259a44b7"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libxml++/3.2/libxml++-3.2.2.tar.xz"
+MD5SUM="02228e5a9915d1d75d8a01a0b717f5a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mm-common"
diff --git a/libraries/libxnvctrl/libxnvctrl.SlackBuild b/libraries/libxnvctrl/libxnvctrl.SlackBuild
index dc27d9da00..8036971bc5 100644
--- a/libraries/libxnvctrl/libxnvctrl.SlackBuild
+++ b/libraries/libxnvctrl/libxnvctrl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libxnvctrl
-VERSION=${VERSION:-450.66}
+VERSION=${VERSION:-460.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libxnvctrl/libxnvctrl.info b/libraries/libxnvctrl/libxnvctrl.info
index 9bd65f2d6b..d63632e285 100644
--- a/libraries/libxnvctrl/libxnvctrl.info
+++ b/libraries/libxnvctrl/libxnvctrl.info
@@ -1,8 +1,8 @@
 PRGNAM="libxnvctrl"
-VERSION="450.66"
+VERSION="460.67"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.66.tar.bz2"
-MD5SUM="2ff65d01afeffd7e718f2ad128e03892"
+DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.67.tar.bz2"
+MD5SUM="774af9ca9829ad9f5acc9716c26ff0c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nvidia-driver"
diff --git a/libraries/live555/README b/libraries/live555/README
index 8cc7c6574d..622b9592c7 100644
--- a/libraries/live555/README
+++ b/libraries/live555/README
@@ -8,3 +8,6 @@ easily discoverable by configuration stage when building vlc.
 Since version 2014.11.02, source tarballs from archive at
 sourceforge.net are used, only the very latest tarball being available from
 http://www.live555.com/liveMedia/public/.
+
+Until vlc (which depends on live555) is updated to accommodate changed API
+in live555-2021.01.13, live555 will be held at version 2020.08.19
diff --git a/libraries/live555/live555.SlackBuild b/libraries/live555/live555.SlackBuild
index be0a344109..c1c8fe63b1 100644
--- a/libraries/live555/live555.SlackBuild
+++ b/libraries/live555/live555.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for live555
 
-# Copyright 2014-2020 Christoph Willing, Brisbane, Australia
+# Copyright 2014-2021 Christoph Willing, Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/libraries/lua-luv/lua-luv.SlackBuild b/libraries/lua-luv/lua-luv.SlackBuild
index ce1ed788ce..835f4e6432 100644
--- a/libraries/lua-luv/lua-luv.SlackBuild
+++ b/libraries/lua-luv/lua-luv.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for lua-luv
 
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lua-luv
-VERSION=${VERSION:-1.32.0_0}
+VERSION=${VERSION:-1.36.0_0}
 SRCVER=$(echo $VERSION | tr _ -)
 COMPATNAM=lua-compat-5.3
 COMPATVER=0.7
diff --git a/libraries/lua-luv/lua-luv.info b/libraries/lua-luv/lua-luv.info
index bdce22938b..97f27fab94 100644
--- a/libraries/lua-luv/lua-luv.info
+++ b/libraries/lua-luv/lua-luv.info
@@ -1,9 +1,9 @@
 PRGNAM="lua-luv"
-VERSION="1.32.0_0"
+VERSION="1.36.0_0"
 HOMEPAGE="https://github.com/luvit/luv"
-DOWNLOAD="https://github.com/luvit/luv/archive/1.32.0-0/luv-1.32.0-0.tar.gz \
+DOWNLOAD="https://github.com/luvit/luv/archive/1.36.0-0/luv-1.36.0-0.tar.gz \
           https://github.com/keplerproject/lua-compat-5.3/archive/v0.7/lua-compat-5.3-0.7.tar.gz"
-MD5SUM="dc96791ee9d8211cc357b08b1f9894d6 \
+MD5SUM="5b9efde8652056faeb5ffc8f62f2b595 \
         61c3f1af0d7d587f602ac4a13d77a823"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/lua-readline/lua-readline.SlackBuild b/libraries/lua-readline/lua-readline.SlackBuild
index 35029fe75f..a696869d59 100644
--- a/libraries/lua-readline/lua-readline.SlackBuild
+++ b/libraries/lua-readline/lua-readline.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for lua-readline
-# Copyright 2020 abooksigun <abooksigun09@gmail.com>
+# Copyright 2021 abooksigun <abooksigun09@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PRGNAM=lua-readline
 SRCNAM=readline
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,29 +69,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-gcc $SLKCFLAGS -I /usr/include -c C-readline.c -o C-readline.o
-gcc $SLKCFLAGS -shared -o C-readline.so C-readline.o
-
-install -D -m 0755 C-readline.so $PKG/usr/lib$LIBDIRSUFFIX/lua/5.1/C-readline.so
-install -D -m 0644 readline.lua $PKG/usr/share/lua/5.1/readline.lua
-
-# lua 5.2 support.
-if $(lua5.2 -v &> /dev/null); then
-	gcc $SLKCFLAGS -I /usr/include/lua5.2 -c C-readline.c -o C-readline.o
-	gcc $SLKCFLAGS -shared -o C-readline.so.5.2 C-readline.o
-
-  install -D -m 0755 C-readline.so.5.2 $PKG/usr/lib$LIBDIRSUFFIX/lua/5.2/C-readline.so
-  install -D -m 0644 readline.lua $PKG/usr/share/lua/5.2/readline.lua
-fi
-
-# lua 5.3 support
-if $(lua5.3 -v &> /dev/null); then
-	gcc $SLKCFLAGS -I /usr/include/lua5.3 -c C-readline.c -o C-readline.o
-	gcc $SLKCFLAGS -shared -o C-readline.so.5.3 C-readline.o
-
-  install -D -m 0755 C-readline.so.5.3 $PKG/usr/lib$LIBDIRSUFFIX/lua/5.3/C-readline.so
-  install -D -m 0644 readline.lua $PKG/usr/share/lua/5.3/readline.lua
-fi
+LUAVERS="5.1 5.2 5.3 5.4"
+
+for luaver in $LUAVERS
+do
+  if [ $luaver != 5.1 ]; then version=$luaver dir=lua$version; fi
+  if $(lua$version -v &> /dev/null)
+  then
+    gcc $SLKCFLAGS -I /usr/include/$dir -c C-readline.c -o C-readline.o
+    gcc $SLKCFLAGS -shared -o C-readline.so.$luaver C-readline.o
+    
+    install -D -m 0755 C-readline.so.$luaver $PKG/usr/lib$LIBDIRSUFFIX/lua/$luaver/C-readline.so
+    install -D -m 0644 readline.lua $PKG/usr/share/lua/$luaver/readline.lua
+  fi
+done
 
 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
diff --git a/libraries/lua-readline/lua-readline.info b/libraries/lua-readline/lua-readline.info
index 85284171aa..6c8455a684 100644
--- a/libraries/lua-readline/lua-readline.info
+++ b/libraries/lua-readline/lua-readline.info
@@ -1,8 +1,8 @@
 PRGNAM="lua-readline"
-VERSION="2.6"
+VERSION="2.9"
 HOMEPAGE="http://www.pjb.com.au/comp/lua/readline.html"
-DOWNLOAD="http://www.pjb.com.au/comp/lua/readline-2.6.tar.gz"
-MD5SUM="46222ce5904c3f2f4f1f9073fc5697ce"
+DOWNLOAD="http://www.pjb.com.au/comp/lua/readline-2.9.tar.gz"
+MD5SUM="9423302e81cad9a2b9f0fbfd0b39b5a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua-posix"
diff --git a/libraries/luasec/luasec.SlackBuild b/libraries/luasec/luasec.SlackBuild
index 133a55c80e..5ae7f7b3b2 100644
--- a/libraries/luasec/luasec.SlackBuild
+++ b/libraries/luasec/luasec.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luasec
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/luasec/luasec.info b/libraries/luasec/luasec.info
index f114141578..bee916ba24 100644
--- a/libraries/luasec/luasec.info
+++ b/libraries/luasec/luasec.info
@@ -1,8 +1,8 @@
 PRGNAM="luasec"
-VERSION="0.9"
+VERSION="1.0"
 HOMEPAGE="https://github.com/brunoos/luasec"
-DOWNLOAD="https://github.com/brunoos/luasec/archive/v0.9/luasec-0.9.tar.gz"
-MD5SUM="b31b56f6bf034a8240fcc47f0f4041c8"
+DOWNLOAD="https://github.com/brunoos/luasec/archive/v1.0/luasec-1.0.tar.gz"
+MD5SUM="ecde346e3152a032063f6a4438823c2e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/libraries/mbedtls/mbedtls.SlackBuild b/libraries/mbedtls/mbedtls.SlackBuild
index 6924c78ce1..7807226fce 100644
--- a/libraries/mbedtls/mbedtls.SlackBuild
+++ b/libraries/mbedtls/mbedtls.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mbedtls
-VERSION=${VERSION:-2.16.6}
+VERSION=${VERSION:-2.16.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,13 +74,13 @@ mkdir build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
-    -DCMAKE_SKIP_RPATH:BOOL=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
     -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
     -DUSE_STATIC_MBEDTLS_LIBRARY=OFF \
     -DENABLE_TESTING=OFF \
-    -DCMAKE_BUILD_TYPE:STRING=Release ..
+    -DCMAKE_SKIP_RPATH=TRUE \
+    -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
diff --git a/libraries/mbedtls/mbedtls.info b/libraries/mbedtls/mbedtls.info
index d9b8d8b874..986067a587 100644
--- a/libraries/mbedtls/mbedtls.info
+++ b/libraries/mbedtls/mbedtls.info
@@ -1,8 +1,8 @@
 PRGNAM="mbedtls"
-VERSION="2.16.6"
+VERSION="2.16.8"
 HOMEPAGE="https://tls.mbed.org"
-DOWNLOAD="https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.6/mbedtls-mbedtls-2.16.6.tar.gz"
-MD5SUM="a3971a0e6a7ac61adfe2f873b3af7c81"
+DOWNLOAD="https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.8/mbedtls-mbedtls-2.16.8.tar.gz"
+MD5SUM="d44a5245c8bd39f84976fec4d4e635ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mdds/mdds.SlackBuild b/libraries/mdds/mdds.SlackBuild
index 9892591003..c61a9e0227 100644
--- a/libraries/mdds/mdds.SlackBuild
+++ b/libraries/mdds/mdds.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mdds
 
-# Copyright 2015-2019 Hunter Sezen California, USA
+# Copyright 2015-2020 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mdds
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,6 +49,8 @@ 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 {} \;
 
+autoreconf -fi
+
 ./configure \
   --prefix=/usr \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
diff --git a/libraries/mdds/mdds.info b/libraries/mdds/mdds.info
index 5896036f58..0f843fa33b 100644
--- a/libraries/mdds/mdds.info
+++ b/libraries/mdds/mdds.info
@@ -1,8 +1,8 @@
 PRGNAM="mdds"
-VERSION="1.5.0"
+VERSION="1.7.0"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-DOWNLOAD="https://kohei.us/files/mdds/src/mdds-1.5.0.tar.bz2"
-MD5SUM="52cb08e92fec8842a3724bd89051f9d3"
+DOWNLOAD="https://gitlab.com/mdds/mdds/-/archive/1.7.0/mdds-1.7.0.tar.bz2"
+MD5SUM="ad24c0d3fcd6741309d9faded4ba8867"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mujs/mujs.SlackBuild b/libraries/mujs/mujs.SlackBuild
index 9cd6413963..4ad0e1966b 100644
--- a/libraries/mujs/mujs.SlackBuild
+++ b/libraries/mujs/mujs.SlackBuild
@@ -4,7 +4,7 @@
 
 # Written by Valerio Talora <navigare@gmx.com>
 # Copyright (c) 2018 (versions 1.0.3-1.0.5) Andreas Guldstrand
-# Copyright (c) 2020  Christoph Willing, Brisbane, Australia
+# Copyright (c) 2020-2021  Christoph Willing, Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mujs
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/mujs/mujs.info b/libraries/mujs/mujs.info
index e9d85489a3..ceb4d4982d 100644
--- a/libraries/mujs/mujs.info
+++ b/libraries/mujs/mujs.info
@@ -1,8 +1,8 @@
 PRGNAM="mujs"
-VERSION="1.0.7"
+VERSION="1.1.0"
 HOMEPAGE="https://mujs.com/"
-DOWNLOAD="https://mujs.com/downloads/mujs-1.0.7.tar.xz"
-MD5SUM="2797940102e4020a9182ad789fbed2f2"
+DOWNLOAD="https://mujs.com/downloads/mujs-1.1.0.tar.xz"
+MD5SUM="f68f04aa9223934295afb88e87442ecc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/musicbrainzngs/musicbrainzngs.SlackBuild b/libraries/musicbrainzngs/musicbrainzngs.SlackBuild
index 45e48d8d2f..8ef7a6c033 100644
--- a/libraries/musicbrainzngs/musicbrainzngs.SlackBuild
+++ b/libraries/musicbrainzngs/musicbrainzngs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MusicBrainz-ngs
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=musicbrainzngs
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/musicbrainzngs/musicbrainzngs.info b/libraries/musicbrainzngs/musicbrainzngs.info
index 80740bcd58..5a83dd08ae 100644
--- a/libraries/musicbrainzngs/musicbrainzngs.info
+++ b/libraries/musicbrainzngs/musicbrainzngs.info
@@ -1,8 +1,8 @@
 PRGNAM="musicbrainzngs"
-VERSION="0.6"
+VERSION="0.7.1"
 HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
-DOWNLOAD="https://pypi.python.org/packages/63/cc/67ad422295750e2b9ee57c27370dc85d5b85af2454afe7077df6b93d5938/musicbrainzngs-0.6.tar.gz"
-MD5SUM="22616f1710f13a8da933920089c51441"
+DOWNLOAD="https://files.pythonhosted.org/packages/0a/67/3e74ae93d90ceeba72ed1a266dd3ca9abd625f315f0afd35f9b034acedd1/musicbrainzngs-0.7.1.tar.gz"
+MD5SUM="3bb83143ddf39a6e6b807a79b9ed97b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/ntl/ntl.SlackBuild b/libraries/ntl/ntl.SlackBuild
index d28eea9a45..fa08aa7e12 100644
--- a/libraries/ntl/ntl.SlackBuild
+++ b/libraries/ntl/ntl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ntl
-VERSION=${VERSION:-11.4.3}
+VERSION=${VERSION:-11.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/ntl/ntl.info b/libraries/ntl/ntl.info
index 8f0041d26b..058a95dbed 100644
--- a/libraries/ntl/ntl.info
+++ b/libraries/ntl/ntl.info
@@ -1,8 +1,8 @@
 PRGNAM="ntl"
-VERSION="11.4.3"
+VERSION="11.4.4"
 HOMEPAGE="http://www.shoup.net/ntl/"
-DOWNLOAD="http://www.shoup.net/ntl/ntl-11.4.3.tar.gz"
-MD5SUM="536b72b7ba5b0075fb137137c00e5773"
+DOWNLOAD="http://www.shoup.net/ntl/ntl-11.4.4.tar.gz"
+MD5SUM="effc267d9df83ad458b286d789948335"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gf2x"
diff --git a/libraries/nv-codec-headers/README b/libraries/nv-codec-headers/README
index e2f3d1ece6..54f1224ea2 100644
--- a/libraries/nv-codec-headers/README
+++ b/libraries/nv-codec-headers/README
@@ -1,8 +1,8 @@
 The FFmpeg version of Nvidia Codec SDK headers which are required
 to interface with Nvidia's codec APIs. The purpose of these
 headers is to allow hardware (GPU) encoding with suitable NVidia
-cards. This version corresponds to Video Codec SDK version 9.1.23
-and requires NVidia drivers version 435.21 or newer.
+cards. This version corresponds to Video Codec SDK version 11.0.10
+and requires NVidia drivers version 455.28 or newer.
 
 There are 3 stages in the history of NVidia GPU encoding with FFmpeg:
 
diff --git a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild b/libraries/nv-codec-headers/nv-codec-headers.SlackBuild
index 9ab6acb5e1..f3fbd3a503 100644
--- a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild
+++ b/libraries/nv-codec-headers/nv-codec-headers.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nv-codec-headers
 
-# Copyright 2018-2020, Andrew Strong, Blue Mountains, Australia.
+# Copyright 2018-2021, Andrew Strong, Blue Mountains, Australia.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=nv-codec-headers
 # Note that the version number is contained
 # within the file ffnvcodec.pc.in:
-VERSION=${VERSION:-9.1.23.1}
+VERSION=${VERSION:-11.0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,11 +63,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 
+
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
-make PREFIX=/usr LIBDIR=lib${LIBDIRSUFFIX}
 make PREFIX=/usr LIBDIR=lib${LIBDIRSUFFIX} install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/nv-codec-headers/nv-codec-headers.info b/libraries/nv-codec-headers/nv-codec-headers.info
index 99d2158e98..ff59df3c98 100644
--- a/libraries/nv-codec-headers/nv-codec-headers.info
+++ b/libraries/nv-codec-headers/nv-codec-headers.info
@@ -1,8 +1,8 @@
 PRGNAM="nv-codec-headers"
-VERSION="9.1.23.1"
-HOMEPAGE="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git;a=summary"
-DOWNLOAD="https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.1.23.1/nv-codec-headers-9.1.23.1.tar.gz"
-MD5SUM="610972fd2e0019b1800602b254165f20"
+VERSION="11.0.10.0"
+HOMEPAGE="https://github.com/FFmpeg/nv-codec-headers"
+DOWNLOAD="https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.0/nv-codec-headers-11.0.10.0.tar.gz"
+MD5SUM="b3513b09f42036a0d591f2e68a27dfb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/nv-codec-headers/slack-desc b/libraries/nv-codec-headers/slack-desc
index 0c45ab1180..2d7cc06f1a 100644
--- a/libraries/nv-codec-headers/slack-desc
+++ b/libraries/nv-codec-headers/slack-desc
@@ -9,11 +9,11 @@
 nv-codec-headers: nv-codec-headers (FFmpeg version of Nvidia Codec SDK headers)
 nv-codec-headers:
 nv-codec-headers: FFmpeg version of headers required to interface with Nvidia's
-nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 9.1.23.
-nv-codec-headers:
-nv-codec-headers: http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git;a=summary
+nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 11.0.10.
 nv-codec-headers:
 nv-codec-headers:
 nv-codec-headers:
+nv-codec-headers: https://github.com/FFmpeg/nv-codec-headers
+nv-codec-headers: 
 nv-codec-headers:
 nv-codec-headers:
diff --git a/libraries/oath-toolkit/oath-toolkit-gcc.patch b/libraries/oath-toolkit/oath-toolkit-gcc.patch
deleted file mode 100644
index 3c52d7cde5..0000000000
--- a/libraries/oath-toolkit/oath-toolkit-gcc.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- oath-toolkit-2.6.2/libpskc/gl/intprops.h.orig	2017-07-05 00:14:44.595175474 +0700
-+++ oath-toolkit-2.6.2/libpskc/gl/intprops.h	2017-07-05 00:16:26.580176632 +0700
-@@ -230,11 +230,11 @@
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
- #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
-+# define _GL_ADD_OVERFLOW(a, b, min, max) \
-    __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-    __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
-    __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
---- oath-toolkit-2.6.2/oathtool/gl/intprops.h.orig	2017-07-05 00:16:45.637176849 +0700
-+++ oath-toolkit-2.6.2/oathtool/gl/intprops.h	2017-07-05 00:21:02.898179771 +0700
-@@ -230,11 +230,11 @@
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
- #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
-+# define _GL_ADD_OVERFLOW(a, b, min, max) \
-    __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-    __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
-    __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
---- oath-toolkit-2.6.2/pskctool/gl/intprops.h.orig	2017-07-05 00:21:45.109180251 +0700
-+++ oath-toolkit-2.6.2/pskctool/gl/intprops.h	2017-07-05 00:22:06.895180498 +0700
-@@ -230,11 +230,11 @@
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
- #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
-+# define _GL_ADD_OVERFLOW(a, b, min, max) \
-    __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-    __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
-    __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
---- oath-toolkit-2.6.2/liboath/gl/tests/intprops.h.orig	2017-07-05 00:22:52.355181015 +0700
-+++ oath-toolkit-2.6.2/liboath/gl/tests/intprops.h	2017-07-05 00:23:18.133181307 +0700
-@@ -230,11 +230,11 @@
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
- #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
-+# define _GL_ADD_OVERFLOW(a, b, min, max) \
-    __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-    __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
-    __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
diff --git a/libraries/oath-toolkit/oath-toolkit.SlackBuild b/libraries/oath-toolkit/oath-toolkit.SlackBuild
index a7a678abaf..8234308b2a 100644
--- a/libraries/oath-toolkit/oath-toolkit.SlackBuild
+++ b/libraries/oath-toolkit/oath-toolkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for oath-toolkit
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oath-toolkit
-VERSION=${VERSION:-2.6.2}
+VERSION=${VERSION:-2.6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,6 @@ 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 {} \;
 
-patch -p1 < $CWD/oath-toolkit-gcc.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/oath-toolkit/oath-toolkit.info b/libraries/oath-toolkit/oath-toolkit.info
index 4559352194..996e390dc3 100644
--- a/libraries/oath-toolkit/oath-toolkit.info
+++ b/libraries/oath-toolkit/oath-toolkit.info
@@ -1,8 +1,8 @@
 PRGNAM="oath-toolkit"
-VERSION="2.6.2"
+VERSION="2.6.6"
 HOMEPAGE="http://www.nongnu.org/oath-toolkit/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz"
-MD5SUM="4a05cd4768764843bd5493609a6bdb17"
+DOWNLOAD="http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.6.tar.gz"
+MD5SUM="7f236b591be20f8fac50752a9b66b084"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xmlsec"
diff --git a/libraries/ocl-icd/README b/libraries/ocl-icd/README
index 3a939287d6..5b989e77b5 100644
--- a/libraries/ocl-icd/README
+++ b/libraries/ocl-icd/README
@@ -1,19 +1,19 @@
 ocl-icd: free OpenCL ICD Loader
 
-OpenCL implementations are provided as ICD (Installable Client Driver). An
-OpenCL program can use several ICD thanks to the use of an ICD Loader as
-provided by this project. This free ICD Loader can load any (free or non free)
-ICD.
+OpenCL implementations are provided as ICD (Installable Client Driver).
+An OpenCL program can use several ICD thanks to the use of an ICD Loader
+as provided by this project. This free ICD Loader can load any (free or
+non free) ICD.
 
-NOTE: ocl-icd should not be needed on systems where graphics drivers
-by AMD or Nvidia already provide an OpenCL ICD Loader implementation.
-To check if you already have an ICD loader, run this as root:
+NOTE: ocl-icd should not be needed on systems where graphics drivers by
+AMD or Nvidia already provide an OpenCL ICD Loader implementation. To
+check if you already have an ICD loader, run this as root:
 
   ldconfig -p | grep -i opencl
 
 If nothing is printed out, then your system probably lacks an ICD
 implementation (libOpenCL.so* objects) and you need this package.
 
-If something is printed out, then you don't need this package, as it 
-would probably overwrite the ICD loader that came with your graphics 
+If something is printed out, then you don't need this package, as it
+would probably overwrite the ICD loader that came with your graphics
 drivers.
diff --git a/libraries/ocl-icd/ocl-icd.SlackBuild b/libraries/ocl-icd/ocl-icd.SlackBuild
index c4e5555601..992a67aa78 100644
--- a/libraries/ocl-icd/ocl-icd.SlackBuild
+++ b/libraries/ocl-icd/ocl-icd.SlackBuild
@@ -28,7 +28,7 @@
 # 1 - Initial release.
 
 PRGNAM=ocl-icd
-VERSION=${VERSION:-2.2.12}
+VERSION=${VERSION:-2.2.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 DOCS="README NEWS COPYING"
diff --git a/libraries/ocl-icd/ocl-icd.info b/libraries/ocl-icd/ocl-icd.info
index 180d3f8ef5..de0611bde0 100644
--- a/libraries/ocl-icd/ocl-icd.info
+++ b/libraries/ocl-icd/ocl-icd.info
@@ -1,8 +1,8 @@
 PRGNAM="ocl-icd"
-VERSION="2.2.12"
+VERSION="2.2.14"
 HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-DOWNLOAD="https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz"
-MD5SUM="47035a0b597fe334be16a653c7c7951f"
+DOWNLOAD="https://github.com/OCL-dev/ocl-icd/archive/v2.2.14/ocl-icd-2.2.14.tar.gz"
+MD5SUM="ef0d426bccf2a795013d3c5794550e5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/ogre/README b/libraries/ogre/README
index aa9b86f9ef..651c87caf3 100644
--- a/libraries/ogre/README
+++ b/libraries/ogre/README
@@ -35,5 +35,3 @@ zziplib, FreeImage, tbb, cppunit, ois, nvidia-cg-toolkit
 
 Optional dependencies NOT (yet) available at SlackBuilds.org:
 opengles, POCO
-
-NOTE: This will not build if assimp is installed.
diff --git a/libraries/ogre/ogre.SlackBuild b/libraries/ogre/ogre.SlackBuild
index 01049e81fa..294590f265 100644
--- a/libraries/ogre/ogre.SlackBuild
+++ b/libraries/ogre/ogre.SlackBuild
@@ -24,6 +24,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210215 bkw: modified by SlackBuilds.org: force-disable the assimp
+# plugin. Our assimp is too old (or too new?) for this version of
+# ogre. This allows ogre to be built on a system where assimp is
+# installed.
+
 PRGNAM=ogre
 VERSION=${VERSION:-1.12.9}
 IMGUIVER=${IMGUIVER:-1.77}
@@ -80,8 +85,9 @@ find -L . \
 mkdir build
 cd build
 tar xvf $CWD/imgui-$IMGUIVER.tar.gz
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   CXXFLAGS+=' -Wno-deprecated-declarations' \
-  /opt/cmake-202x/bin/cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DOGRE_LIB_DIRECTORY=lib${LIBDIRSUFFIX} \
         -DOGRE_BUILD_SAMPLES=$OGRE_BUILD_SAMPLES \
@@ -90,6 +96,7 @@ tar xvf $CWD/imgui-$IMGUIVER.tar.gz
         -DOGRE_BUILD_DEPENDENCIES=FALSE \
         -DOGRE_BUILD_PLUGIN_FREEIMAGE=TRUE \
         -DOGRE_INSTALL_SAMPLES_SOURCE=$OGRE_INSTALL_SAMPLES_SOURCE \
+        -DOGRE_BUILD_PLUGIN_ASSIMP=FALSE \
         ../
   make
   make install DESTDIR=$PKG
diff --git a/libraries/olm/olm.SlackBuild b/libraries/olm/olm.SlackBuild
index b11f08a58c..eabc3dbf8e 100644
--- a/libraries/olm/olm.SlackBuild
+++ b/libraries/olm/olm.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=olm
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/olm/olm.info b/libraries/olm/olm.info
index 6d613ff3f0..03494cb7c7 100644
--- a/libraries/olm/olm.info
+++ b/libraries/olm/olm.info
@@ -1,8 +1,8 @@
 PRGNAM="olm"
-VERSION="3.2.1"
+VERSION="3.2.2"
 HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
-DOWNLOAD="https://gitlab.matrix.org/matrix-org/olm/-/archive/3.2.1/olm-3.2.1.tar.bz2"
-MD5SUM="622af9400c993238e43feb9bc9b7d34f"
+DOWNLOAD="https://gitlab.matrix.org/matrix-org/olm/-/archive/3.2.2/olm-3.2.2.tar.bz2"
+MD5SUM="e4f770f1b5512be01c6aaa44de93cc6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 5ca57a4114..5442d04b49 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2012-2015 Matt Dinslage, Springfield, MO USA
 # All rights reserved.
-# Copyright 2016-2020 Christoph Willing,  Brisbane, Australia
+# Copyright 2016-2021 Christoph Willing,  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PRGNAM=opencv
 PRGNAM2=opencv_contrib
-VERSION=${VERSION:-4.5.0}
+VERSION=${VERSION:-4.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 8fd018ce80..cbf4a26a23 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,10 +1,10 @@
 PRGNAM="opencv"
-VERSION="4.5.0"
+VERSION="4.5.2"
 HOMEPAGE="https://opencv.org/"
-DOWNLOAD="https://github.com/opencv/opencv/archive/4.5.0/opencv-4.5.0.tar.gz \
-        https://github.com/opencv/opencv_contrib/archive/4.5.0/opencv_contrib-4.5.0.tar.gz"
-MD5SUM="65ecd733f41b8286debfc4f29bd0d453 \
-        bcd25c6796f647a4a14e3235c7eddd6a"
+DOWNLOAD="https://github.com/opencv/opencv/archive/4.5.2/opencv-4.5.2.tar.gz \
+        https://github.com/opencv/opencv_contrib/archive/4.5.2/opencv_contrib-4.5.2.tar.gz"
+MD5SUM="d3141f649ab2d76595fdd8991ee15c55 \
+        4d3a8d5d0e877ba49f904e5a4ac67f0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numpy3 qt5"
diff --git a/libraries/orcania/orcania.SlackBuild b/libraries/orcania/orcania.SlackBuild
index bf31fe6ff9..ed802fcbf6 100644
--- a/libraries/orcania/orcania.SlackBuild
+++ b/libraries/orcania/orcania.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=orcania
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/orcania/orcania.info b/libraries/orcania/orcania.info
index af367e57be..23f438ec16 100644
--- a/libraries/orcania/orcania.info
+++ b/libraries/orcania/orcania.info
@@ -1,8 +1,8 @@
 PRGNAM="orcania"
-VERSION="2.1.1"
+VERSION="2.2.0"
 HOMEPAGE="https://github.com/babelouest/orcania"
-DOWNLOAD="https://github.com/babelouest/orcania/archive/v2.1.1/orcania-2.1.1.tar.gz"
-MD5SUM="f192e4d5ecfc5cf078b1fa579b07f8da"
+DOWNLOAD="https://github.com/babelouest/orcania/archive/v2.2.0/orcania-2.2.0.tar.gz"
+MD5SUM="7ff2b5987fc9d4534966d5110d9d759a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jansson"
diff --git a/libraries/pugixml/pugixml.SlackBuild b/libraries/pugixml/pugixml.SlackBuild
index bcbf3e345b..a42316f24c 100644
--- a/libraries/pugixml/pugixml.SlackBuild
+++ b/libraries/pugixml/pugixml.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pugixml
 
-# Copyright 2015-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pugixml
-VERSION=${VERSION:-1.10}
-MAJVER=1.10
+VERSION=${VERSION:-1.11.4}
+MAJVER=1.11.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_SHARED_LIBS=ON \
diff --git a/libraries/pugixml/pugixml.info b/libraries/pugixml/pugixml.info
index b3c7b0d17f..db672d59d9 100644
--- a/libraries/pugixml/pugixml.info
+++ b/libraries/pugixml/pugixml.info
@@ -1,8 +1,8 @@
 PRGNAM="pugixml"
-VERSION="1.10"
+VERSION="1.11.4"
 HOMEPAGE="https://pugixml.org/"
-DOWNLOAD="https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz"
-MD5SUM="f97237e9908201c6d8536210747b66af"
+DOWNLOAD="https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz"
+MD5SUM="2d2730d3412b08d3e70c795bc17003df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/pylast/README b/libraries/pylast/README
index a8c4052fb5..3910e5597c 100644
--- a/libraries/pylast/README
+++ b/libraries/pylast/README
@@ -1,13 +1 @@
-Pylast is a python interface to Last.fm.
-Try using the pydoc utility for help on usage.
-
-For more info check out the project's home page at
-http://code.google.com/p/pylast/ or the mailing list
-http://groups.google.com/group/pylast
-
-If you want to build this for use with Python 3.x (needs the optional
-dependency python3) pass the script PYTHON3=yes, like:
-
-  PYTHON3=yes ./pylast.SlackBuild
-
-NOTE: python_version="3.3" require python-certifi
+A Python interface to Last.fm and other API-compatible websites such as Libre.fm.
diff --git a/libraries/pylast/pylast.SlackBuild b/libraries/pylast/pylast.SlackBuild
index 3c333b28e1..bb11809871 100644
--- a/libraries/pylast/pylast.SlackBuild
+++ b/libraries/pylast/pylast.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pylast
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pylast
-VERSION=${VERSION:-2.4.0} # This is the last verion that is compatible
-BUILD=${BUILD:-1}         # with Python 2
+VERSION=${VERSION:-4.1.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,9 +54,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-PYTHON=python
-[ "${PYTHON3:-no}" = "yes" ] && PYTHON=python3
-
 set -e
 
 rm -rf $PKG
@@ -72,7 +69,7 @@ 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 {} \;
 
-$PYTHON setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/libraries/pylast/pylast.info b/libraries/pylast/pylast.info
index bed5b0f155..bf31b52c1b 100644
--- a/libraries/pylast/pylast.info
+++ b/libraries/pylast/pylast.info
@@ -1,10 +1,10 @@
 PRGNAM="pylast"
-VERSION="2.4.0"
+VERSION="4.1.0"
 HOMEPAGE="https://github.com/pylast/pylast"
-DOWNLOAD="https://files.pythonhosted.org/packages/eb/5e/c7aa34730b5184121ca3793028a4e1f2e459f0e1bce6f39b63e501f5acc1/pylast-2.4.0.tar.gz"
-MD5SUM="2dac0c4eb983d25741e610add85f38ee"
+DOWNLOAD="https://files.pythonhosted.org/packages/99/97/75508fee9664e622d2d66e45059e05107464c871ea54a22c3f16a36a01c8/pylast-4.1.0.tar.gz"
+MD5SUM="beea5dced799a7dba0ecd6396c8e366e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="six"
+REQUIRES="python3"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/pymediainfo/pymediainfo.SlackBuild b/libraries/pymediainfo/pymediainfo.SlackBuild
index f7c24fd49e..318d244f88 100644
--- a/libraries/pymediainfo/pymediainfo.SlackBuild
+++ b/libraries/pymediainfo/pymediainfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pymediainfo
 
-# Copyright 2014-2019 Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021 Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pymediainfo
-VERSION=${VERSION:-4.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.0.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,7 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/libraries/pymediainfo/pymediainfo.info b/libraries/pymediainfo/pymediainfo.info
index b7fe772a2b..8a206720f2 100644
--- a/libraries/pymediainfo/pymediainfo.info
+++ b/libraries/pymediainfo/pymediainfo.info
@@ -1,10 +1,10 @@
 PRGNAM="pymediainfo"
-VERSION="4.1"
+VERSION="5.0.3"
 HOMEPAGE="https://pypi.python.org/pypi/pymediainfo/"
-DOWNLOAD="https://files.pythonhosted.org/packages/97/87/1a79ccbf656392b3053d667dbf903b183d55ecf13cb6439293a700a8de00/pymediainfo-4.1.tar.gz"
-MD5SUM="31f179ecd572f609a221400f1453a953"
+DOWNLOAD="https://files.pythonhosted.org/packages/1f/ec/da04fb8cbf5df9684b549bc3cb5c2010a0661da4bc626a6d531462222511/pymediainfo-5.0.3.tar.gz"
+MD5SUM="3edd6bac783d98f244b59db955664fff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/pymediainfo/slack-desc b/libraries/pymediainfo/slack-desc
index 24387e454b..e0be8d7fcf 100644
--- a/libraries/pymediainfo/slack-desc
+++ b/libraries/pymediainfo/slack-desc
@@ -10,7 +10,7 @@ pymediainfo: pymediainfo (A Python wrapper for the mediainfo command line tool)
 pymediainfo:
 pymediainfo: A Python wrapper for the mediainfo command line tool
 pymediainfo:
-pymediainfo: Homepage: https://pypi.python.org/pypi/pymediainfo/1.3.5
+pymediainfo: Homepage: https://pypi.python.org/pypi/pymediainfo
 pymediainfo:
 pymediainfo:
 pymediainfo:
diff --git a/libraries/pytaglib/README b/libraries/pytaglib/README
new file mode 100644
index 0000000000..1327f439e0
--- /dev/null
+++ b/libraries/pytaglib/README
@@ -0,0 +1,4 @@
+pytaglib is a Python audio tagging library. It is a wrapper around
+the TagLib C++ library. It supports more than a dozen file formats,
+including mp3, flac, ogg, wma, and mp4, arbitary, non-standard tag
+names and multiple values per tag. It works with all Python versions.
diff --git a/libraries/pytaglib/pytaglib.SlackBuild b/libraries/pytaglib/pytaglib.SlackBuild
new file mode 100644
index 0000000000..88b1c517d9
--- /dev/null
+++ b/libraries/pytaglib/pytaglib.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for pytaglib
+
+# Copyright 2020 Sasha Abbott
+
+#
+# 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=pytaglib
+VERSION=${VERSION:-1.4.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python setup.py build
+python setup.py install --root=$PKG
+
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py build
+  python3 setup.py install --root=$PKG
+fi
+
+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/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/pytaglib/pytaglib.info b/libraries/pytaglib/pytaglib.info
new file mode 100644
index 0000000000..45643a4bc7
--- /dev/null
+++ b/libraries/pytaglib/pytaglib.info
@@ -0,0 +1,10 @@
+PRGNAM="pytaglib"
+VERSION="1.4.6"
+HOMEPAGE="https://github.com/supermihi/pytaglib"
+DOWNLOAD="https://github.com/supermihi/pytaglib/archive/v1.4.6/pytaglib-1.4.6.tar.gz"
+MD5SUM="de163afa617ad2d2d4ee875a9132321e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Sasha Abbott"
+EMAIL="sashaa@disroot.org"
diff --git a/libraries/pytaglib/slack-desc b/libraries/pytaglib/slack-desc
new file mode 100644
index 0000000000..f069a6a72b
--- /dev/null
+++ b/libraries/pytaglib/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+pytaglib: pytaglib (Python audio tagging library)
+pytaglib:
+pytaglib: pytaglib is a Python audio tagging library. It is a wrapper around
+pytaglib: the TagLib C++ library. It supports more than a dozen file formats,
+pytaglib: including mp3, flac, ogg, wma, and mp4, arbitary, non-standard tag
+pytaglib: names and multiple values per tag.
+pytaglib: 
+pytaglib: Homepage: https://github.com/supermihi/pytaglib
+pytaglib:
+pytaglib:
+pytaglib:
diff --git a/libraries/python-ruamel.yaml/README b/libraries/python-ruamel.yaml/README
index 28dd43dc00..91a1a82256 100644
--- a/libraries/python-ruamel.yaml/README
+++ b/libraries/python-ruamel.yaml/README
@@ -13,3 +13,5 @@ that preserves, among others:
 * flow style sequences ( ‘a: b, c, d’)
 * anchor names that are hand-crafted (i.e. not of the form``idNNN``)
 * merges in dictionaries are preserved
+
+Python3 is an optional dependency (autodetected).
diff --git a/libraries/python-ruamel.yaml/python-ruamel.yaml.SlackBuild b/libraries/python-ruamel.yaml/python-ruamel.yaml.SlackBuild
index 17b1b8ee01..9eb2692772 100644
--- a/libraries/python-ruamel.yaml/python-ruamel.yaml.SlackBuild
+++ b/libraries/python-ruamel.yaml/python-ruamel.yaml.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-ruamel.yaml
 
-# Copyright 2019, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-ruamel.yaml
 VERSION=${VERSION:-0.16.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -58,6 +58,10 @@ find -L . \
 
 RUAMEL_NO_PIP_INSTALL_CHECK=1 python setup.py install --root=$PKG
 
+if $(python3 -c 'import sys' 2>/dev/null); then
+  RUAMEL_NO_PIP_INSTALL_CHECK=1  python3 setup.py install --root=$PKG
+fi
+
 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
 
diff --git a/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.SlackBuild b/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.SlackBuild
index 9a73a96fc5..c8ea20283a 100644
--- a/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.SlackBuild
+++ b/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qt5-pbfimageplugin
 
-# Copyright 2018-2019 Nikolay Korotkiy <sikmir@gmail.com>
+# Copyright 2018-2020 Nikolay Korotkiy <sikmir@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qt5-pbfimageplugin
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.info b/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.info
index b35d4e34be..acbd22a720 100644
--- a/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.info
+++ b/libraries/qt5-pbfimageplugin/qt5-pbfimageplugin.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5-pbfimageplugin"
-VERSION="2.0"
+VERSION="2.3"
 HOMEPAGE="https://github.com/tumic0/QtPBFImagePlugin"
-DOWNLOAD="https://github.com/tumic0/QtPBFImagePlugin/archive/2.0/QtPBFImagePlugin-2.0.tar.gz"
-MD5SUM="1124302f218720acf3a912c13f53270d"
+DOWNLOAD="https://github.com/tumic0/QtPBFImagePlugin/archive/2.3/QtPBFImagePlugin-2.3.tar.gz"
+MD5SUM="1d014afa920be8018fefbd0fc6f8f764"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 protobuf3"
diff --git a/libraries/quazip/README b/libraries/quazip-qt4/README
index 026ee2c7d4..aff044eeb5 100644
--- a/libraries/quazip/README
+++ b/libraries/quazip-qt4/README
@@ -1,10 +1,9 @@
 QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 that can be used to access ZIP archives. It uses the Qt toolkit.
 
-QuaZIP allows you to access files inside ZIP archives using QIODevice API,
-and - yes! - that means that you can also use QTextStream, QDataStream
-or whatever you would like to use on your zipped files.
+QuaZIP allows you to access files inside ZIP archives using QIODevice
+API, and - yes! - that means that you can also use QTextStream,
+QDataStream or whatever you would like to use on your zipped files.
 
 QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both
 reading from and writing to ZIP archives.
-
diff --git a/libraries/quazip/quazip.SlackBuild b/libraries/quazip-qt4/quazip-qt4.SlackBuild
index 056ecff7a9..2f801f15df 100644
--- a/libraries/quazip/quazip.SlackBuild
+++ b/libraries/quazip-qt4/quazip-qt4.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for quazip
+# Slackware build script for quazip-qt4
 
 # Copyright 2013  Isaque Galdino <igaldino@gmail.com>
 # Copyright 2019-2020  Matteo Bernardini <ponce@slackbuilds.org>
@@ -23,7 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=quazip
+PRGNAM=quazip-qt4
+SRCNAM=quazip
 VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -61,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+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 \
diff --git a/libraries/quazip/quazip.info b/libraries/quazip-qt4/quazip-qt4.info
index 3f8da5f133..d88b35094d 100644
--- a/libraries/quazip/quazip.info
+++ b/libraries/quazip-qt4/quazip-qt4.info
@@ -1,4 +1,4 @@
-PRGNAM="quazip"
+PRGNAM="quazip-qt4"
 VERSION="0.9.1"
 HOMEPAGE="https://github.com/stachenov/quazip"
 DOWNLOAD="https://github.com/stachenov/quazip/archive/v0.9.1/quazip-0.9.1.tar.gz"
diff --git a/libraries/quazip-qt4/slack-desc b/libraries/quazip-qt4/slack-desc
new file mode 100644
index 0000000000..2d85c72bbf
--- /dev/null
+++ b/libraries/quazip-qt4/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+quazip-qt4: quazip-qt4 (Qt/C++ wrapper for the ZIP/UNZIP API)
+quazip-qt4:
+quazip-qt4: QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
+quazip-qt4: that can be used to access ZIP archives.
+quazip-qt4: This script packages the version for the Qt-4.x toolkit.
+quazip-qt4: QuaZIP allows you to access files inside ZIP archives using QIODevice
+quazip-qt4: API, and -yes!- that means that you can also use QTextStream,
+quazip-qt4: QDataStream or whatever you would like to use on your zipped files.
+quazip-qt4: QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both
+quazip-qt4: reading from and writing to ZIP archives.
+quazip-qt4:
diff --git a/libraries/quazip/slack-desc b/libraries/quazip/slack-desc
deleted file mode 100644
index 719387fb45..0000000000
--- a/libraries/quazip/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-quazip: quazip (Qt/C++ wrapper for ZIP/UNZIP package)
-quazip:
-quazip: QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
-quazip: that can be used to access ZIP archives. It uses the Qt toolkit.
-quazip:
-quazip: QuaZIP allows you to access files inside ZIP archives using QIODevice
-quazip: API, quazip: and -yes!- that means that you can also use QTextStream,
-quazip: QDataStream or whatever you would like to use on your zipped files.
-quazip:
-quazip: QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both
-quazip: reading from and writing to ZIP archives.
diff --git a/libraries/qwt-qt5/patch-6.1.5-pkgconfig.diff b/libraries/qwt-qt5/patch-6.1.6-pkgconfig.diff
index 91c5ed4c78..91c5ed4c78 100644
--- a/libraries/qwt-qt5/patch-6.1.5-pkgconfig.diff
+++ b/libraries/qwt-qt5/patch-6.1.6-pkgconfig.diff
diff --git a/libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff b/libraries/qwt-qt5/patch-6.1.6-qwtconfig.diff
index 815013bd06..815013bd06 100644
--- a/libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff
+++ b/libraries/qwt-qt5/patch-6.1.6-qwtconfig.diff
diff --git a/libraries/qwt-qt5/patch-6.1.5-qwtfunctions.diff b/libraries/qwt-qt5/patch-6.1.6-qwtfunctions.diff
index b31dc22de6..b31dc22de6 100644
--- a/libraries/qwt-qt5/patch-6.1.5-qwtfunctions.diff
+++ b/libraries/qwt-qt5/patch-6.1.6-qwtfunctions.diff
diff --git a/libraries/qwt-qt5/qwt-qt5.SlackBuild b/libraries/qwt-qt5/qwt-qt5.SlackBuild
index e9e21ff026..a88cc576e8 100644
--- a/libraries/qwt-qt5/qwt-qt5.SlackBuild
+++ b/libraries/qwt-qt5/qwt-qt5.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for qwt-qt5
 
 # Modified from libraries/qwt
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qwt-qt5
-VERSION=${VERSION:-6.1.5}
+VERSION=${VERSION:-6.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,9 +72,9 @@ 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 {} \;
 
-patch -p0 < $CWD/patch-6.1.5-qwtconfig.diff
-patch -p0 < $CWD/patch-6.1.5-pkgconfig.diff
-patch -p1 < $CWD/patch-6.1.5-qwtfunctions.diff # OpenSUSE
+patch -p0 < $CWD/patch-6.1.6-qwtconfig.diff
+patch -p0 < $CWD/patch-6.1.6-pkgconfig.diff
+patch -p1 < $CWD/patch-6.1.6-qwtfunctions.diff # OpenSUSE
 
 mkdir build
 cd build
diff --git a/libraries/qwt-qt5/qwt-qt5.info b/libraries/qwt-qt5/qwt-qt5.info
index 72b17edc6a..90047def44 100644
--- a/libraries/qwt-qt5/qwt-qt5.info
+++ b/libraries/qwt-qt5/qwt-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qwt-qt5"
-VERSION="6.1.5"
+VERSION="6.1.6"
 HOMEPAGE="http://qwt.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.5.tar.bz2"
-MD5SUM="d65582f99312796ed42c3be3208ed3db"
+DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.6.tar.bz2"
+MD5SUM="cc71be5d6c33c2fc19ae8082ccdd3e83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild
index ed2d49c7b2..643e3bf43d 100644
--- a/libraries/qwt/qwt.SlackBuild
+++ b/libraries/qwt/qwt.SlackBuild
@@ -6,10 +6,10 @@
 # Nobbled from Slacky and sanitised for sanity :)
 # Modified by dunkyp <dunkyp@gmail.com>
 # Modified by the Slackbuilds.org project
-# Maintained 2015-2020 by Christoph Willing <chris.willing@linux.com>
+# Maintained 2015-2021 by Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=qwt
-VERSION=${VERSION:-6.1.5}
+VERSION=${VERSION:-6.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/qwt/qwt.info b/libraries/qwt/qwt.info
index 744dda15cf..36c5bc0943 100644
--- a/libraries/qwt/qwt.info
+++ b/libraries/qwt/qwt.info
@@ -1,8 +1,8 @@
 PRGNAM="qwt"
-VERSION="6.1.5"
+VERSION="6.1.6"
 HOMEPAGE="https://qwt.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/qwt/qwt-6.1.5.tar.bz2"
-MD5SUM="d65582f99312796ed42c3be3208ed3db"
+DOWNLOAD="https://downloads.sourceforge.net/qwt/qwt-6.1.6.tar.bz2"
+MD5SUM="cc71be5d6c33c2fc19ae8082ccdd3e83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/raptor/raptor.SlackBuild b/libraries/raptor/raptor.SlackBuild
index debe82a606..d5258faf3e 100644
--- a/libraries/raptor/raptor.SlackBuild
+++ b/libraries/raptor/raptor.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for raptor
-# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012
+
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,17 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# some stuff is "inspired" by the official ex-raptor.SlackBuild
-# http://slackware.osuosl.org/slackware64-13.37/source/l/raptor/raptor.SlackBuild
+# some stuff is "inspired" by the official ex-raptor{,2}.SlackBuild
 
 PRGNAM=raptor
-VERSION=${VERSION:-1.4.21}
+VERSION=${VERSION:-2.0.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +42,8 @@ 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"
@@ -63,18 +63,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf ${PRGNAM}2-$VERSION
+tar xvf $CWD/${PRGNAM}2-$VERSION.tar.gz
+cd ${PRGNAM}2-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Remove a deprecated curl header
-sed -i "s|#include <curl/types\.h>||" src/raptor_internal.h
+ \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -85,15 +82,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
+  --with-icu-config=/usr/bin/icu-config \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-# rapper is already included in raptor2, so rename it
-mv $PKG/usr/bin/{rapper,rapper1}
-mv $PKG/usr/man/man1/{rapper,rapper1}.1
-
 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
 
@@ -102,7 +96,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/raptor-$VERSION ; ln -s /usr/share/gtk-doc/html/raptor html )
+( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s /usr/share/gtk-doc/html/${PRGNAM}2 html )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/raptor/raptor.info b/libraries/raptor/raptor.info
index 08c91e3304..0cabc80992 100644
--- a/libraries/raptor/raptor.info
+++ b/libraries/raptor/raptor.info
@@ -1,8 +1,8 @@
 PRGNAM="raptor"
-VERSION="1.4.21"
+VERSION="2.0.15"
 HOMEPAGE="http://librdf.org"
-DOWNLOAD="http://download.librdf.org/source/raptor-1.4.21.tar.gz"
-MD5SUM="992061488af7a9e2d933df6b694bb876"
+DOWNLOAD="http://download.librdf.org/source/raptor2-2.0.15.tar.gz"
+MD5SUM="a39f6c07ddb20d7dd2ff1f95fa21e2cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/rhonabwy/rhonabwy.SlackBuild b/libraries/rhonabwy/rhonabwy.SlackBuild
index 9d65ebb51b..0dcb0f0911 100644
--- a/libraries/rhonabwy/rhonabwy.SlackBuild
+++ b/libraries/rhonabwy/rhonabwy.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rhonabwy
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.9.999}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,16 +39,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 fi
 
@@ -82,6 +82,11 @@ 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
 
+mv $PKG/usr/share/man $PKG/usr/
+
+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
 DOCS="LICENSE README.md"
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/rhonabwy/rhonabwy.info b/libraries/rhonabwy/rhonabwy.info
index 82e3a08030..8d9b0fbe19 100644
--- a/libraries/rhonabwy/rhonabwy.info
+++ b/libraries/rhonabwy/rhonabwy.info
@@ -1,8 +1,8 @@
 PRGNAM="rhonabwy"
-VERSION="0.9.12"
+VERSION="0.9.999"
 HOMEPAGE="https://github.com/babelouest/rhonabwy"
-DOWNLOAD="https://github.com/babelouest/rhonabwy/archive/v0.9.12/rhonabwy-0.9.12.tar.gz"
-MD5SUM="70381c6ccdeb621a579624d40d1dbdd9"
+DOWNLOAD="https://github.com/babelouest/rhonabwy/archive/v0.9.999/rhonabwy-0.9.999.tar.gz"
+MD5SUM="b267fce07eeafc3ed327ecfb5400c93c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jansson libmicrohttpd ulfius"
diff --git a/libraries/skalibs/README b/libraries/skalibs/README
index b8dedd2f85..2bb7aa0577 100644
--- a/libraries/skalibs/README
+++ b/libraries/skalibs/README
@@ -31,8 +31,7 @@ libraries and not the static ones, you can do something like
 If you just want to build and use skarnet.org softwares, building only
 the static libraries should be sufficient.
 
-Also, skalibs has a default executable search path that will be used by
-skarnet.org softwares if the PATH environment variable is undefined. The
-upstream default is "/usr/bin:/bin" but the script by default will use
-"/usr/bin:/usr/sbin:/bin:/sbin" instead. Pass DEF_PATH=some:path:list
-to the script if you want to change it to something else.
+Also, the execvep() function from skalibs (used by all skarnet.org
+softwares) has a default executable search path that will be used if the
+PATH environment variable is undefined. The default is /usr/bin:/bin.
+Pass DEF_PATH=some:path:list to the script if you want to change it.
diff --git a/libraries/skalibs/skalibs.SlackBuild b/libraries/skalibs/skalibs.SlackBuild
index f75d1504b9..ccc17eed73 100644
--- a/libraries/skalibs/skalibs.SlackBuild
+++ b/libraries/skalibs/skalibs.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=skalibs
-VERSION=${VERSION:-2.9.3.0}
+VERSION=${VERSION:-2.10.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,11 +63,11 @@ BUILD_SHARED=${BUILD_SHARED:-no}
 [ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
 [ "$BUILD_SHARED" = "no" ] && LIBS_CONF="--disable-shared $LIBS_CONF"
 
-# skalibs has a default executable search path that will be used by skarnet.org softwares
-# if the PATH environment variable is undefined. The upstream default is /usr/bin:/bin but
-# we will use /usr/bin:/usr/sbin:/bin:/sbin here instead. You can pass DEF_PATH=some:path:list
-# to this script if you want to change it to something else.
-DEF_PATH=${DEF_PATH:-/usr/bin:/usr/sbin:/bin:/sbin}
+# The execvep() function from skalibs (used by all skarnet.org softwares) has a default
+# executable search path that will be used if the PATH environment variable is undefined.
+# The default is /usr/bin:/bin. Pass DEF_PATH=some:path:list to the script if you want to
+# change it.
+DEF_PATH=${DEF_PATH:-/usr/bin:/bin}
 
 set -e
 
diff --git a/libraries/skalibs/skalibs.info b/libraries/skalibs/skalibs.info
index 922a9fda8c..2dd406572f 100644
--- a/libraries/skalibs/skalibs.info
+++ b/libraries/skalibs/skalibs.info
@@ -1,8 +1,8 @@
 PRGNAM="skalibs"
-VERSION="2.9.3.0"
+VERSION="2.10.0.3"
 HOMEPAGE="https://skarnet.org/software/skalibs/"
-DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.9.3.0.tar.gz"
-MD5SUM="21000c52f51c1b3266b7cec77ef1c027"
+DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.10.0.3.tar.gz"
+MD5SUM="85ad305218d10fe65b38c4c351faa395"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/slv2/slv2.info b/libraries/slv2/slv2.info
index b3b71d8f74..065bf66ee5 100644
--- a/libraries/slv2/slv2.info
+++ b/libraries/slv2/slv2.info
@@ -6,5 +6,5 @@ MD5SUM="b8e8e0e82dd04324fcd533e8acd1ce85"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lv2"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/spdlog/spdlog.SlackBuild b/libraries/spdlog/spdlog.SlackBuild
index 029d456316..5c56a082f6 100644
--- a/libraries/spdlog/spdlog.SlackBuild
+++ b/libraries/spdlog/spdlog.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spdlog
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,8 +70,12 @@ 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 {} \;
 
-FMT=OFF
-pkg-config --exists fmt && FMT=ON
+FMT=ON
+pkg-config --exists fmt || FMT=OFF
+
+# Require an older cmake version.
+sed -i 's/3.10/3.5.2/' CMakeLists.txt
+sed -i 's/3.10/3.5.2/' tests/CMakeLists.txt
 
 mkdir -p build
 cd build
@@ -84,6 +88,7 @@ cd build
     -DSPDLOG_BUILD_BENCH=OFF \
     -DSPDLOG_BUILD_EXAMPLE=OFF \
     -DSPDLOG_FMT_EXTERNAL=$FMT \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/libraries/spdlog/spdlog.info b/libraries/spdlog/spdlog.info
index b734b776f8..6b38555cc8 100644
--- a/libraries/spdlog/spdlog.info
+++ b/libraries/spdlog/spdlog.info
@@ -1,8 +1,8 @@
 PRGNAM="spdlog"
-VERSION="1.5.0"
+VERSION="1.8.1"
 HOMEPAGE="https://github.com/gabime/spdlog"
-DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.5.0/spdlog-1.5.0.tar.gz"
-MD5SUM="a966eea01f81551527853d282896cb4d"
+DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.8.1/spdlog-1.8.1.tar.gz"
+MD5SUM="765838829ada66a35002dbb3ba3fed30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/srt/README b/libraries/srt/README
new file mode 100644
index 0000000000..edc9715127
--- /dev/null
+++ b/libraries/srt/README
@@ -0,0 +1,6 @@
+srt (Secure, Reliable, Transport)
+
+Secure Reliable Transport (SRT) is an open source transport technology
+that optimizes streaming performance across unpredictable networks,
+such as the Internet.
+
diff --git a/libraries/srt/slack-desc b/libraries/srt/slack-desc
new file mode 100644
index 0000000000..ce3aaf560f
--- /dev/null
+++ b/libraries/srt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+srt: srt (Secure, Reliable, Transport)
+srt:
+srt: Secure Reliable Transport (SRT) is an open source transport technology
+srt: that optimizes streaming performance across unpredictable networks,
+srt: such as the Internet.
+srt:
+srt:
+srt:
+srt:
+srt:
+srt:
diff --git a/libraries/srt/srt.SlackBuild b/libraries/srt/srt.SlackBuild
new file mode 100644
index 0000000000..456ec21f45
--- /dev/null
+++ b/libraries/srt/srt.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for libsrtp
+
+# copyright 2021 Nicolás Dato <nicolas.dato@gmail.com>
+# 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=srt
+VERSION=${VERSION:-1.4.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="CONTRIBUTING.md LICENSE README.md docs"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --disable-static \
+  --cmake_install_libdir=/usr/lib${LIBDIRSUFFIX} \
+  --cmake_install_bindir=/usr/bin \
+  --cmake_install_includedir=/usr/include
+
+make
+make install DESTDIR=$PKG
+
+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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/docs/*
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/srt/srt.info b/libraries/srt/srt.info
new file mode 100644
index 0000000000..5e5bfcd8fd
--- /dev/null
+++ b/libraries/srt/srt.info
@@ -0,0 +1,10 @@
+PRGNAM="srt"
+VERSION="1.4.2"
+HOMEPAGE="https://github.com/Haivision/srt"
+DOWNLOAD="https://github.com/Haivision/srt/archive/v1.4.2/srt-1.4.2.tar.gz"
+MD5SUM="6e4604f5638d222191a5eb7444d23701"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nicolas Dato"
+EMAIL="nicolas dot dato at gmail"
diff --git a/libraries/tox-extension-messages/README b/libraries/tox-extension-messages/README
new file mode 100644
index 0000000000..d9b34a94c5
--- /dev/null
+++ b/libraries/tox-extension-messages/README
@@ -0,0 +1,3 @@
+Tox Extension Messages
+
+This is part of ToxExt, an extension library for tox.
diff --git a/libraries/tox-extension-messages/slack-desc b/libraries/tox-extension-messages/slack-desc
new file mode 100644
index 0000000000..4d92b32a1f
--- /dev/null
+++ b/libraries/tox-extension-messages/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+tox-extension-messages: tox-extension-messages (extension library for tox)
+tox-extension-messages:
+tox-extension-messages: This is part of ToxExt, an extension library for tox.
+tox-extension-messages:
+tox-extension-messages: Homepage: https://github.com/toxext/tox_extension_messages
+tox-extension-messages:
+tox-extension-messages:
+tox-extension-messages:
+tox-extension-messages:
+tox-extension-messages:
+tox-extension-messages:
diff --git a/desktop/dmenu2/dmenu2.SlackBuild b/libraries/tox-extension-messages/tox-extension-messages.SlackBuild
index 4f1de8103b..0f438f303a 100644
--- a/desktop/dmenu2/dmenu2.SlackBuild
+++ b/libraries/tox-extension-messages/tox-extension-messages.SlackBuild
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-# Copyright (c) 2014, Simon Bolokanov, Bulgaria <sbolokanov@abv.bg>
+# Slackware build script for tox-extension-messages
+
+# Copyright 2021 Dr. Martin Rogge
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Симон Болоканов <sbolokanov@abv.bg>
-# dmenu2 v0.2 - init script - 14.09.2014
-
-PRGNAM=dmenu2
-VERSION=${VERSION:-0.2}
+PRGNAM=tox-extension-messages
+VERSION=${VERSION:-0.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +61,9 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mv ${PRGNAM//-/_}-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,26 +71,18 @@ 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 {} \;
 
-# config setup
-patch -p1 < $CWD/dmenu2-0.2-config-fix.diff
-
-make clean install \
-  OPTS="$SLKCFLAGS" \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  MANPREFIX=/usr/man \
-  X11INC=/usr/include \
-  X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \
-  DESTDIR=$PKG
+cmake . \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error" \
+  -DCMAKE_INSTALL_PREFIX=/usr
+make
+make install DESTDIR=$PKG
 
 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
 
-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 LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/tox-extension-messages/tox-extension-messages.info b/libraries/tox-extension-messages/tox-extension-messages.info
new file mode 100644
index 0000000000..125373020f
--- /dev/null
+++ b/libraries/tox-extension-messages/tox-extension-messages.info
@@ -0,0 +1,10 @@
+PRGNAM="tox-extension-messages"
+VERSION="0.0.2"
+HOMEPAGE="https://github.com/toxext/tox_extension_messages"
+DOWNLOAD="https://github.com/toxext/tox_extension_messages/archive/refs/tags/v0.0.2.tar.gz"
+MD5SUM="fcf8e98df80cbfc64c8d1de6740c247c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="toxext"
+MAINTAINER="Martin Rogge"
+EMAIL="martin_rogge@users.sourceforge.net"
diff --git a/libraries/toxext/README b/libraries/toxext/README
new file mode 100644
index 0000000000..ef5e569d51
--- /dev/null
+++ b/libraries/toxext/README
@@ -0,0 +1 @@
+ToxExt, an extension library for tox.
diff --git a/office/pdfjam/slack-desc b/libraries/toxext/slack-desc
index 8f35a106b2..432ac899a2 100644
--- a/office/pdfjam/slack-desc
+++ b/libraries/toxext/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-pdfjam: pdfjam (pdf toolkit)
-pdfjam:
-pdfjam: PDFjam is a collection of shell scripts for PDF manipulation, like
-pdfjam: joining, rotating, modifying page layout, generating printer
-pdfjam: spreads, and more.
-pdfjam:
-pdfjam: https://www2.warwick.ac.uk/fac/sci/statistics/staff/\
-pdfjam: academic-research/firth/software/pdfjam/
-pdfjam:
-pdfjam:
-pdfjam:
+toxext: toxExt (extension library for tox)
+toxext:
+toxext: This is an extension library for tox.
+toxext:
+toxext: Homepage: https://github.com/toxext/toxext
+toxext:
+toxext:
+toxext:
+toxext:
+toxext:
+toxext:
diff --git a/libraries/toxext/toxext.SlackBuild b/libraries/toxext/toxext.SlackBuild
new file mode 100644
index 0000000000..f1abef15f3
--- /dev/null
+++ b/libraries/toxext/toxext.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for toxext
+
+# Copyright 2021 Dr. Martin Rogge
+# 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=toxext
+VERSION=${VERSION:-0.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+cmake . \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error" \
+  -DCMAKE_INSTALL_PREFIX=/usr
+make
+make install DESTDIR=$PKG
+
+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 README.md DESIGN.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/toxext/toxext.info b/libraries/toxext/toxext.info
new file mode 100644
index 0000000000..01679d7e2e
--- /dev/null
+++ b/libraries/toxext/toxext.info
@@ -0,0 +1,10 @@
+PRGNAM="toxext"
+VERSION="0.0.2"
+HOMEPAGE="https://github.com/toxext/toxext"
+DOWNLOAD="https://github.com/toxext/toxext/archive/v0.0.2/toxext-0.0.2.tar.gz"
+MD5SUM="aac870f03e4e716f6716f6d47e38351c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="c-toxcore"
+MAINTAINER="Martin Rogge"
+EMAIL="martin_rogge@users.sourceforge.net"
diff --git a/libraries/tree-sitter/README b/libraries/tree-sitter/README
new file mode 100644
index 0000000000..55e7321e7f
--- /dev/null
+++ b/libraries/tree-sitter/README
@@ -0,0 +1,4 @@
+Tree-sitter is a parser generator tool and an incremental
+parsing library. It can build a concrete syntax tree for a
+source file and efficiently update the syntax tree as the
+source file is edited.
diff --git a/libraries/tree-sitter/slack-desc b/libraries/tree-sitter/slack-desc
new file mode 100644
index 0000000000..a9210f6f2f
--- /dev/null
+++ b/libraries/tree-sitter/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+tree-sitter: tree-sitter (parser generator)
+tree-sitter:
+tree-sitter: Tree-sitter is a parser generator tool and an incremental parsing
+tree-sitter: library. It can build a concrete syntax tree for a source file and
+tree-sitter: efficiently update the syntax tree as the source file is edited.
+tree-sitter:
+tree-sitter:
+tree-sitter:
+tree-sitter:
+tree-sitter:
+tree-sitter: https://github.com/tree-sitter/tree-sitter
diff --git a/libraries/tree-sitter/tree-sitter.SlackBuild b/libraries/tree-sitter/tree-sitter.SlackBuild
new file mode 100644
index 0000000000..e946d4a3a8
--- /dev/null
+++ b/libraries/tree-sitter/tree-sitter.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for tree-sitter
+
+# Copyright 2020 Julian Grinblat <julian@dotcore.co.il>
+# 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=tree-sitter
+VERSION=${VERSION:-0.17.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make
+make install DESTDIR=$PKG PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX}
+
+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
+
+# remove static library
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libtree-sitter.a
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/tree-sitter/tree-sitter.info b/libraries/tree-sitter/tree-sitter.info
new file mode 100644
index 0000000000..537171ac37
--- /dev/null
+++ b/libraries/tree-sitter/tree-sitter.info
@@ -0,0 +1,10 @@
+PRGNAM="tree-sitter"
+VERSION="0.17.3"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+DOWNLOAD="https://github.com/tree-sitter/tree-sitter/archive/0.17.3/tree-sitter-0.17.3.tar.gz"
+MD5SUM="a67232beb761df0ba4cde5f0296bd455"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/libraries/ulfius/ulfius.SlackBuild b/libraries/ulfius/ulfius.SlackBuild
index d032a145d6..5e126067f2 100644
--- a/libraries/ulfius/ulfius.SlackBuild
+++ b/libraries/ulfius/ulfius.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ulfius
-VERSION=${VERSION:-2.6.9}
+VERSION=${VERSION:-2.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/ulfius/ulfius.info b/libraries/ulfius/ulfius.info
index 7e9b4cac52..d9c85c3d40 100644
--- a/libraries/ulfius/ulfius.info
+++ b/libraries/ulfius/ulfius.info
@@ -1,8 +1,8 @@
 PRGNAM="ulfius"
-VERSION="2.6.9"
+VERSION="2.7.2"
 HOMEPAGE="https://github.com/babelouest/ulfius"
-DOWNLOAD="https://github.com/babelouest/ulfius/archive/v2.6.9/ulfius-2.6.9.tar.gz"
-MD5SUM="982f856408ad2ea68e9b25f89629b6e8"
+DOWNLOAD="https://github.com/babelouest/ulfius/archive/v2.7.2/ulfius-2.7.2.tar.gz"
+MD5SUM="88537ee9b43d180d09e165b01f7d1082"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmicrohttpd yder"
diff --git a/libraries/unibilium/unibilium.SlackBuild b/libraries/unibilium/unibilium.SlackBuild
index 3881579584..54f0ffe432 100644
--- a/libraries/unibilium/unibilium.SlackBuild
+++ b/libraries/unibilium/unibilium.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for unibilium
 
-# Copyright 2015-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2015-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unibilium
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/unibilium/unibilium.info b/libraries/unibilium/unibilium.info
index 5248642119..467e3fb902 100644
--- a/libraries/unibilium/unibilium.info
+++ b/libraries/unibilium/unibilium.info
@@ -1,8 +1,8 @@
 PRGNAM="unibilium"
-VERSION="2.1.0"
+VERSION="2.1.1"
 HOMEPAGE="https://github.com/neovim/unibilium"
-DOWNLOAD="https://github.com/neovim/unibilium/archive/v2.1.0/unibilium-2.1.0.tar.gz"
-MD5SUM="8d756e6e56f4e5255e080d20601ad3b9"
+DOWNLOAD="https://github.com/neovim/unibilium/archive/v2.1.1/unibilium-2.1.1.tar.gz"
+MD5SUM="845c59ce10150d7808ee9862fef231cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/uriparser/uriparser.SlackBuild b/libraries/uriparser/uriparser.SlackBuild
index fa1cc3fafe..a21dc230b9 100644
--- a/libraries/uriparser/uriparser.SlackBuild
+++ b/libraries/uriparser/uriparser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for uriparser
 
-# Copyright 2015-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2015-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=uriparser
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/uriparser/uriparser.info b/libraries/uriparser/uriparser.info
index a40f35ee6a..ee40e432c1 100644
--- a/libraries/uriparser/uriparser.info
+++ b/libraries/uriparser/uriparser.info
@@ -1,8 +1,8 @@
 PRGNAM="uriparser"
-VERSION="0.9.4"
+VERSION="0.9.5"
 HOMEPAGE="https://uriparser.github.io"
-DOWNLOAD="https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.4/uriparser-0.9.4.tar.xz"
-MD5SUM="3b59a825b288f0aa6be871d657ad3e23"
+DOWNLOAD="https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.xz"
+MD5SUM="e278fde505d62759aebebe7654ec7dda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="graphviz"
diff --git a/libraries/wayland/README b/libraries/wayland/README
index 6ae0b7eac6..030706f970 100644
--- a/libraries/wayland/README
+++ b/libraries/wayland/README
@@ -10,7 +10,7 @@ X servers (rootless or fullscreen) or other display servers.
 Optional Dependency
 
 Building man and html documentation is optional. If you want to build
-that, install graphviz and execute the slackbuild with 
+that, install graphviz and execute the slackbuild with
 
   GRAPHVIZ=yes ./wayland.SlackBuild
 
diff --git a/libraries/wayland/wayland.SlackBuild b/libraries/wayland/wayland.SlackBuild
index a6630d2a36..e6b1d5d903 100644
--- a/libraries/wayland/wayland.SlackBuild
+++ b/libraries/wayland/wayland.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Wayland
 
-# Copyright 2014-2017 Diniz Bortolotto <diniz.bortolotto@gmail.com>
+# Copyright 2014-2021 Diniz Bortolotto <diniz.bortolotto@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wayland
-VERSION=${VERSION:-1.18.0}
+VERSION=${VERSION:-1.19.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -102,7 +102,7 @@ if [ -z "$DISABLE_DOC" ]; then
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README TODO CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/wayland/wayland.info b/libraries/wayland/wayland.info
index 1191237ceb..0b2b19c8eb 100644
--- a/libraries/wayland/wayland.info
+++ b/libraries/wayland/wayland.info
@@ -1,8 +1,8 @@
 PRGNAM="wayland"
-VERSION="1.18.0"
+VERSION="1.19.0"
 HOMEPAGE="https://wayland.freedesktop.org/"
-DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-1.18.0.tar.xz"
-MD5SUM="23317697b6e3ff2e1ac8c5ba3ed57b65"
+DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz"
+MD5SUM="5d59ac3d8a8f4e42de2ceb8bb19dfca9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/wimlib/slack-desc b/libraries/wimlib/slack-desc
index ec0b2e780d..f6eabc30e1 100644
--- a/libraries/wimlib/slack-desc
+++ b/libraries/wimlib/slack-desc
@@ -9,7 +9,7 @@
 wimlib: wimlib (the open source Windows Imaging (WIM) library)
 wimlib:
 wimlib: wimlib is an open source, cross-platform library for creating,
-wimlib: extracting, and modifying Windows Imaging (WIM) archives. 
+wimlib: extracting, and modifying Windows Imaging (WIM) archives.
 wimlib: wimlib can be used to back up, install, or restore Windows operating
 wimlib: systems; to create customized images of Windows PE; or to archive
 wimlib: files on either Windows or UNIX/Linux.
diff --git a/libraries/wimlib/wimlib.SlackBuild b/libraries/wimlib/wimlib.SlackBuild
index fd7eeb50ea..b29eecfbe5 100644
--- a/libraries/wimlib/wimlib.SlackBuild
+++ b/libraries/wimlib/wimlib.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wimlib
-VERSION=${VERSION:-1.13.2}
+VERSION=${VERSION:-1.13.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/wimlib/wimlib.info b/libraries/wimlib/wimlib.info
index 87206d509d..7e919675ca 100644
--- a/libraries/wimlib/wimlib.info
+++ b/libraries/wimlib/wimlib.info
@@ -1,8 +1,8 @@
 PRGNAM="wimlib"
-VERSION="1.13.2"
+VERSION="1.13.3"
 HOMEPAGE="https://www.wimlib.net"
-DOWNLOAD="https://wimlib.net/downloads/wimlib-1.13.2.tar.gz"
-MD5SUM="617ffc718a8f57ff2fc4316cc1feee8e"
+DOWNLOAD="https://wimlib.net/downloads/wimlib-1.13.3.tar.gz"
+MD5SUM="cc5657d6bd5baf45662eac7c78becbbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/xblas/patches/automake.diff b/libraries/xblas/patches/automake.diff
index 79522b2cd2..d2484736c2 100644
--- a/libraries/xblas/patches/automake.diff
+++ b/libraries/xblas/patches/automake.diff
@@ -1,7 +1,7 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1,10 +1,12 @@
+@@ -1,10 +1,13 @@
  dnl Copyright (c) 2005, Regents of the University of California
 -AC_INIT(xblas, 1.0, extended_blas@cs.berkeley.edu)
 -AC_PREREQ(2.59)
@@ -15,11 +15,12 @@ diff --git a/configure.ac b/configure.ac
 +AC_CONFIG_AUX_DIR([config])
  AC_CANONICAL_TARGET
 +AM_INIT_AUTOMAKE([foreign subdir-objects])
-+LT_INIT
++AM_SILENT_RULES([yes])
++LT_INIT([disable-static])
  
  AC_PROG_CC
  
-@@ -148,6 +150,6 @@
+@@ -148,6 +151,6 @@
                     [$M4 $M4_OPTS Makefile.m4 >Makefile], [M4=$M4; M4_OPTS="$M4_OPTS"])
  
  AC_SUBST(EXTRA_LIBS, $EXTRA_LIBS)
diff --git a/libraries/xblas/xblas.SlackBuild b/libraries/xblas/xblas.SlackBuild
index edd20a8cfe..1e02069fe5 100644
--- a/libraries/xblas/xblas.SlackBuild
+++ b/libraries/xblas/xblas.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for XBLAS
 
-# Copyright 2017 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2017-2021 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=xblas
 VERSION=${VERSION:-1.0.248}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -37,7 +37,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="LICENSE README* doc/report.ps"
@@ -65,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
@@ -85,8 +85,6 @@ autoreconf -vif
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-shared \
-  --disable-static \
   --disable-dependency-tracking \
   --build=$ARCH-slackware-linux \
   CFLAGS="$SLKCFLAGS" \
diff --git a/libraries/xblas/xblas.info b/libraries/xblas/xblas.info
index 3d01dad8ae..8fb3ef025e 100644
--- a/libraries/xblas/xblas.info
+++ b/libraries/xblas/xblas.info
@@ -1,7 +1,7 @@
 PRGNAM="xblas"
 VERSION="1.0.248"
-HOMEPAGE="http://www.netlib.org/xblas/"
-DOWNLOAD="http://www.netlib.org/xblas/xblas.tar.gz"
+HOMEPAGE="https://www.netlib.org/xblas/"
+DOWNLOAD="https://www.netlib.org/xblas/xblas-1.0.248.tar.gz"
 MD5SUM="990c680fb5e446bb86c10936e4cd7f88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/xforms/xforms-1.2.4-fno-common.patch b/libraries/xforms/xforms-1.2.4-fno-common.patch
new file mode 100644
index 0000000000..fd4ca7714f
--- /dev/null
+++ b/libraries/xforms/xforms-1.2.4-fno-common.patch
@@ -0,0 +1,40 @@
+Description: Fix FTBFS with GCC 10
+Author: Paul Wise <pabs@debian.org>
+Bug-Debian: https://bugs.debian.org/957439
+Origin: upstream, extracted from two separate commits:
+ https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=9806bce102d0c079c2c486b25ae6bdac3c98eecf
+ https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=2c1a9f151baf50887a517280645ec23379fb96f8
+--- a/fdesign/sp_spinner.c
++++ b/fdesign/sp_spinner.c
+@@ -29,7 +29,7 @@
+ #include "spec/spinner_spec.h"
+ 
+ static FD_spinnerattrib * spn_attrib;
+-FL_OBJECT *curobj;
++static FL_OBJECT *curobj;
+ 
+ 
+ /***************************************
+--- a/fdesign/sp_twheel.c
++++ b/fdesign/sp_twheel.c
+@@ -38,7 +38,7 @@
+ #include "spec/twheel_spec.h"
+ 
+ static FD_twheelattrib * twheel_attrib;
+-FL_OBJECT * curobj;
++static FL_OBJECT * curobj;
+ 
+ 
+ /***************************************
+--- a/lib/objects.c
++++ b/lib/objects.c
+@@ -36,6 +36,9 @@
+ 
+ #define TRANSLATE_Y( obj, form )    ( form->h - obj->h - obj->y )
+ 
++extern FL_OBJECT * fli_handled_obj;        /*  defined in  events.c */
++extern FL_OBJECT * fli_handled_parent;     /*  defined in  events.c */
++
+ extern FL_FORM * fli_fast_free_object;     /* defined in forms.c */
+ 
+ extern FL_OBJECT * fli_handled_obj;        /* defined in  events.c */
diff --git a/libraries/xforms/xforms.SlackBuild b/libraries/xforms/xforms.SlackBuild
index 989a8aff16..49b291f8d3 100644
--- a/libraries/xforms/xforms.SlackBuild
+++ b/libraries/xforms/xforms.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2009-2014  LukenShiro, Italy
 # All rights reserved.
-# Copyright 2019  Christoph Willing,  Brisbane Australia
+# Copyright 2019-2021  Christoph Willing,  Brisbane/Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PRGNAM=xforms
 VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+patch -p1 < $CWD/xforms-1.2.4-fno-common.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/xmlsec/xmlsec.SlackBuild b/libraries/xmlsec/xmlsec.SlackBuild
index c98cda8167..6baaaee5fb 100644
--- a/libraries/xmlsec/xmlsec.SlackBuild
+++ b/libraries/xmlsec/xmlsec.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xmlsec
 
-# Copyright 2014-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=xmlsec
 SRCNAM=xmlsec1
-VERSION=${VERSION:-1.2.30}
+VERSION=${VERSION:-1.2.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/xmlsec/xmlsec.info b/libraries/xmlsec/xmlsec.info
index 8d9625ab17..79fa175e41 100644
--- a/libraries/xmlsec/xmlsec.info
+++ b/libraries/xmlsec/xmlsec.info
@@ -1,8 +1,8 @@
 PRGNAM="xmlsec"
-VERSION="1.2.30"
+VERSION="1.2.31"
 HOMEPAGE="https://www.aleksey.com/xmlsec/"
-DOWNLOAD="https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz"
-MD5SUM="b66ec21e0a0ac331afb4b1bc5c9ef966"
+DOWNLOAD="https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.31.tar.gz"
+MD5SUM="182f5cbdfb8ddbac535c04470c170dc3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/yder/yder.SlackBuild b/libraries/yder/yder.SlackBuild
index 0dafb397f0..072428c62a 100644
--- a/libraries/yder/yder.SlackBuild
+++ b/libraries/yder/yder.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yder
-VERSION=${VERSION:-1.4.12}
+VERSION=${VERSION:-1.4.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/yder/yder.info b/libraries/yder/yder.info
index bf66b5327d..1e4b3e94a2 100644
--- a/libraries/yder/yder.info
+++ b/libraries/yder/yder.info
@@ -1,8 +1,8 @@
 PRGNAM="yder"
-VERSION="1.4.12"
+VERSION="1.4.13"
 HOMEPAGE="https://github.com/babelouest/yder"
-DOWNLOAD="https://github.com/babelouest/yder/archive/v1.4.12/yder-1.4.12.tar.gz"
-MD5SUM="3060af78b225c12220313239c4f157f3"
+DOWNLOAD="https://github.com/babelouest/yder/archive/v1.4.13/yder-1.4.13.tar.gz"
+MD5SUM="20b80d47d050dec05d2cb38af7069f7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="orcania"
diff --git a/libraries/zeromq/zeromq.SlackBuild b/libraries/zeromq/zeromq.SlackBuild
index 5997bed102..f1f469b7d3 100644
--- a/libraries/zeromq/zeromq.SlackBuild
+++ b/libraries/zeromq/zeromq.SlackBuild
@@ -4,7 +4,7 @@
 
 # Written by Patrick Pippen (dabittweiler@gmail.com)
 
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zeromq
-VERSION=${VERSION:-4.3.3}
+VERSION=${VERSION:-4.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/zeromq/zeromq.info b/libraries/zeromq/zeromq.info
index 4af59c7cbd..02481233b5 100644
--- a/libraries/zeromq/zeromq.info
+++ b/libraries/zeromq/zeromq.info
@@ -1,8 +1,8 @@
 PRGNAM="zeromq"
-VERSION="4.3.3"
+VERSION="4.3.4"
 HOMEPAGE="http://www.zeromq.org/"
-DOWNLOAD="https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"
-MD5SUM="78acc277d95e10812d71b2b3c3c3c9a9"
+DOWNLOAD="https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz"
+MD5SUM="c897d4005a3f0b8276b00b7921412379"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/zimg/README b/libraries/zimg/README
new file mode 100644
index 0000000000..f19101d38d
--- /dev/null
+++ b/libraries/zimg/README
@@ -0,0 +1,8 @@
+The "z" library implements the commonly required image processing
+basics of scaling, colorspace conversion, and depth conversion. A
+simple API enables conversion between any supported formats to operate
+with minimal knowledge from the programmer. All library routines
+were designed from the ground-up with correctness, flexibility, and
+thread-safety as first priorities. Allocation, buffering, and I/O are
+cleanly separated from processing, allowing the programmer to adapt
+"z" to many scenarios.
diff --git a/libraries/zimg/slack-desc b/libraries/zimg/slack-desc
new file mode 100644
index 0000000000..e44f7af219
--- /dev/null
+++ b/libraries/zimg/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+zimg: zimg (Scaling, colorspace conversion, and dithering library)
+zimg:
+zimg: The "z" library implements the commonly required image processing
+zimg: basics of scaling, colorspace conversion, and depth conversion.
+zimg:
+zimg: Homepage: https://github.com/sekrit-twc/zimg
+zimg:
+zimg:
+zimg:
+zimg:
+zimg:
diff --git a/libraries/zimg/zimg.SlackBuild b/libraries/zimg/zimg.SlackBuild
new file mode 100644
index 0000000000..b939fa1f10
--- /dev/null
+++ b/libraries/zimg/zimg.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for zimg
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=zimg
+VERSION=${VERSION:-3.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-release-$VERSION
+tar xvf $CWD/$PRGNAM-release-$VERSION.tar.gz
+cd $PRGNAM-release-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+autoreconf -fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/zimg/zimg.info b/libraries/zimg/zimg.info
new file mode 100644
index 0000000000..72906b4e66
--- /dev/null
+++ b/libraries/zimg/zimg.info
@@ -0,0 +1,10 @@
+PRGNAM="zimg"
+VERSION="3.0.1"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+DOWNLOAD="https://github.com/sekrit-twc/zimg/archive/release-3.0.1/zimg-release-3.0.1.tar.gz"
+MD5SUM="b14d551f13819314e9733a400da04121"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/libraries/zint/zint.SlackBuild b/libraries/zint/zint.SlackBuild
index 7811381a9b..d04e9c4acc 100644
--- a/libraries/zint/zint.SlackBuild
+++ b/libraries/zint/zint.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zint
-VERSION=${VERSION:-2.6.5}
+VERSION=${VERSION:-2.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,8 +60,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-src.tar.?z
+mv $PRGNAM-$VERSION-src $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/zint/zint.info b/libraries/zint/zint.info
index 7072c03f50..23371b5c9b 100644
--- a/libraries/zint/zint.info
+++ b/libraries/zint/zint.info
@@ -1,8 +1,8 @@
 PRGNAM="zint"
-VERSION="2.6.5"
+VERSION="2.9.1"
 HOMEPAGE="https://sourceforge.net/projects/zint/"
-DOWNLOAD="https://downloads.sourceforge.net/project/zint/zint/2.6.5/zint-2.6.5.tar.gz"
-MD5SUM="a05771402a37081b9342bb404a38ef53"
+DOWNLOAD="https://downloads.sourceforge.net/project/zint/zint/2.9.1/zint-2.9.1-src.tar.gz"
+MD5SUM="00511707a3b80023b97a6a79c9b145f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/zmusic/README b/libraries/zmusic/README
new file mode 100644
index 0000000000..d54cba44f2
--- /dev/null
+++ b/libraries/zmusic/README
@@ -0,0 +1,9 @@
+zmusic (library for music support in games)
+
+ZMusic is GZDoom's music system separated as a stand-alone music
+library, providing a unified interface for its components.
+
+Note: Technically, fluidsynth is optional, but it's *very* highly
+recommended. I've listed it as required, for the convenience of
+sbopkg/sbotools users. If you're reading this, you are not a robot,
+and you can make up your own mind.
diff --git a/libraries/libaom/slack-desc b/libraries/zmusic/slack-desc
index 59c23736e0..73661cb029 100644
--- a/libraries/libaom/slack-desc
+++ b/libraries/zmusic/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-libaom: libaom (Open Source Video Codec)
-libaom:
-libaom: AOMedia Video 1 (AV1) is designed to be the successor to VP9 and
-libaom: also to eventually be a direct competitor for HEVC/H.265.
-libaom: This Slackbuild builds the 'reference' encoder aomenc as well as
-libaom: the 'reference' decoder aomdec.
-libaom:
-libaom: Homepage: https://aomedia.googlesource.com/aom
-libaom:
-libaom:
-libaom:
+zmusic: zmusic (library for music support in games)
+zmusic:
+zmusic: ZMusic is GZDoom's music system separated as a stand-alone music
+zmusic: library, providing a unified interface for its components.
+zmusic:
+zmusic:
+zmusic:
+zmusic:
+zmusic:
+zmusic:
+zmusic:
diff --git a/libraries/zmusic/zmusic.SlackBuild b/libraries/zmusic/zmusic.SlackBuild
new file mode 100644
index 0000000000..a19bc58c72
--- /dev/null
+++ b/libraries/zmusic/zmusic.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackware build script for zmusic
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20201109 bkw: updated for v1.1.4
+# 20201003 bkw: added at v1.1.3
+
+PRGNAM=zmusic
+VERSION=${VERSION:-1.1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=ZMusic
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# You're in a maze of twisty licenses, all slightly different.
+cp -a licenses/* $PKG/usr/doc/$PRGNAM-$VERSION
+# There's no other documentation at all, so include our own README
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/zmusic/zmusic.info b/libraries/zmusic/zmusic.info
new file mode 100644
index 0000000000..060ae3cb51
--- /dev/null
+++ b/libraries/zmusic/zmusic.info
@@ -0,0 +1,10 @@
+PRGNAM="zmusic"
+VERSION="1.1.4"
+HOMEPAGE="https://github.com/coelckers/ZMusic"
+DOWNLOAD="https://github.com/coelckers/ZMusic/archive/1.1.4/ZMusic-1.1.4.tar.gz"
+MD5SUM="f37fc39680295bf7b23f816bbf79c60a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fluidsynth"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/misc/KeePass/KeePass.SlackBuild b/misc/KeePass/KeePass.SlackBuild
index 0e1617e1a3..f47c940d85 100644
--- a/misc/KeePass/KeePass.SlackBuild
+++ b/misc/KeePass/KeePass.SlackBuild
@@ -19,7 +19,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=KeePass
-VERSION=${VERSION:-2.46}
+VERSION=${VERSION:-2.47}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/KeePass/KeePass.info b/misc/KeePass/KeePass.info
index ac8ee4430e..0ece240393 100644
--- a/misc/KeePass/KeePass.info
+++ b/misc/KeePass/KeePass.info
@@ -1,8 +1,8 @@
 PRGNAM="KeePass"
-VERSION="2.46"
+VERSION="2.47"
 HOMEPAGE="https://keepass.info/"
-DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.46-Source.zip"
-MD5SUM="7caecfcc2d15dc7ec1b90256da527836"
+DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.47-Source.zip"
+MD5SUM="7955b3b563317f69e5b014014b69020a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mono"
diff --git a/misc/asterixInspector/README b/misc/asterixInspector/README
index 5aa08bea2f..95b2738c33 100644
--- a/misc/asterixInspector/README
+++ b/misc/asterixInspector/README
@@ -1,4 +1,5 @@
-AsterixInspector is a tool to display contents of Asterix data files. Asterix
-is a binary format for information exchange in aviation. The Asterix standard
-specification is being developed and endorsed by Eurocontrol, specification
-documents are available at http://www.eurocontrol.int/asterix.
+AsterixInspector is a tool to display contents of Asterix data files.
+Asterix is a binary format for information exchange in aviation. The
+Asterix standard specification is being developed and endorsed by
+Eurocontrol, specification documents are available at
+http://www.eurocontrol.int/asterix.
diff --git a/misc/asterixInspector/asterixInspector.SlackBuild b/misc/asterixInspector/asterixInspector.SlackBuild
index be183832d8..c5926b2199 100644
--- a/misc/asterixInspector/asterixInspector.SlackBuild
+++ b/misc/asterixInspector/asterixInspector.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for asterixInspector
 
-# Copyright 2012, 2013, 2018, 2019, 2020  Chris Abela, Malta
+# Copyright 2012, 2013, 2018, 2019, 2020, 2021  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, ryanpcmcquen@member.fsf.org, WA
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asterixInspector
-VERSION=${VERSION:-0.12.4}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/asterixInspector/asterixInspector.info b/misc/asterixInspector/asterixInspector.info
index d5219019b2..e328f6759c 100644
--- a/misc/asterixInspector/asterixInspector.info
+++ b/misc/asterixInspector/asterixInspector.info
@@ -1,8 +1,8 @@
 PRGNAM="asterixInspector"
-VERSION="0.12.4"
+VERSION="0.13.1"
 HOMEPAGE="http://asterix.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/asterix/files/asterixInspector-0.12.4.tar.bz2"
-MD5SUM="9f2296ad1a30aa4bd36de7a8a5e589f7"
+DOWNLOAD="http://sourceforge.net/projects/asterix/files/asterixInspector-0.13.1.tar.bz2"
+MD5SUM="50977af54b1ebb51c540f31df67becdf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5-webkit qt5"
diff --git a/misc/cp437/README b/misc/cp437/README
new file mode 100644
index 0000000000..1411d39e7b
--- /dev/null
+++ b/misc/cp437/README
@@ -0,0 +1,13 @@
+cp437 (emulate code page 437 on a UTF-8 terminal)
+
+cp437 is a program to emulate an old-style "code page 437" / "IBM-PC"
+character set terminal on a modern terminal emulator that uses UTF-8
+or similar.
+
+It was written for the purpose of running the BitchX IRC client,
+which utilises CP437 line-drawing characters in its default theme and
+artwork. It should also be broadly useful for things like viewing
+CP437 "ANSI art", running nethack with the IBMgraphics option or
+running EPIC with scripts that use CP437 artwork.
+
+It's also useful for converting old CP437-encoded text files to UTF-8.
diff --git a/misc/cp437/cp437.1 b/misc/cp437/cp437.1
new file mode 100644
index 0000000000..688d6d3f64
--- /dev/null
+++ b/misc/cp437/cp437.1
@@ -0,0 +1,90 @@
+.\" Man page generated from reStructuredText.
+.
+.TH CP437 1 "2020-11-25" "0.6" "SlackBuilds.org"
+.SH NAME
+cp437 \- emulate code page 437 on a UTF-8 terminal
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for cp437(1) man page. Convert with:
+.
+.\" rst2man.py cp437.rst > cp437.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+cp437 \fBcommand\fP [\fIarg\fP [\fIarg\fP ...]]
+.SH DESCRIPTION
+.sp
+cp437 is a program to emulate an old\-style "code page 437" / "IBM\-PC"
+character set terminal on a modern terminal emulator that uses UTF\-8
+or similar.
+.sp
+It was written for the purpose of running the BitchX IRC client, which utilises
+CP437 line\-drawing characters in its default theme and artwork.  It should
+also be broadly useful for things like viewing CP437 "ANSI art", running
+nethack with the IBMgraphics option or running EPIC with scripts that use CP437
+artwork.
+.sp
+It takes no command line options. The only arguments are the command to run
+and its arguments (if any).
+.sp
+You\(aqll need to have your LANG or LC_CTYPE environment variable
+set up to match the character set used by your terminal
+emulator. On Slackware, this can be done system\-wide by editing
+\fB/etc/profile.d/lang.sh\fP, or by editing your shell\(aqs startup scripts
+(e.g. \fB~/.bash_profile\fP).
+.SH EXAMPLES
+.sp
+Just run cp437 followed by the command and argument you want to run:
+.INDENT 0.0
+.INDENT 3.5
+cp437 BitchX irc.efnet.org
+.UNINDENT
+.UNINDENT
+.sp
+To convert a text file from codepage 437, you might try:
+.INDENT 0.0
+.INDENT 3.5
+cp437 cat orig.txt > converted.txt
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/cp437\-0.6/COPYRIGHT for license information.
+.SH AUTHORS
+.sp
+cp437 was written by Kevin Easton.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The cp437 homepage: \fI\%https://github.com/keaston/cp437\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/misc/cp437/cp437.SlackBuild b/misc/cp437/cp437.SlackBuild
new file mode 100644
index 0000000000..64e137a319
--- /dev/null
+++ b/misc/cp437/cp437.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Slackware build script for cp437
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=cp437
+VERSION=${VERSION:-0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make CFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+install -s -m0755 $PRGNAM $PKG/usr/bin
+
+# man page by SlackBuild author, made mostly from README
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYRIGHT $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/cp437/cp437.info b/misc/cp437/cp437.info
new file mode 100644
index 0000000000..91933a7636
--- /dev/null
+++ b/misc/cp437/cp437.info
@@ -0,0 +1,10 @@
+PRGNAM="cp437"
+VERSION="0.6"
+HOMEPAGE="https://github.com/keaston/cp437"
+DOWNLOAD="https://github.com/keaston/cp437/archive/v0.6/cp437-0.6.tar.gz"
+MD5SUM="c2817f18160ed1580f2e393ae656a690"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/misc/cp437/cp437.rst b/misc/cp437/cp437.rst
new file mode 100644
index 0000000000..88ebaa921c
--- /dev/null
+++ b/misc/cp437/cp437.rst
@@ -0,0 +1,75 @@
+.. RST source for cp437(1) man page. Convert with:
+..   rst2man.py cp437.rst > cp437.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.6
+.. |date| date::
+
+=====
+cp437
+=====
+
+-----------------------------------------
+emulate code page 437 on a UTF-8 terminal
+-----------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+cp437 **command** [*arg* [*arg* ...]]
+
+DESCRIPTION
+===========
+
+cp437 is a program to emulate an old-style "code page 437" / "IBM-PC"
+character set terminal on a modern terminal emulator that uses UTF-8
+or similar.
+
+It was written for the purpose of running the BitchX IRC client, which utilises
+CP437 line-drawing characters in its default theme and artwork.  It should
+also be broadly useful for things like viewing CP437 "ANSI art", running
+nethack with the IBMgraphics option or running EPIC with scripts that use CP437
+artwork.
+
+It takes no command line options. The only arguments are the command to run
+and its arguments (if any).
+
+You'll need to have your LANG or LC_CTYPE environment variable
+set up to match the character set used by your terminal
+emulator. On Slackware, this can be done system-wide by editing
+**/etc/profile.d/lang.sh**, or by editing your shell's startup scripts
+(e.g. **~/.bash_profile**).
+
+EXAMPLES
+========
+
+Just run cp437 followed by the command and argument you want to run:
+
+  cp437 BitchX irc.efnet.org
+
+To convert a text file from codepage 437, you might try:
+
+  cp437 cat orig.txt > converted.txt
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/cp437-|version|/COPYRIGHT for license information.
+
+AUTHORS
+=======
+
+cp437 was written by Kevin Easton.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The cp437 homepage: https://github.com/keaston/cp437
diff --git a/misc/cp437/slack-desc b/misc/cp437/slack-desc
new file mode 100644
index 0000000000..92074cd73a
--- /dev/null
+++ b/misc/cp437/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+cp437: cp437 (emulate code page 437 on a UTF-8 terminal)
+cp437:
+cp437: cp437 is a program to emulate an old-style "code page 437" / "IBM-PC"
+cp437: character set terminal on a modern terminal emulator that uses UTF-8
+cp437: or similar.
+cp437:
+cp437: It's also useful for converting old CP437-encoded text files to UTF-8.
+cp437:
+cp437:
+cp437:
+cp437:
diff --git a/misc/deroff/README b/misc/deroff/README
new file mode 100644
index 0000000000..21c6e8425d
--- /dev/null
+++ b/misc/deroff/README
@@ -0,0 +1,5 @@
+deroff (remove *roff markup from text files)
+
+This is a free implementation of the standard UNIX command deroff,
+which removes roff constructs from documents for the purpose of
+indexing, spell checking etc.
diff --git a/misc/deroff/deroff.SlackBuild b/misc/deroff/deroff.SlackBuild
new file mode 100644
index 0000000000..40916b1754
--- /dev/null
+++ b/misc/deroff/deroff.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for deroff
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=deroff
+VERSION=${VERSION:-2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# old configure script, doesn't support --docdir, --prefix is broken, ugh.
+# it's too old for autoreconf to generate a new one, even
+CFLAGS="$SLKCFLAGS -Wl,-s" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir='${prefix}'/man \
+  --build=$ARCH-slackware-linux
+
+make
+
+# convert german man page to utf-8 before installing
+iconv -f iso-8859-1 -t utf-8 < $PRGNAM.1.de > $PRGNAM.1.de.new
+mv $PRGNAM.1.de.new $PRGNAM.1.de
+
+make install prefix=$PKG/usr
+gzip -9 $PKG/usr/man/man?/*.? $PKG/usr/man/*/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/deroff/deroff.info b/misc/deroff/deroff.info
new file mode 100644
index 0000000000..150b3d2123
--- /dev/null
+++ b/misc/deroff/deroff.info
@@ -0,0 +1,10 @@
+PRGNAM="deroff"
+VERSION="2.0"
+HOMEPAGE="http://www.moria.de/~michael/deroff/"
+DOWNLOAD="http://www.moria.de/~michael/deroff/deroff-2.0.tar.gz"
+MD5SUM="dcc4ce030ca719a36f34b01c8afebfda"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/misc/deroff/slack-desc b/misc/deroff/slack-desc
new file mode 100644
index 0000000000..3e83bf8580
--- /dev/null
+++ b/misc/deroff/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+deroff: deroff (remove *roff markup from text files)
+deroff:
+deroff: This is a free implementation of the standard UNIX command deroff,
+deroff: which removes roff constructs from documents for the purpose of
+deroff: indexing, spell checking etc.
+deroff:
+deroff:
+deroff:
+deroff:
+deroff:
+deroff:
diff --git a/misc/font-unscii/README b/misc/font-unscii/README
index aeb8de42fa..35665dd930 100644
--- a/misc/font-unscii/README
+++ b/misc/font-unscii/README
@@ -4,7 +4,8 @@ Unscii is a set of bitmapped Unicode fonts based on classic system
 fonts. Unscii attempts to support character cell art well while also
 being suitable for terminal and programming use.
 
-The package include PCF, TTF, and OTF fonts for use with X. No console
-(PSF) fonts are included: These fonts have over 2500 glyphs each, but the
-console only supports 512 glyphs per font. Most of the special character
-art glyphs would have to be omitted from a console conversion.
+The package include PCF, TTF, and OTF fonts for use with X. No
+console (PSF) fonts are included: These fonts have over 2500 glyphs
+each, but the console only supports 512 glyphs per font. Most of the
+special character art glyphs would have to be omitted from a console
+conversion.
diff --git a/misc/font-unscii/font-unscii.SlackBuild b/misc/font-unscii/font-unscii.SlackBuild
index bec06c651c..806f0bc9bd 100644
--- a/misc/font-unscii/font-unscii.SlackBuild
+++ b/misc/font-unscii/font-unscii.SlackBuild
@@ -6,8 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210326 bkw: updated for v2.1, reflow README, new homepage/download
+
 PRGNAM=font-unscii
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
diff --git a/misc/font-unscii/font-unscii.info b/misc/font-unscii/font-unscii.info
index e3f4085332..97ce21f477 100644
--- a/misc/font-unscii/font-unscii.info
+++ b/misc/font-unscii/font-unscii.info
@@ -1,8 +1,8 @@
 PRGNAM="font-unscii"
-VERSION="2.0"
-HOMEPAGE="http://pelulamu.net/unscii/"
-DOWNLOAD="http://pelulamu.net/unscii/unscii-2.0-src.tar.gz"
-MD5SUM="3902d8f56e48782778ae9676803ec864"
+VERSION="2.1"
+HOMEPAGE="http://viznut.fi/unscii/"
+DOWNLOAD="http://viznut.fi/unscii/unscii-2.1-src.tar.gz"
+MD5SUM="b171f5552b7503588d985edbba27a1b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fontforge perl-Text-CharWidth"
diff --git a/misc/ghostpcl/compile_fix.patch b/misc/ghostpcl/compile_fix.patch
new file mode 100644
index 0000000000..8e1172408d
--- /dev/null
+++ b/misc/ghostpcl/compile_fix.patch
@@ -0,0 +1,11 @@
+diff -urN ghostpdl-9.54.0/tesseract/src/ccutil/strngs.h ghostpdl/tesseract/src/ccutil/strngs.h
+--- ghostpdl-9.54.0/tesseract/src/ccutil/strngs.h	2021-03-22 13:05:59.000000000 +0200
++++ ghostpdl/tesseract/src/ccutil/strngs.h	2021-04-01 17:22:19.653876318 +0300
+@@ -35,6 +35,7 @@
+ class STRING : public std::string {
+  public:
+   using std::string::string;
++  STRING() : std::string() {}
+   STRING(const std::string &s) : std::string(s) {}
+   STRING(const char *s) : std::string(s ? s : "") {}
+ 
diff --git a/misc/ghostpcl/ghostpcl.SlackBuild b/misc/ghostpcl/ghostpcl.SlackBuild
index 6aac065593..26cf227cd7 100644
--- a/misc/ghostpcl/ghostpcl.SlackBuild
+++ b/misc/ghostpcl/ghostpcl.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=ghostpcl
 SRCNAM=ghostpdl
-VERSION=${VERSION:-9.53.3}
+VERSION=${VERSION:-9.54.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +70,8 @@ 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 {} \;
 
+patch -p1 < $CWD/compile_fix.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/misc/ghostpcl/ghostpcl.info b/misc/ghostpcl/ghostpcl.info
index e8700fd5b5..d4d566c5b8 100644
--- a/misc/ghostpcl/ghostpcl.info
+++ b/misc/ghostpcl/ghostpcl.info
@@ -1,8 +1,8 @@
 PRGNAM="ghostpcl"
-VERSION="9.53.3"
+VERSION="9.54.0"
 HOMEPAGE="https://www.ghostscript.com"
-DOWNLOAD="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/ghostpdl-9.53.3.tar.gz"
-MD5SUM="4813ae6bf64618452f21c70e5cd32f47"
+DOWNLOAD="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostpdl-9.54.0.tar.gz"
+MD5SUM="25de435bce3ddb370a86ddf9b7f090da"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/git-store-meta/README b/misc/git-store-meta/README
new file mode 100644
index 0000000000..93b5e48700
--- /dev/null
+++ b/misc/git-store-meta/README
@@ -0,0 +1,22 @@
+git-store-meta is a light-weight tool for file metadata storing and
+applying for Git.
+
+Features:
+
+- Light dependency, cross-platform consistent behavior,
+  desirable performance.
+- Data files are in plain text format and can be easily revisioned,
+  diffed, or manually modified as needed.
+- Supported metadata: mtime, atime, mode, user, uid, group, gid, acl.
+- Can store the metadata of git-revisioned files into a data file.
+- Can apply the metadata stored in the data file to the working copy.
+- Can update the metadata for changed files quickly.
+- Can easily pick which metadata fields to store, update, or apply.
+- Can determine whether to store, update, or apply directory metadata.
+
+Note:
+
+  The binary is installed under the name "git-store-meta". Use it
+  instead of "git-store-meta.pl" when reading online docs or in Git
+  hooks. The `--install` switch already knows to use "git-store-meta"
+  and will create correct hooks without any further action required.
diff --git a/misc/git-store-meta/change-name-in-git-hooks.patch b/misc/git-store-meta/change-name-in-git-hooks.patch
new file mode 100644
index 0000000000..429d36c877
--- /dev/null
+++ b/misc/git-store-meta/change-name-in-git-hooks.patch
@@ -0,0 +1,21 @@
+commit 95bce8afd6973b00232f3cb7cc286d3994a07a13
+Author: Andrzej Telszewski <atelszewski@gmail.com>
+Date:   Sat Oct 24 12:51:20 2020 +0200
+
+    Change how git-store-meta is called from Git hooks
+    
+    Call `git-store-meta` instead of `git-store-meta.pl`.
+
+diff --git a/git-store-meta.pl b/git-store-meta.pl
+index ddc0024..b0d0d37 100755
+--- a/git-store-meta.pl
++++ b/git-store-meta.pl
+@@ -600,7 +600,7 @@ sub install_hooks {
+     my $mask = umask; if (!defined($mask)) { $mask = 0022; }
+     my $mode = 0777 & ~$mask;
+     my $t;
+-    my $s = escapeshellarg($GIT_STORE_META_APP . ".pl");
++    my $s = escapeshellarg($GIT_STORE_META_APP);
+     my $f = defined($argv{'target'}) ? " -t " . escapeshellarg($argv{'target'}) : "";
+     my $f2 = escapeshellarg(defined($argv{'target'}) ? $argv{'target'} : $GIT_STORE_META_FILENAME);
+ 
diff --git a/misc/git-store-meta/fix-storing-group-name.patch b/misc/git-store-meta/fix-storing-group-name.patch
new file mode 100644
index 0000000000..13bb8718c1
--- /dev/null
+++ b/misc/git-store-meta/fix-storing-group-name.patch
@@ -0,0 +1,33 @@
+commit e9a545ae7f45ea2b8b031457ffeeb7ec69cac41d
+Author: Andrzej Telszewski <atelszewski@gmail.com>
+Date:   Sat Oct 24 12:27:13 2020 +0200
+
+    Fix that the 'group' name is not correctly stored
+    
+    Fix that the 'group' name is not correctly stored in '.git_store_meta'.
+    
+    The reason for the error is that `getpwuid()` is used instead of
+    `getgrgid()` when retreiving group information.
+
+diff --git a/git-store-meta.pl b/git-store-meta.pl
+index ddc0024..c7ef50a 100755
+--- a/git-store-meta.pl
++++ b/git-store-meta.pl
+@@ -473,7 +473,7 @@ sub getfacl_internal {
+         }
+         if (defined $acl{'group'}) {
+             foreach my $gid (keys %{$acl{'group'}}) {
+-                my $group = getpwuid($gid);
++                my $group = getgrgid($gid);
+                 $group = defined($group) ? $group : $gid;
+                 push(@results, "group:$group:" . getfacl_internal_getperms(\%{$acl{'group'}{$gid}}));
+             }
+@@ -758,7 +758,7 @@ sub get_file_metadata {
+             my $user = getpwuid($uid);
+             push(@rec, $user || "");
+         } elsif ($_ eq "group") {
+-            my $group = getpwuid($gid);
++            my $group = getgrgid($gid);
+             push(@rec, $group || "");
+         } elsif ($_ eq "acl") {
+             push(@rec, &$getfacl($file));
diff --git a/misc/git-store-meta/git-store-meta.SlackBuild b/misc/git-store-meta/git-store-meta.SlackBuild
new file mode 100644
index 0000000000..7df1e09f11
--- /dev/null
+++ b/misc/git-store-meta/git-store-meta.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Slackware build script for git-store-meta
+
+# Copyright 2020 Andrzej Telszewski, Szczecin
+# 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=git-store-meta
+VERSION=${VERSION:-2.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+chmod -R a-st,u+rwX,go-w+rX .
+
+patch -p1 -i $CWD/fix-storing-group-name.patch
+patch -p1 -i $CWD/change-name-in-git-hooks.patch
+
+mv $PRGNAM.pl ${PRGNAM}
+
+# Based on https://aur.archlinux.org/packages/git-store-meta/
+
+sed -i $PRGNAM   -e "s|$PRGNAM\.pl|$PRGNAM|g"
+sed -i README.md -e "s|$PRGNAM\.pl|$PRGNAM|g"
+
+chmod 0755 $PRGNAM
+
+mkdir -p $PKG/usr/bin
+cp $PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/git-store-meta/git-store-meta.info b/misc/git-store-meta/git-store-meta.info
new file mode 100644
index 0000000000..3ed5a7c000
--- /dev/null
+++ b/misc/git-store-meta/git-store-meta.info
@@ -0,0 +1,10 @@
+PRGNAM="git-store-meta"
+VERSION="2.1.2"
+HOMEPAGE="https://github.com/danny0838/git-store-meta"
+DOWNLOAD="https://github.com/danny0838/git-store-meta/archive/2.1.2/git-store-meta-2.1.2.tar.gz"
+MD5SUM="1c7c55c15c19ca1b74a55a813a7a07a2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/misc/git-store-meta/slack-desc b/misc/git-store-meta/slack-desc
new file mode 100644
index 0000000000..c1f02f6507
--- /dev/null
+++ b/misc/git-store-meta/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+git-store-meta: git-store-meta (file metadata storing and applying for Git)
+git-store-meta:
+git-store-meta: git-store-meta is a light-weight tool for file metadata storing and
+git-store-meta: applying for Git.
+git-store-meta:
+git-store-meta: Homepage: https://github.com/danny0838/git-store-meta
+git-store-meta:
+git-store-meta:
+git-store-meta:
+git-store-meta:
+git-store-meta:
diff --git a/misc/heyu/README b/misc/heyu/README
index db119f7b36..013a5e0800 100644
--- a/misc/heyu/README
+++ b/misc/heyu/README
@@ -1,15 +1,17 @@
-This program operates an X10 module via a CM11A computer interface. It is
-based on the program X10 by Larry Cambell as modified by Paul Fox. All but a
-few functions have been changed enough that they no longer interwork with
-the original. I think this justifies issuing the program as 'heyu' instead
-of 'x10'.
+heyu (X10 module controller software)
 
-The program is strictly command line driven, and works well with crontab.
-Crontab can be used to schedule events. You can also upload timers and
-macros to the CM11's memory.
+This program operates an X10 module via a CM11A computer interface.
+It's based on the program X10 by Larry Cambell as modified by Paul
+Fox. All but a few functions have been changed enough that they no
+longer interwork with the original. I think this justifies issuing the
+program as 'heyu' instead of 'x10'.
 
-The program comes complete with source code, sample config files, man pages,
-and executable binary. The program has options to allow you to:
+The program is strictly command line driven, and works well with
+crontab. Crontab can be used to schedule events. You can also upload
+timers and macros to the CM11's memory.
+
+The program comes complete with source code, sample config files, man
+pages, and executable binary. The program has options to allow you to:
 
    * Get the date and time from the interface
    * Get information about current settings and module states
diff --git a/misc/heyu/heyu.SlackBuild b/misc/heyu/heyu.SlackBuild
index 9bccc81843..10dd36f24e 100644
--- a/misc/heyu/heyu.SlackBuild
+++ b/misc/heyu/heyu.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=heyu
-VERSION=${VERSION:-2.10.1}
+VERSION=${VERSION:-2.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/heyu/heyu.info b/misc/heyu/heyu.info
index 38f7cff1aa..51b02e3d0e 100644
--- a/misc/heyu/heyu.info
+++ b/misc/heyu/heyu.info
@@ -1,8 +1,8 @@
 PRGNAM="heyu"
-VERSION="2.10.1"
+VERSION="2.10.2"
 HOMEPAGE="http://www.heyu.org/"
-DOWNLOAD="https://github.com/HeyuX10Automation/heyu/archive/v2.10.1/heyu-2.10.1.tar.gz"
-MD5SUM="f4a34bb07f53fe7343b9d4f1724e3f01"
+DOWNLOAD="https://github.com/HeyuX10Automation/heyu/archive/v2.10.2/heyu-2.10.2.tar.gz"
+MD5SUM="9351e92c0d7fa1a0354825f99eb51c2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/jmri/README b/misc/jmri/README
index 8cb37c965c..aef62d8ee7 100644
--- a/misc/jmri/README
+++ b/misc/jmri/README
@@ -1,5 +1,5 @@
 JMRI is the Java Model Railroad Interface, a set of tools for model
 railroad computer control.
 
-Please note, to access your controller hardware you will probably need to
-add your username to the 'dialout' group.
+Please note, to access your controller hardware you will probably need
+to add your username to the 'dialout' group.
diff --git a/misc/jmri/jmri.SlackBuild b/misc/jmri/jmri.SlackBuild
index 9ed2dfdd18..ec0b29cd92 100644
--- a/misc/jmri/jmri.SlackBuild
+++ b/misc/jmri/jmri.SlackBuild
@@ -25,8 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jmri
-VERSION=${VERSION:-4.20}
-REVISION=${REVISION:-Rc7ba8249b}
+VERSION=${VERSION:-4.22}
+REVISION=${REVISION:-R4c4384d74}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/misc/jmri/jmri.info b/misc/jmri/jmri.info
index 3ec502b2b4..e2fb872b9b 100644
--- a/misc/jmri/jmri.info
+++ b/misc/jmri/jmri.info
@@ -1,8 +1,8 @@
 PRGNAM="jmri"
-VERSION="4.20"
+VERSION="4.22"
 HOMEPAGE="http://jmri.org/"
-DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v4.20/JMRI.4.20+Rc7ba8249b.tgz"
-MD5SUM="b0915ad2acd71426c2b3301100cfd5d4"
+DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v4.22/JMRI.4.22+R4c4384d74.tgz"
+MD5SUM="63294509ca6a360b1fa6c2e602713d43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/misc/mosquitto/mosquitto.SlackBuild b/misc/mosquitto/mosquitto.SlackBuild
index 40216b57bc..504bcf05d3 100644
--- a/misc/mosquitto/mosquitto.SlackBuild
+++ b/misc/mosquitto/mosquitto.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mosquitto
 
-# Copyright 2011-2020  Christoph Willing,  Brisbane Australia
+# Copyright 2011-2021  Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mosquitto
-VERSION=${VERSION:-1.6.12}
+VERSION=${VERSION:-2.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -99,7 +99,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE.txt CONTRIBUTING.md compiling.txt mosquitto.conf *.example examples readme.* \
+  LICENSE.txt README-compiling.md README-letsencrypt.md README.md \
+  CONTRIBUTING.md mosquitto.conf *.example examples *.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/mosquitto/mosquitto.info b/misc/mosquitto/mosquitto.info
index 816ccf5a02..b4ea0ace2a 100644
--- a/misc/mosquitto/mosquitto.info
+++ b/misc/mosquitto/mosquitto.info
@@ -1,8 +1,8 @@
 PRGNAM="mosquitto"
-VERSION="1.6.12"
+VERSION="2.0.10"
 HOMEPAGE="https://mosquitto.org/"
-DOWNLOAD="https://mosquitto.org/files/source/mosquitto-1.6.12.tar.gz"
-MD5SUM="beb8d76d6e45f1e66d711006082a631f"
+DOWNLOAD="https://mosquitto.org/files/source/mosquitto-2.0.10.tar.gz"
+MD5SUM="3d1c327d8c5881f56983bee1e3c8f068"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="c-ares"
diff --git a/misc/par2cmdline/par2cmdline.SlackBuild b/misc/par2cmdline/par2cmdline.SlackBuild
index 008ddd6db2..7cdf5a4c5e 100644
--- a/misc/par2cmdline/par2cmdline.SlackBuild
+++ b/misc/par2cmdline/par2cmdline.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for par2cmdline
 
-# Copyright 2014-2018, Thomas Morper <thomas@beingboiled.info>, Augsburg, Germany
+# Copyright 2014-2021, Thomas Morper <thomas@beingboiled.info>, Nürnberg, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=par2cmdline
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/par2cmdline/par2cmdline.info b/misc/par2cmdline/par2cmdline.info
index 857dd0f38e..50901f639e 100644
--- a/misc/par2cmdline/par2cmdline.info
+++ b/misc/par2cmdline/par2cmdline.info
@@ -1,8 +1,8 @@
 PRGNAM="par2cmdline"
-VERSION="0.8.0"
+VERSION="0.8.1"
 HOMEPAGE="https://github.com/Parchive/par2cmdline"
-DOWNLOAD="https://github.com/Parchive/par2cmdline/archive/v0.8.0/par2cmdline-0.8.0.tar.gz"
-MD5SUM="b8f05ee52e27ff8cff82fc98f0f79ea2"
+DOWNLOAD="https://github.com/Parchive/par2cmdline/archive/v0.8.1/par2cmdline-0.8.1.tar.gz"
+MD5SUM="8c0088c445412223529bd0876df6e2f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/po4a/README b/misc/po4a/README
index 2c45c97a50..460ea0c578 100644
--- a/misc/po4a/README
+++ b/misc/po4a/README
@@ -4,25 +4,39 @@ po4a (PO for anything) eases translations and their maintenance,
 allowing gettext's usage on unexpected areas like documentation.
 
 In po4a each documentation format is handled by a module, that
-converts this format to/from PO. Formats included in po4a-0.47 are:
-AsciiDoc, BibTex, Dia, Halibut, KernelHelp, LaTeX, Man, POD, SGML, TeX,
-Texinfo, Text, WML, XHTML, XML, Yaml
+converts this format to/from PO. Formats handled by po4a-0.63
 
-man pages are encoded in UTF-8. To read them in other languages than English,
-do this for instance:
-LANG=ru_RU.utf8 GROFF_ENCODING=utf8 man <man page>
+. asciidoc: AsciiDoc format.
+. dia: uncompressed Dia diagrams.
+. docbook: DocBook XML.
+. guide: Gentoo Linux's XML documentation format.
+. ini: INI format.
+. kernelhelp: Help messages of each kernel compilation option.
+. latex: LaTeX format.
+. man: Good old manual page format.
+. pod: Perl Online Documentation format.
+. sgml: either DebianDoc or DocBook DTD.
+. texinfo: The info page format.
+. tex: generic TeX documents (see also latex).
+. text: simple text document.
+. wml: WML documents.
+. xhtml: XHTML documents.
+. xml: generic XML documents (see also docbook).
+. yaml: YAML documents.
 
-WARNING: run po4a.SlackBuild as root (su -) not with only root privileges
-(su), otherwise test #24 will fail.
+man pages are encoded in UTF-8. To read them in other languages than
+English, do this for instance:
+LANG=ru_RU.utf8 GROFF_ENCODING=utf8 man <man page>
 
-Dependencies tree is as follows (all dependencies listed are available at
-http://slackbuilds.org).
+Dependencies tree is as follows (all dependencies listed are available
+at http://slackbuilds.org).
 
-Po4a-0.47
+Po4a-0.63
 |
 |-- perl-Module-Build
 |-- perl-YAML-Tiny. mandatory for the YAML module.
-|-- perl-text-WrapI18N to format po4a's warnings and error messages. Optional.
+|-- perl-text-WrapI18N to format po4a's warnings and error messages.
+|   |                  Optional.
 |   |-- Text::CharWidth. Mandatory
 |-- perl-Unicode-LineBreak, includes module Unicode::GCString to compute
     text width, neeeded by AsciiDoc to determine two line titles in
@@ -32,3 +46,20 @@ Po4a-0.47
         |-- perl-Encode-HanExtra. Optional.
         |-- perl-Encode-JISX0213. Optional
             |-- perl-Encode-ISO2022. Mandatory
+
+In addition, perl-Test-Pod allows to run the test for the POFD format
+
+Note: by default the SlackBuild does not run ./Build test, because these
+tests:
+t/cfg-multi.t
+t/cfg-single.t
+t/cfg-split.t
+fail if the script is run by root or even using fakeroot, which has been
+acknowledged upstream.
+
+All tests have been successfully passed running '/Build test' by the
+maintainer as regular user. If you want to check by yourself, un-comment
+the lines 85 and 86 in the SlackBuild. You will then need to comment
+them out to run the script again as root to actually build the package.
+
+WARNING: run this script with LANG set to an UTF-8 locale.
diff --git a/misc/po4a/po4a.SlackBuild b/misc/po4a/po4a.SlackBuild
index 4baaff9478..9e3a00e70f 100644
--- a/misc/po4a/po4a.SlackBuild
+++ b/misc/po4a/po4a.SlackBuild
@@ -22,13 +22,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.ritten by Didier Spaier <didier dot spaier at epsm dot fr>
 
-# WARNING: run this script as real root (su -) else some tests will fail
-# WARNING: run  this script using an UTF-8 locale. If you don't use one
+# WARNING: run this script using an UTF-8 locale. If you don't use one
 #          usually, run it like this e.g.
 #          LC_ALL=en_US.utf8 ./po4a.SlackBuild
 
 PRGNAM=po4a
-VERSION=${VERSION:-0.55}
+VERSION=${VERSION:-0.63}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,7 +80,8 @@ perl Build.PL \
   installdirs=vendor \
   destdir=$PKG
 ./Build
-./Build test
+# ./Build test
+# exit
 ./Build install \
   --install_path bindoc=/usr/man/man1 \
   --install_path libdoc=/usr/man/man3
diff --git a/misc/po4a/po4a.info b/misc/po4a/po4a.info
index be015694f7..f699d19960 100644
--- a/misc/po4a/po4a.info
+++ b/misc/po4a/po4a.info
@@ -1,8 +1,8 @@
 PRGNAM="po4a"
-VERSION="0.55"
+VERSION="0.63"
 HOMEPAGE="https://po4a.org/"
-DOWNLOAD="https://github.com/mquinson/po4a/releases/download/v0.55/po4a-0.55.tar.gz"
-MD5SUM="cecc2a4190f97bf0430d78a5cb07071b"
+DOWNLOAD="https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar.gz"
+MD5SUM="25881c0a02c1180ffdec4bf452b4ff0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Unicode-LineBreak perl-Module-Build perl-YAML-Tiny"
diff --git a/misc/po4a/slack-desc b/misc/po4a/slack-desc
index 72d0020d1e..d81b32f609 100644
--- a/misc/po4a/slack-desc
+++ b/misc/po4a/slack-desc
@@ -12,8 +12,8 @@ po4a: po4a (PO for anything) eases translations and their maintenance,
 po4a: allowing gettext's usage on unexpected areas like documentation.
 po4a:
 po4a: In po4a each documentation format is handled by a module, that
-po4a: converts this format to/from PO. Formats included in po4a-0.45 are:
-po4a: BibTex, Dia, Halibut, Kernelhelp, LaTeX, Man, POD, SGML, TeX,
-po4a: Texinfo, Text, WML, XHTML, XML.
-po4a:
+po4a: converts this format to/from PO. Formats included in po4a-0.63 are:
+po4a: man pages, POD, XML (generic, DocBook, XHTML, Dia, Guide, WML), SGML
+po4a: Tex (generic, LaTeX, Texinfo), text (simple with few formatting,
+po4a: markdown, Asciidoc), INI, KernelHelp
 po4a:
diff --git a/misc/protobuf3/protobuf3.SlackBuild b/misc/protobuf3/protobuf3.SlackBuild
index ea2dfb7de0..40c0c6270d 100644
--- a/misc/protobuf3/protobuf3.SlackBuild
+++ b/misc/protobuf3/protobuf3.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=protobuf3
-VERSION=${VERSION:-3.12.3}
+VERSION=${VERSION:-3.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/protobuf3/protobuf3.info b/misc/protobuf3/protobuf3.info
index 4bf23d9f58..f6b32b675c 100644
--- a/misc/protobuf3/protobuf3.info
+++ b/misc/protobuf3/protobuf3.info
@@ -1,8 +1,8 @@
 PRGNAM="protobuf3"
-VERSION="3.12.3"
+VERSION="3.14.0"
 HOMEPAGE="https://github.com/google/protobuf"
-DOWNLOAD="https://github.com/google/protobuf/archive/v3.12.3/protobuf-3.12.3.tar.gz"
-MD5SUM="bf452e9c50168bddf80be32e3848750e"
+DOWNLOAD="https://github.com/google/protobuf/archive/v3.14.0/protobuf-3.14.0.tar.gz"
+MD5SUM="0c9d2a96f3656ba7ef3b23b533fb6170"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/rbutil/rbutil.info b/misc/rbutil/rbutil.info
index 9995c98fca..e2253b978a 100644
--- a/misc/rbutil/rbutil.info
+++ b/misc/rbutil/rbutil.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.rockbox.org/rbutil/source/RockboxUtility-v1.4.1-src.t
 MD5SUM="0e29f60ee87f433087c6ead09dde81f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="speex cryptopp quazip"
+REQUIRES="speex cryptopp quazip-qt4"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/misc/rlwrap/rlwrap.SlackBuild b/misc/rlwrap/rlwrap.SlackBuild
index bac71af78b..e3cc30e56b 100644
--- a/misc/rlwrap/rlwrap.SlackBuild
+++ b/misc/rlwrap/rlwrap.SlackBuild
@@ -3,11 +3,11 @@
 # Slackware build script for rlwrap
 
 # Written by slakmagik <slakmagik@gmail.com>
-# Updated 2017 by Andrew Clemons, Wellington New Zealand
+# Updated 2017,2021 by Andrew Clemons, Wellington New Zealand
 # Released under the WTFPL
 
 PRGNAM=rlwrap
-VERSION=${VERSION:-0.43}
+VERSION=${VERSION:-0.45}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PLEA README TODO \
+  AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/rlwrap/rlwrap.info b/misc/rlwrap/rlwrap.info
index 3d7bd39da1..5191b39608 100644
--- a/misc/rlwrap/rlwrap.info
+++ b/misc/rlwrap/rlwrap.info
@@ -1,8 +1,8 @@
 PRGNAM="rlwrap"
-VERSION="0.43"
+VERSION="0.45"
 HOMEPAGE="https://github.com/hanslub42/rlwrap"
-DOWNLOAD="https://github.com/hanslub42/rlwrap/archive/v0.43/rlwrap-0.43.tar.gz"
-MD5SUM="361d54b7127374e5761e0738eb7b88fb"
+DOWNLOAD="https://github.com/hanslub42/rlwrap/archive/v0.45/rlwrap-0.45.tar.gz"
+MD5SUM="0697c15d368602ed3467ac40f43f3e1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/txt2regex/README b/misc/txt2regex/README
new file mode 100644
index 0000000000..5b3de4d342
--- /dev/null
+++ b/misc/txt2regex/README
@@ -0,0 +1,12 @@
+txt2regex (interactive regular expression trainer)
+
+Txt2regex is a regular expression wizard for the command line.
+
+Users with little or no knowledge of regular expressions can quickly
+create hairy regexes by answering questions in a simple text-based
+interactive interface.
+
+Txt2regex is aware of the particular notation and caveats of many
+different regular expression flavors, generating valid regexes for
+more than 20 targets, including grep, sed, Vim, Emacs, JavaScript,
+Python, PHP, PostgreSQL.
diff --git a/misc/txt2regex/slack-desc b/misc/txt2regex/slack-desc
new file mode 100644
index 0000000000..0bef91698c
--- /dev/null
+++ b/misc/txt2regex/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+txt2regex: txt2regex (interactive regular expression trainer)
+txt2regex:
+txt2regex: Txt2regex is a regular expression wizard for the command line.
+txt2regex:
+txt2regex: Users with little or no knowledge of regular expressions can quickly
+txt2regex: create hairy regexes by answering questions in a simple text-based
+txt2regex: interactive interface.
+txt2regex:
+txt2regex:
+txt2regex:
+txt2regex:
diff --git a/misc/txt2regex/txt2regex.SlackBuild b/misc/txt2regex/txt2regex.SlackBuild
new file mode 100644
index 0000000000..4592cda5b4
--- /dev/null
+++ b/misc/txt2regex/txt2regex.SlackBuild
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Slackware build script for txt2regex
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=txt2regex
+VERSION=${VERSION:-0.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# There's a MANDIR in the Makefile, but nothing uses it. Have to
+# install the man page, er, manually.
+
+make install DESTDIR=$PKG
+mkdir -p $PKG/usr/man/man1
+gzip -9c < man/$PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+chmod -x tests/regex-tester.sh   # no +x files in the doc dir!
+gzip -9 tests/regex-tester.txt   # 116KB => 10KB
+cp -a *.md COPYRIGHT TODO tests man/*.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/txt2regex/txt2regex.info b/misc/txt2regex/txt2regex.info
new file mode 100644
index 0000000000..ff487ac5a3
--- /dev/null
+++ b/misc/txt2regex/txt2regex.info
@@ -0,0 +1,10 @@
+PRGNAM="txt2regex"
+VERSION="0.9"
+HOMEPAGE="http://aurelio.net/projects/txt2regex/"
+DOWNLOAD="https://github.com/aureliojargas/txt2regex/archive/v0.9/txt2regex-0.9.tar.gz"
+MD5SUM="7066adc50e55300f5bcad276cf65b852"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/misc/vttest/README b/misc/vttest/README
index 72e74ec08c..9008e02c80 100644
--- a/misc/vttest/README
+++ b/misc/vttest/README
@@ -1,10 +1,11 @@
 vttest (terminal test program)
 
-Vttest is a program designed to test the functionality of a VT100 terminal
-(or emulator thereof). It tests both display (escape sequence handling)
-and keyboard.
+Vttest is a program designed to test the functionality of a VT100
+terminal (or emulator thereof). It tests both display (escape sequence
+handling) and keyboard.
 
-Additional tests (past version 1.7) are provided for analysis of vt220,
-vt420 terminals, as well as variants of xterm.
+Additional tests (past version 1.7) are provided for analysis of
+vt220, vt420 terminals, as well as variants of xterm.
 
-The program is menu-driven and contains full on-line operating instructions.
+The program is menu-driven and contains full on-line operating
+instructions.
diff --git a/misc/vttest/vttest.SlackBuild b/misc/vttest/vttest.SlackBuild
index 2f4413ce94..133da8eadc 100644
--- a/misc/vttest/vttest.SlackBuild
+++ b/misc/vttest/vttest.SlackBuild
@@ -6,13 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210220 bkw: update for 2.7.20210210.
+# 20201025 bkw: update for 2.7.20200920.
 # 20200316 bkw: update for 2.7.20200303.
 # 20191130 bkw: update for 2.7.20190710.
 # 20180920 bkw: update for 2.7.20180911 (whoops!).
 # 20180915 bkw: update for 2.7.20180811.
 
 PRGNAM=vttest
-VERSION=${VERSION:-2.7.20200303}
+VERSION=${VERSION:-2.7.20210210}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/vttest/vttest.info b/misc/vttest/vttest.info
index f4dbeb5931..9f00527391 100644
--- a/misc/vttest/vttest.info
+++ b/misc/vttest/vttest.info
@@ -1,8 +1,8 @@
 PRGNAM="vttest"
-VERSION="2.7.20200303"
+VERSION="2.7.20210210"
 HOMEPAGE="http://invisible-island.net/vttest/"
-DOWNLOAD="ftp://ftp.invisible-island.net/vttest/vttest-20200303.tgz"
-MD5SUM="20e78048920ae629b24110b405b2ba6f"
+DOWNLOAD="ftp://ftp.invisible-island.net/vttest/vttest-20210210.tgz"
+MD5SUM="21c7493640a7912ea746b3eb0689f2a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/AtomicParsley/AtomicParsley.SlackBuild b/multimedia/AtomicParsley/AtomicParsley.SlackBuild
index d627d278bd..a433f6c3c7 100644
--- a/multimedia/AtomicParsley/AtomicParsley.SlackBuild
+++ b/multimedia/AtomicParsley/AtomicParsley.SlackBuild
@@ -22,10 +22,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=AtomicParsley
-SRCNAM=atomicparsley
-SRCDIR=wez-$SRCNAM-da2f6e4fc120
+SRCNAM=$( echo $PRGNAM | tr A-Z a-z )
 VERSION=${VERSION:-0.9.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,11 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf __MACOSX
-rm -rf $SRCDIR
-#unzip $CWD/$SRCNAM-$VERSION.zip
-tar xfv $CWD/$VERSION.tar.gz
-cd $SRCDIR
+rm -rf $SRCNAM-$VERSION
+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 \
@@ -92,11 +89,13 @@ make install DESTDIR=$PKG
 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
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/tools
 cp -a  \
-   COPYING CREDITS Changes.txt README.md $CWD/Using_AtomicParsley.rtf \
+   COPYING CREDITS Changes.txt README.md $CWD/Using_AtomicParsley.{rtf,txt} \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+install -D -m0755 tools/iTunMOVI-1.1.pl \
+  $PKG/usr/doc/$PRGNAM-$VERSION/tools/iTunMOVI-1.1.pl
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/multimedia/AtomicParsley/AtomicParsley.info b/multimedia/AtomicParsley/AtomicParsley.info
index 3baf76ce79..9e7b522e10 100644
--- a/multimedia/AtomicParsley/AtomicParsley.info
+++ b/multimedia/AtomicParsley/AtomicParsley.info
@@ -1,8 +1,8 @@
 PRGNAM="AtomicParsley"
 VERSION="0.9.6"
-HOMEPAGE="http://atomicparsley.sourceforge.net"
-DOWNLOAD="https://bitbucket.org/wez/atomicparsley/get/0.9.6.tar.gz"
-MD5SUM="1fa52dbc98fb74465cf680429f712d20"
+HOMEPAGE="https://github.com/wez/atomicparsley"
+DOWNLOAD="https://github.com/wez/atomicparsley/archive/0.9.6/atomicparsley-0.9.6.tar.gz"
+MD5SUM="c4fb177b448304a20dbbf138db60c92a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/AtomicParsley/README b/multimedia/AtomicParsley/README
index 640dcfea21..cffb8193c7 100644
--- a/multimedia/AtomicParsley/README
+++ b/multimedia/AtomicParsley/README
@@ -1,4 +1,2 @@
-AtomicParsley (mpeg4 tag tool)
-
-AtomicParsley is a lightweight command line program for reading,
-parsing and setting metadata into MPEG-4 files.
+AtomicParsley is a lightweight command line program for reading, parsing
+and setting metadata into MPEG-4 files.
diff --git a/multimedia/AtomicParsley/Using_AtomicParsley.txt b/multimedia/AtomicParsley/Using_AtomicParsley.txt
new file mode 100644
index 0000000000..4a53b596cb
--- /dev/null
+++ b/multimedia/AtomicParsley/Using_AtomicParsley.txt
@@ -0,0 +1,191 @@
+Welcome to AtomicParsley
+https://github.com/wez/atomicparsley
+(converted from the RTF using Ted.  Contains long lines and tabs.)
+
+AtomicParsley is distributed under the GPL "AS IS", without any warranty; without even the implied warranty of merchantability or fitness for either an expressed or implied particular purpose.
+
+AtomicParsley is a command line program for reading & writing iTune-style metadata in mpeg4 files (m4a, m4b, m4p, m4v & mp4) whether iTMS drm protected or not. AtomicParsley can set most user accessible tags, and some that iTunes doesn't let you change. Of particular note are the Mac OS X only image modification preferences that allow artwork to be modified prior to embedding. Artwork can be converted to jpeg, file size limited, reduced & squared through setting command line preferences.
+
+Currently, AtomicParsley lets you set these type of iTunes-style tags in MPEG-4 files:
+
+artist			lyrics			category			TVEpisodeNum
+title			album artist		artwork			TVSeasonNum
+album 		composer		compilation			podcast flag
+genre			copyright		advisory			podcast feed url
+tracknumber		grouping		stik				podcast episode GUID url
+disknumber		bpm/tempo		TVNetwork			purchase date
+comment		description		TVShowName		encoder tool
+year 			keyword		TVEpisode			play gapless
+
+3GPP & 3GPP2 files (.3gp & .3g2) have a different set of metadata tags available called assets:
+
+title			author			performer			genre
+album	*		year			copyright			description
+rating			keyword		classification			location
+
+* album asset is only available on 3gp6 and later branded files.
+
+All mpeg-4 based files support 'uuid' user-defined extensions atoms & ISO copyright notices:
+
+tagtime		url 			information
+ANY user-defined atom with text		ANY user-defined atom with embedded file
+ISO-copyright [at movie and/or track level(s)]
+______________________________________________________________________________________________
+Working with AtomicParsley
+
+The format for working with files is always the same:
+
+/path/to/AtomicParsley /path/to/your.m4a [options]
+
+Example to set a picture file into your mpeg4 file (jpeg or png only):
+AtomicParsley /path/your.m4a --artwork /path/to/your.jpg
+
+Exampe of setting multiple tags into your mpeg4 file:
+AtomicParsley /path/your.m4a --artist "I am an Artist" --title "This is the Title" --album "The iAlbum" --genre "Progressive Zydeco" --tracknum 1/2 --disknum 1/2 --year 1985 --comment 'Superlative (I made this TODAY!!!)' --lyrics 'Go, Go, GO! (repeat)' --composer "I Claudius" --grouping "Ennui" --copyright "LowDown Recordings" --bpm 20 --compilation true --advisory clean --artwork /path/to/your.jpg --artwork /path/to/your2.jpg
+
+Example of using the artwork preferences to limit the embedded artwork size & dimensions:
+export PIC_OPTIONS="MaxDimensions=400:MaxKBytes=50:AllPixJPEG=true:SquareUp:removeTempPix"
+AtomicParsley /path/your.m4a --artwork /path/to/your.jpg
+
+Example to change your own mpeg4 file into an iTunes TV show:
+AtomicParsley /path/your.mp4 --genre "TV Shows" --stik "TV Show" --TVNetwork FOOnn --TVShowName "Some Showname" --TVEpisode "1120" --TVEpisodeNum 20 --TVSeason 11
+
+Example to change your own mpeg4 file into a Video Podcast (FrontRow requires the purl atom, iTunes doesn't):
+AtomicParsley /path/your.mp4 --podcastFlag true --stik "Movie" --podcastURL "http://www.fictionalURL.com"
+
+Example of extracting embedded artwork in your mpeg4 file to the same folder:
+AtomicParsley /path/your.m4a --extractPix
+
+To see the atom tree of your mpeg4 file:
+AtomicParsley /path/your.m4a -T
+
+To see the metadata tags set into your mpeg4 file:
+AtomicParsley /path/your.m4a -t
+
+Note Mac users: iTunes looks at type/creator when opening an mpeg4 file. As of AtomicParsley 0.8.1, you no longer need to change extensions to/from anything - this is automatically determined through the information in the file itself and is set accordingly. A podcast mpeg-4 file may cause some concern at first because it shows up as being a protected file with a lock on the icon. This is nothing to be concerned about; iTunes uses the same icon/file info for 'M4B ' and 'M4P ' types - that's it. They aren't drm'ed in any way, just a sharing of icon/Finder info.
+Note2: iTMS purchased media often has ©day set to "2005-09-06T07:00:00Z" or something similar. This is normal and is called Coordinated Universal Time and is denoted by the Z at the end. iTunes only displays the year, but in fact there is an entire date that is there.
+
+Writing out is non-destructive - the original file is unaltered. There is a command-line option to over write the source file: use it with caution or on duplicates. Starting with version 0.9, AtomicParsley can used available padding to rapidly update tags. This option is only available with the --overWrite option.
+
+--------------
+Erasing atoms with AtomicParsley
+
+To delete metadata "":
+AtomicParsley /path/your.m4a --artist "" --title ""
+
+To delete all artwork (on the covr atom):
+AtomicParsley /path/your.m4a --artwork REMOVE_ALL
+
+To delete every piece of metadata (in the "moov.udta.meta.ilst" hierarchy); drm files will still play as normally:
+AtomicParsley /path/your.m4a --metaEnema
+
+--------------
+Setting 3gp assets with AtomicParsley
+
+3gp metadata assets are more complicated than iTunes-style metadata. Assets can be in either utf8 or utf16, and are for a specific language. Multiple like-named tags differing in the language are supported allowing for up to around 480 tags per asset. See the AtomicParsley --3gp-help page for more. 3gp assets are only available on 3gp files - setting iTunes-style metadata is not allowed.
+
+3gp assets have more options than iTunes tags - most are hardcoded with defaults. Defaults are as follows:
+
+Default encoding: utf8 (utf16 also available)
+Default language: 'eng' (about 480 other languages supported; none are currently checked)
+Default Rating: entity = 'NONE' (4spaces); criteria = 'NONE' (4 spaces)
+Default Classification:  entity = 'NONE' (4 spaces); index = 0
+Default Location: Longitude: = -73.98; Latitude = 40.77; Altitude = 4.3; Role = shooting location; Astronomical Body = Earth; Additional notes = 'none' [Central Park] - altitude is measured in meters; negative values are appended with a capital letter (S for southern latitudes, W for western longitudes, B for below sea level.)
+
+Setting a title asset for the spanish language in utf16:
+AtomicParsley /path/your.3g2 --3gp-title "The Rain In Spain..." lang=spa UTF16
+
+Setting a album asset (with tracknumber) for the sve language in utf8:
+AtomicParsley /path/your.3g2 --3gp-album "Bjorn Diddles His Banjo of Death" track=2 lang=sve
+
+Setting a rating asset for the japanese language in utf16:
+AtomicParsley /path/your.3g2 --3gp-rating "A superlative 4-on-the-floor house anthem." entity=MOMA criteria=PU18 lang=jpn UTF16
+
+Setting a location asset for the english language in utf16:
+AtomicParsley /path/your.3g2 --3gp-location "Bethesda Terrace" latitude=40.77 longitude=73.98W altitude=4.3B role="real" body=Earth notes="Underground in Central Park" UTF16
+
+Setting a keyword asset for the french language in utf8:
+AtomicParsley /path/your.3gp --3gp-keyword "keywords=France,Paris,Basilique du Sacré-Cœur, Sewers, stinky cheeses" lang=fra
+
+--------------
+Setting copyright notices at movie and/or track level
+
+The only defined piece of metadata designed for descriptive annotations of the presentation/track is the copyright notice. If your file contains 4 tracks, there are 5 places to set copyright notices, max — each of the tracks + movie level. There may be multiple notices, differing by language & may be present at any combination of movie and/or track level in either utf8 or utf16. Defaults are lang=eng & utf8.
+
+Please note that at movie level, this notice is identical the the 3gp copyright asset, and if present for the same langauges this will overwrite the exising asset.
+
+Examples:
+AtomicParsley /path/your.m4a --ISO-copyright "© 2006, Lalalandia Productions" movie UTF16
+AtomicParsley /path/your.m4a --ISO-copyright "© 2006, Produções Da Estrada" track lang=por
+AtomicParsley /path/your.m4a --ISO-copyright "©2006. USA" track=1 --ISO-copyright "©2006. Ελλάδα" track=2 lang=gre --ISO-copyright "©2006. ਬਣਾਉਟੀ" track=5 lang=pun --ISO-copyright "Callaloo Prductions, ©2006" movie lang=car
+
+--------------
+Custom uuid atoms with AtomicParsley
+
+According the the specifications for the mpeg-4 file format, any atom not listed is reserved & is unavailable for use. However, the specification & the mpeg-4 registration authority www.mp4ra.org allow for user defined extension via a mechanism called the 'uuid' atom. This type of atom actually has a 'uuid' name, but following that is 16 bytes (the actual UUID representation itself).
+
+Because anyone or any program can implement UUID atoms, a special version of the UUID form is used - and when read back, special checks are in place to determine if any UUIDs found were created by AtomicParsley. In this way, UUIDs created by 3rd parties are ignored for reading, listings & extractions. This is all handled transparently via a simple mechanism: --meta-uuid ATOM text "Some Text"
+
+where ATOM can be any 4 letter atom name you choose - carrying any text information you choose. Support is also present for directly embedding a file via a similar mechanism: --meta-uuid ATOM file /path/to/target/file.ext
+
+Create your own atoms directly:
+AtomicParsley /path/your.m4a --meta-uuid "YZAB" text "Some string value to set"
+AtomicParsley /path/your.m4a --meta-uuid "®USP" text "6125480"
+AtomicParsley /path/your.m4a --meta-uuid "©212" text "CBGB OMFUG last set"
+AtomicParsley /path/your.m4a --meta-uuid "docu" file ~/Desktop/taxes.zip
+AtomicParsley /path/your.m4a --meta-uuid "inst" file /Files/archive.dmg description="Installer"
+
+Deleting a custom uuid atom:
+AtomicParsley /path/your.m4a --meta-uuid "©212" text ""
+AtomicParsley /path/your.m4a --meta-uuid "docu" file ""
+
+Set the tagging time (the moment the tag was written) on a uuid=tdtg atom:
+AtomicParsley /path/your.m4a --tagtime
+
+Set a url on a uuid=©url atom:
+AtomicParsley /path/your.m4a --url "http://www.bumperdumper.com"
+
+Manually removing uuid atoms:
+AP /path/your.m4a --manualAtomRemove "moov.trak[1].uuid=55534d54-21d2-4fce-bb88-695cfac9c740"
+AP /path/your.m4a --manualAtomRemove "moov.udta.meta.uuid=1fed6656-d911-5385-9cb2-cb2c100f06e7"
+
+Note: any program can create a uuid atom - and are listed differently in an atom tree based on origin. Non-AP created atoms are listed slightly differently than AP-created uuid atoms:
+
+non-AtomicParsley created uuid (from a Sony PSP file):
+Atom uuid=55534d54-21d2-4fce-bb88-695cfac9c740 @ ...
+
+uuid created by AtomicParsley:
+
+Atom uuid=971451ee-0928-59f2-b81f-b1372b62565d(APuuid=ATOM) @ ...
+
+Here you can see that after the hex-a-decimal representation of the uuid, AP has discovered an AtomicParsley-set uuid atom, and lists its name after APuuid).
+
+--------------
+Compiling AtomicParsley
+
+A fresh svn checkout will always be the most recent version available. AtomicParsley was developed on Mac OS X 10.4x, but should be able to compile on older versions. Only gcc4 was used to compile on Mac OS X.
+
+cd AtomicParsley && ./build
+
+Releases of AtomicParsley are also available built using:
+
+• Debian 'Sarge' 31r0a-i386 with gcc/g++4.02, libc6_2.3.5-8 & libstdc++6_4.0.2-2
+• Microsoft Windows XP SP2 with VisualC++ 6.0
+
+--------------
+AtomicParsley & new atoms, bugs, etc....
+
+If you should come across an atom (in the moov.udta.meta.ilst hierarchy) that AtomicParsley doesn't handle, please let me know about it - I would like to be able to support it. Note: AtomicParsley will never support iTunes-style "----" atoms. To facilitate implementation, a sample of the new atom would be needed as it could come in a few different types - or even an entirely new type.
+
+Should you find a bug or a suspect behavior, please post to the bugs section or forum at sourceforge. A sample of the file that demonstrates the behavior would be best. Please also provide the name of the encoding program used to produce the file. Please refrain from using email as a primary means of support - it isn't. Fun though it is to answer some questions repeatedly, imagine the fun a non-response would be.
+
+Please remember: as long as it works on Mac OS X - to me it works *perfectly* good enough. If you find a bug on another platform (probably Windows, because Linux will have most of the same encoders as on Mac OS X) or with any form of commercial encoder, a sample would probably go a long way to making AtomicParsley work on your files.
+
+--------------
+Things to watch out for & avoid with AtomicParsley
+
+• iTunes text tags (except for lyics) are restricted to 255 characters
+
+• Many of the iTMS (both drm and podcast) files have **ID atoms. What they stand for can only be guessed, but their values have meaning only to Apple - as such they are displayed in raw hex. Since all metadata can be stripped (including these **ID atoms), and a drm file still plays properly, these tags can be considered superfluous metadata.
+
+• iTunes 7 incorporates a feature called gapless playback. For unknown reason, iTunes incorporates NULL space at the end of mpeg4 files. This may (or may not) be part of the mechanism iTunes uses as part of its gapless playback. Normally, this NULL space is replicated when AP writes out. It is not if DEFAULT_PAD=0 is set.
diff --git a/multimedia/AtomicParsley/slack-desc b/multimedia/AtomicParsley/slack-desc
index aa8d90b5b9..8e6d241578 100644
--- a/multimedia/AtomicParsley/slack-desc
+++ b/multimedia/AtomicParsley/slack-desc
@@ -11,7 +11,7 @@ AtomicParsley:
 AtomicParsley: AtomicParsley is a lightweight command line program for reading,
 AtomicParsley: parsing and setting metadata into MPEG-4 files.
 AtomicParsley:
-AtomicParsley: http://atomicparsley.sourceforge.net
+AtomicParsley: https://github.com/wez/atomicparsley
 AtomicParsley:
 AtomicParsley:
 AtomicParsley:
diff --git a/multimedia/LBRY/LBRY.SlackBuild b/multimedia/LBRY/LBRY.SlackBuild
index 27fdf44cde..c635edc48d 100644
--- a/multimedia/LBRY/LBRY.SlackBuild
+++ b/multimedia/LBRY/LBRY.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for LBRY
 
-# Copyright 2020, Chris Abela, Malta
+# Copyright 2020, 2021, Chris Abela, Malta
+# lbc donations will be accepted at: bZQ9x64nw2iVi9F2WeB1Z25U29rQ5TxkUm 
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=LBRY
-VERSION=${VERSION:-0.48.0}
+VERSION=${VERSION:-0.50.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/LBRY/LBRY.info b/multimedia/LBRY/LBRY.info
index d6552664f8..151960e6ed 100644
--- a/multimedia/LBRY/LBRY.info
+++ b/multimedia/LBRY/LBRY.info
@@ -1,10 +1,10 @@
 PRGNAM="LBRY"
-VERSION="0.48.0"
+VERSION="0.50.2"
 HOMEPAGE="https://lbry.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/lbryio/lbry-desktop/releases/download/v0.48.0/LBRY_0.48.0.deb"
-MD5SUM_x86_64="796a3b637dc35af3fbd1c3239ace650a"
+DOWNLOAD_x86_64="https://github.com/lbryio/lbry-desktop/releases/download/v0.50.2/LBRY_0.50.2.deb"
+MD5SUM_x86_64="7e8bfd7062fa9378422a92aeec994e6e"
 REQUIRES=""
 MAINTAINER="Chris Abela"
 EMAIL="kristofru@gmail.com"
diff --git a/multimedia/MediathekView/MediathekView.SlackBuild b/multimedia/MediathekView/MediathekView.SlackBuild
index 2eea232951..47ec0d0984 100644
--- a/multimedia/MediathekView/MediathekView.SlackBuild
+++ b/multimedia/MediathekView/MediathekView.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MediathekView
 
-# Copyright 2013-2015 Heiko Rosemann, Germany
+# Copyright 2013-2021 Heiko Rosemann, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,26 +23,33 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=MediathekView
-VERSION=${VERSION:-13.2.1}
+VERSION=${VERSION:-13.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=noarch
+ARCH=${ARCH:-$(uname -m)}
+
+SRCNAM=${PRGNAM}-${VERSION}-linux
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ ! "${ARCH}" = "x86_64" ] ; then
+  echo "Architecture ${ARCH} is not supported."
+  exit 1
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvzf $CWD/${PRGNAM}-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+tar xvzf $CWD/${SRCNAM}.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -50,16 +57,16 @@ 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 {} \;
 
-mkdir -p $PKG/usr/share/$PRGNAM/bin
-cp -a bin/flv-linux.sh $PKG/usr/share/$PRGNAM/bin/flv.sh
-cp -a lib/ $PKG/usr/share/$PRGNAM
-cp -a MediathekView.jar $PKG/usr/share/$PRGNAM
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a MediathekView MediathekView.ico MediathekView.jar MediathekView.svg \
+	MediathekView.vmoptions .install4j/ bin/ jre/ \
+	$PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/bin
-cat $CWD/$PRGNAM.wrapper > $PKG/usr/bin/$PRGNAM
-chmod 0755 $PKG/usr/bin/$PRGNAM
+ln -s /usr/share/$PRGNAM/MediathekView $PKG/usr/bin/MediathekView
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/MediathekView/MediathekView.info b/multimedia/MediathekView/MediathekView.info
index 64fd26bd0c..ab24031046 100644
--- a/multimedia/MediathekView/MediathekView.info
+++ b/multimedia/MediathekView/MediathekView.info
@@ -1,10 +1,10 @@
 PRGNAM="MediathekView"
-VERSION="13.2.1"
+VERSION="13.7.1"
 HOMEPAGE="http://www.mediathekview.de"
-DOWNLOAD="https://download.mediathekview.de/stabil/MediathekView-13.2.1.tar.gz"
-MD5SUM="88449174dce08d94876184a7b021fd63"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.mediathekview.de/stabil/MediathekView-13.7.1-linux.tar.gz"
+MD5SUM_x86_64="3d7076b812308e88ff0b10ed12266a56"
+REQUIRES=""
 MAINTAINER="Heiko Rosemann"
 EMAIL="heiko.rosemann@web.de"
diff --git a/multimedia/MediathekView/MediathekView.wrapper b/multimedia/MediathekView/MediathekView.wrapper
deleted file mode 100644
index db5ab145f8..0000000000
--- a/multimedia/MediathekView/MediathekView.wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /usr/share/MediathekView
-exec java -jar MediathekView.jar $*
-cd $OLDPWD
diff --git a/multimedia/MediathekView/README b/multimedia/MediathekView/README
index 7d216a4b23..0d9f5b6de5 100644
--- a/multimedia/MediathekView/README
+++ b/multimedia/MediathekView/README
@@ -7,6 +7,4 @@ public TV's online databases for shows.
 These shows can be streamed or saved locally using a user-
 configurable program.
 
-This version of MediathekView requires JavaFX - if you are using the jdk from
-Oracle (SBo-package jdk) you are fine, they provide JavaFX, but if you use
-openjdk, you need both openjdk and openjfx.
+This version of MediathekView includes the JRE it requires to run.
diff --git a/multimedia/MediathekView/slack-desc b/multimedia/MediathekView/slack-desc
index 7980d70910..1edc007eab 100644
--- a/multimedia/MediathekView/slack-desc
+++ b/multimedia/MediathekView/slack-desc
@@ -12,8 +12,8 @@ MediathekView: MediathekView is a program to search the German/Swiss/Austrian
 MediathekView: public TV's online databases for shows.
 MediathekView: (ARD, ZDF, Arte, 3Sat, SWR, BR, MDR, NDR, WDR, HR, RBB, ORF and SF)
 MediathekView:
-MediathekView: This version of MediathekView requires JavaFX - if you are using the
-MediathekView: jdk from Oracle (SBo-package jdk) you are fine, they provide JavaFX,
-MediathekView: but if you use openjdk, you need both openjdk and openjfx.
+MediathekView: This version of MediathekView includes the JRE it requires to run.
+MediathekView:
+MediathekView:
 MediathekView:
 MediathekView:
diff --git a/multimedia/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild
index ee256a4dc6..d36d21c67f 100644
--- a/multimedia/MuseScore/MuseScore.SlackBuild
+++ b/multimedia/MuseScore/MuseScore.SlackBuild
@@ -3,7 +3,7 @@
 # Maintained by Klaatu at member.fsf dot org
 
 PRGNAM=MuseScore
-VERSION=${VERSION:-3.4.2}
+VERSION=${VERSION:-3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,11 +60,15 @@ sed -i 's|share/man|man|' CMakeLists.txt
 #musescore doesn't like to build with webengine with qt4 installed
 #because the qmake finder finds the qt4 version. lets patch this
 sed -i 's/qmake)/qmake-qt5)/g' build/FindQt5.cmake
+
+make revision
+
 make release \
   PREFIX=/usr \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   LDFLAGS="-pthread" \
+  MUSESCORE_BUILD_CONFIG=release \
   DOWNLOAD_SOUNDFONT=OFF \
   USE_SYSTEM_FREETYPE=ON \
   BUILD_WEBENGINE=ON \
@@ -73,6 +77,7 @@ make install \
   -C build.release \
   DESTDIR=$PKG \
   UPDATE_CACHE=FALSE
+
 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
 
diff --git a/multimedia/MuseScore/MuseScore.info b/multimedia/MuseScore/MuseScore.info
index 4ec952f528..aa3acac807 100644
--- a/multimedia/MuseScore/MuseScore.info
+++ b/multimedia/MuseScore/MuseScore.info
@@ -1,12 +1,12 @@
 PRGNAM="MuseScore"
-VERSION="3.4.2"
+VERSION="3.6"
 HOMEPAGE="http://www.musescore.org/"
-DOWNLOAD="https://github.com/musescore/MuseScore/archive/v3.4.2/MuseScore-3.4.2.tar.gz \
-          http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3 \
-          http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_License.md"
-MD5SUM="d0fb3df64a8d5b5cf229d001b3711788 \
-        52b81759e686ee0da40a459d32cb3ea9 \
-        fe7f450714f342135be1f5df7dbab8db"
+DOWNLOAD="https://github.com/musescore/MuseScore/archive/v3.6/MuseScore-3.6.tar.gz \
+http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3 \
+http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_License.md"
+MD5SUM="63c890ef7849da113b80d699a23ccaac \
+        7b354559c7ef4e859a2bfad8738d477d \
+        bc7b4fbe58b37788876b6c36f19577d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5-webkit jack lame portaudio portmidi"
diff --git a/multimedia/aegisub/aegisub.info b/multimedia/aegisub/aegisub.info
index a1c1451829..96e448214e 100644
--- a/multimedia/aegisub/aegisub.info
+++ b/multimedia/aegisub/aegisub.info
@@ -1,7 +1,7 @@
 PRGNAM="aegisub"
 VERSION="3.2.2"
 HOMEPAGE="http://www.aegisub.org/"
-DOWNLOAD="http://ftp.aegisub.org/pub/archives/releases/source/aegisub-3.2.2.tar.xz"
+DOWNLOAD="https://github.com/Aegisub/Aegisub/releases/download/v3.2.2/aegisub-3.2.2.tar.xz"
 MD5SUM="d80e852c34811add358c06d77f5cd40d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/multimedia/aom/README b/multimedia/aom/README
index 60aa084072..40b686daea 100644
--- a/multimedia/aom/README
+++ b/multimedia/aom/README
@@ -5,3 +5,6 @@ VP9 and also to eventually be a competitor with HEVC/H.265.
 This script builds the encoder aomenc, the decoder aomdec as well
 as shared libraries which can be utilised by recent versions of
 both FFmpeg and vlc.
+
+Note: 'aom' replaces and upgrades 'libaom'; make sure 'libaom' is
+removed before using this SlackBuild.
diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild
index f0c6dfdd4a..6d6940a1e7 100644
--- a/multimedia/aom/aom.SlackBuild
+++ b/multimedia/aom/aom.SlackBuild
@@ -2,7 +2,7 @@
 # ----------------------------------------------------------------------
 # Slackware build script for aom
 #
-# Copyright (c) 2018-2020 Andrew Strong, Blue Mountains, Australia.
+# Copyright (c) 2018-2021 Andrew Strong, Blue Mountains, Australia.
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -25,10 +25,10 @@
 
 
 PRGNAM=aom
-# The 'official' archive for the aom 2.0.0 release has the git commit in
+# The 'official' archive for the aom 2.0.1 release has the git commit in
 # the filename, so adjustments are required for a sane Slackware build:
-VERSION=${VERSION:-2.0.0}
-GITCOMMIT=${GITCOMMIT:-bb35ba9148543f22ba7d8642e4fbd29ae301f5dc}
+VERSION=${VERSION:-2.0.1}
+GITCOMMIT=${GITCOMMIT:-b52ee6d44adaef8a08f6984390de050d64df9faa}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,9 +79,8 @@ cd build
 
   # I don't build either the HTML or the Latex docs as IMHO at this stage
   # of aom development they are not terribly useful for non-developers.
-  # To enable these docs change '-DENABLE_DOCS:BOOL=OFF' below to 'ON' to
-  # build the docs and then uncomment the 'extra docs' section below to
-  # install them...
+  # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build
+  # the docs and then uncomment the 'extra docs' section below to install them...
 
   cmake \
     -G "Unix Makefiles" \
@@ -91,9 +90,10 @@ cd build
     -DCMAKE_INSTALL_LIBDIR=/lib${LIBDIRSUFFIX} \
     -DCMAKE_INSTALL_INCLUDEDIR=/include \
     -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_NASM=ON \
-    -DENABLE_DOCS=OFF \
-    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_NASM=1 \
+    -DENABLE_DOCS=0 \
+    -DBUILD_SHARED_LIBS=1 \
+    -DENABLE_TESTS=0 \
     ../
   make -j1
   make install DESTDIR=$PKG
diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info
index 7cae618dfe..3537579242 100644
--- a/multimedia/aom/aom.info
+++ b/multimedia/aom/aom.info
@@ -1,8 +1,8 @@
 PRGNAM="aom"
-VERSION="2.0.0"
+VERSION="2.0.1"
 HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="http://www.andrews-corner.org/downloads/aom-bb35ba9148543f22ba7d8642e4fbd29ae301f5dc.tar.gz"
-MD5SUM="ebca14bf0ef8843cf89fb8cbbab7b6ef"
+DOWNLOAD="http://www.andrews-corner.org/downloads/aom-b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz"
+MD5SUM="d37bf9cfe3353e661637c2b106ee1787"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/coriander/README b/multimedia/coriander/README
index 60ab304338..d7e1b8d8c5 100644
--- a/multimedia/coriander/README
+++ b/multimedia/coriander/README
@@ -1,10 +1,10 @@
-Coriander is a full-featured graphical interface for controlling digital cameras
-through the IEEE-1394 bus (i.e. FireWire or iLink). It can also record videos,
-send images to an FTP site and convert videos to V4L streams. A live display is
-also provided. The program will work with any camera that is compatible with
-the IIDC specifications (v1.04 or later): this includes most 1394 webcams and
-many industrial and scientific cameras.
+Coriander is a full-featured graphical interface for controlling digital
+cameras through the IEEE-1394 bus (i.e. FireWire or iLink). It can also
+record videos, send images to an FTP site and convert videos to V4L
+streams. A live display is also provided. The program will work with any
+camera that is compatible with the IIDC specifications (v1.04 or later):
+this includes most 1394 webcams and many industrial and scientific
+cameras.
 
-NOTE: FTP support is added automatically if ftplib is detected.
-
-Optional dependencies: ftplib
+NOTE - ftplib can be omitted if FTP support is not needed: Coriander
+will build just fine.
diff --git a/multimedia/coriander/coriander.SlackBuild b/multimedia/coriander/coriander.SlackBuild
index eaba975fed..9e9b71a51e 100644
--- a/multimedia/coriander/coriander.SlackBuild
+++ b/multimedia/coriander/coriander.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for coriander
 
-# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2021 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=coriander
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/coriander/coriander.desktop b/multimedia/coriander/coriander.desktop
index 1cd8df9426..b18544b554 100644
--- a/multimedia/coriander/coriander.desktop
+++ b/multimedia/coriander/coriander.desktop
@@ -7,5 +7,5 @@ Comment=Control IEEE-1394 digital cameras compatible with the IIDC specification
 Exec=coriander
 Icon=/usr/share/icons/hicolor/128x128/apps/coriander.png
 Terminal=false
-Categories=AudioVideo;Video;GTK;
+Categories=Video;
 StartupNotify=true
diff --git a/multimedia/coriander/coriander.info b/multimedia/coriander/coriander.info
index 78cddfaf88..fb3da6cb7c 100644
--- a/multimedia/coriander/coriander.info
+++ b/multimedia/coriander/coriander.info
@@ -1,10 +1,10 @@
 PRGNAM="coriander"
-VERSION="2.0.2"
+VERSION="2.0.3"
 HOMEPAGE="https://damien.douxchamps.net/ieee1394/coriander/"
-DOWNLOAD="https://sourceforge.net/projects/coriander/files/coriander-2/2.0.2/coriander-2.0.2.tar.gz"
-MD5SUM="431d98fb013217681f97ade168201fb8"
+DOWNLOAD="https://sourceforge.net/projects/coriander/files/coriander-2/2.0.3/coriander-2.0.3.tar.gz"
+MD5SUM="6bf50046ba9ce3c72cc42a897c51ec24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libdc1394 libgnomeui"
+REQUIRES="libdc1394 ftplib libgnomeui"
 MAINTAINER="Philip Lacroix"
 EMAIL="slackph at posteo dot de"
diff --git a/multimedia/coriander/slack-desc b/multimedia/coriander/slack-desc
index dc2a5e7e8a..9b09607deb 100644
--- a/multimedia/coriander/slack-desc
+++ b/multimedia/coriander/slack-desc
@@ -15,5 +15,5 @@ coriander: videos to V4L streams. A live display is also provided. The program
 coriander: will work with IIDC-compatible devices (v1.04 or later) including
 coriander: most 1394 webcams and many industrial and scientific cameras.
 coriander:
-coriander: Homepage: http://damien.douxchamps.net/ieee1394/coriander/
+coriander: Homepage: https://damien.douxchamps.net/ieee1394/coriander/
 coriander:
diff --git a/multimedia/droidcam/Droidcam.desktop b/multimedia/droidcam/Droidcam.desktop
new file mode 100644
index 0000000000..b8c1f92f9c
--- /dev/null
+++ b/multimedia/droidcam/Droidcam.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=DroidCam
+Comment=Use your phone as a webcam
+TryExec=/usr/bin/droidcam
+Exec=/usr/bin/droidcam
+Icon=icon2.png
+Terminal=false
+Type=Application
+Categories=Video;AudioVideo;
diff --git a/multimedia/droidcam/README b/multimedia/droidcam/README
new file mode 100644
index 0000000000..1c5059f484
--- /dev/null
+++ b/multimedia/droidcam/README
@@ -0,0 +1,17 @@
+DroidCam
+
+DroidCam turns your phone/tablet into a webcam for your PC.
+Use it with chat programs like Zoom, MS Teams, and Skype.
+
+Main Features:
+– Chat using “DroidCam Webcam� on your computer, including Sound and Picture.
+– Connect over WiFi or USB cable.
+– Unlimited free usage with standard definition.
+– Keep using your phone while DroidCam is in background (Android).
+– Simple, safe, efficient, and trusted by millions of people worldwide.
+
+The GNU/Linux client is a combination an executable app that connects to 
+the phone, and Video4Linux and ALSA loopback drivers.
+
+It’s assumed you are somewhat familiar with the system and how to use the 
+Terminal. Please keep in mind other posts on the site are Windows oriented.
diff --git a/multimedia/droidcam/README.SLACKWARE b/multimedia/droidcam/README.SLACKWARE
new file mode 100644
index 0000000000..c4c7f8ca08
--- /dev/null
+++ b/multimedia/droidcam/README.SLACKWARE
@@ -0,0 +1,41 @@
+
+Droidcam Slackware
+
+After installing the package, a file to load the video audio modules will be 
+created in "/etc/rc.d" called "rc.droidcam", 
+
+If the module responsible for functional the camera is not working the 
+file is already with execution permission, only need run.
+
+chmod +x /etc/rc.d/rc.droidcam
+/etc/rc.d/rc.droidcam start
+
+Probably the camera and microphone modules of the cell phone will not be 
+loaded at startup, being necessary to add the 
+following lines in the file "rc.local".
+
+if [-x /etc/rc.d/rc.droidcam]; then
+      /etc/rc.d/rc.droidcam start &> / dev / null
+fi
+
+If you prefer to add in rc.shutdown.
+
+if [-x /etc/rc.d/rc.droidcam]; then
+     /etc/rc.d/rc.droidcam stop &> / dev / null
+fi
+
+Whenever you upgrade the kernel you need to reinstall the package so that the 
+module is recompiled on the new kernel.
+ 
+
+When you need to uninstall the package The camera video driver will still be 
+installed and you need to remove manually if you can. 
+
+Login as root.
+
+rmmod -f v4l2loopback_dc
+rm -f /lib/modules/`uname -r`/kernel/drivers/media/video/v4l2loopback-dc.ko
+
+
+For more informations.
+https://www.dev47apps.com/droidcam/linux/
diff --git a/multimedia/droidcam/doinst.sh b/multimedia/droidcam/doinst.sh
new file mode 100644
index 0000000000..02d9e036da
--- /dev/null
+++ b/multimedia/droidcam/doinst.sh
@@ -0,0 +1,15 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -d /opt/droidcam-1.7.2 ]; then
+  cd /opt/droidcam-1.7.2 && ./install-video >/dev/null 2>&1
+fi
+
+if [ -d /opt/droidcam-1.7.2 ]; then
+  cd /opt/droidcam-1.7.2 && ./install-sound >/dev/null 2>&1
+fi
diff --git a/multimedia/droidcam/droidcam.SlackBuild b/multimedia/droidcam/droidcam.SlackBuild
new file mode 100644
index 0000000000..127c41fd60
--- /dev/null
+++ b/multimedia/droidcam/droidcam.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for droidcam
+
+#
+# Copyright 2021 Andreo F. Rissardo <andreotec@gmail.com>
+# 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=droidcam
+VERSION=${VERSION:-1.7.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+
+unzip $CWD/"$PRGNAM"_"$VERSION".zip -d $TMP/$PRGNAM-$VERSION
+cd $TMP/$PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+
+#Prepare folder to install
+mkdir -p $PKG/etc/modprobe.d
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/share/icons
+mkdir -p $PKG/usr/share/applications
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/opt
+
+touch $PKG/etc/modprobe.d/$PRGNAM.conf
+cp -r $TMP/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION
+cat   $TMP/$PRGNAM-$VERSION/uninstall > $PKG/opt/$PRGNAM-uninstall
+cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM  $PKG/usr/bin/$PRGNAM
+cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM-cli $PKG/usr/bin/$PRGNAM-cli
+cp -a $TMP/$PRGNAM-$VERSION/icon2.png $PKG/usr/share/icons/icon2.png
+cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+#Documentation
+cp -a $CWD/README* $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+#Script for run modules
+cp $CWD/rc.$PRGNAM.new /etc/rc.d/rc.$PRGNAM
+
+mkdir -p $PKG/install
+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}
diff --git a/multimedia/droidcam/droidcam.info b/multimedia/droidcam/droidcam.info
new file mode 100644
index 0000000000..d17288cb17
--- /dev/null
+++ b/multimedia/droidcam/droidcam.info
@@ -0,0 +1,10 @@
+PRGNAM="droidcam"
+VERSION="1.7.2"
+HOMEPAGE="https://www.dev47apps.com/"
+DOWNLOAD="https://files.dev47apps.net/linux/droidcam_1.7.2.zip"
+MD5SUM="fada5d691f7f358cd66182ae2214b25f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="speex android-tools"
+MAINTAINER="Andreo F. Rissardo"
+EMAIL="andreotec@gmail.com"
diff --git a/multimedia/droidcam/rc.droidcam.new b/multimedia/droidcam/rc.droidcam.new
new file mode 100644
index 0000000000..e6d244fece
--- /dev/null
+++ b/multimedia/droidcam/rc.droidcam.new
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+
+
+
+
+
+case $1 in
+start)
+	modprobe snd-aloop && modprobe v4l2loopback_dc
+
+
+;;	
+
+stop)
+	rmmod -f snd-aloop && rmmod -f v4l2loopback_dc
+
+;;
+
+
+
+restart)
+
+			$0 stop
+
+
+	                $0 start
+;;
+
+
+*)
+        	echo 'Run only "/etc/rc.d/rc.droidcam start | stop| restart"'
+    ;;
+esac
diff --git a/multimedia/droidcam/slack-desc b/multimedia/droidcam/slack-desc
new file mode 100644
index 0000000000..fb7c41ae03
--- /dev/null
+++ b/multimedia/droidcam/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+droidcam: droicam (Use your phone as a webcam!)
+droidcam:
+droidcam: DroidCam turns your phone/tablet into a webcam for your PC. Use it
+droidcam: with chat programs like Zoom, MS Teams, and Skype. The app works with
+droidcam: a PC Client component that installs the webcam drivers, and connects 
+droidcam: the computer to your mobile.
+droidcam: 
+droidcam: 
+droidcam:
+droidcam: https://www.dev47apps.com/
+droidcam:
diff --git a/multimedia/ffmpeg4/ffmpeg4.SlackBuild b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
index 9799759324..30f00771d1 100644
--- a/multimedia/ffmpeg4/ffmpeg4.SlackBuild
+++ b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2018 Andreas Guldstrand
 # All rights reserved.
-# Copyright (c) 2020 Christoph Willing   Brisbane, Australia
+# Copyright (c) 2020-2021 Christoph Willing   Brisbane/Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PRGNAM=ffmpeg4
 SRCNAM=ffmpeg
-VERSION=${VERSION:-4.3.1}
+VERSION=${VERSION:-4.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/ffmpeg4/ffmpeg4.info b/multimedia/ffmpeg4/ffmpeg4.info
index a02dc3440a..dad8d9f9a9 100644
--- a/multimedia/ffmpeg4/ffmpeg4.info
+++ b/multimedia/ffmpeg4/ffmpeg4.info
@@ -1,8 +1,8 @@
 PRGNAM="ffmpeg4"
-VERSION="4.3.1"
+VERSION="4.3.2"
 HOMEPAGE="https://ffmpeg.org/"
-DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2"
-MD5SUM="804707549590e90880e8ecd4e5244fd8"
+DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2"
+MD5SUM="d84e0f81740adefa76d94ed8c3aa9006"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="aom libass libwebp x264 x265"
diff --git a/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
index a7eb61e68f..5800d9e790 100644
--- a/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
+++ b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flashplayer-plugin
-VERSION=${VERSION:-32.0.0.445}
+VERSION=${VERSION:-32.0.0.465}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/flashplayer-plugin/flashplayer-plugin.info b/multimedia/flashplayer-plugin/flashplayer-plugin.info
index af0a145975..828630bb4c 100644
--- a/multimedia/flashplayer-plugin/flashplayer-plugin.info
+++ b/multimedia/flashplayer-plugin/flashplayer-plugin.info
@@ -1,10 +1,10 @@
 PRGNAM="flashplayer-plugin"
-VERSION="32.0.0.445"
+VERSION="32.0.0.465"
 HOMEPAGE="https://get.adobe.com/flashplayer/"
-DOWNLOAD="https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.445/flash_player_npapi_linux.i386.tar.gz"
-MD5SUM="247df6252af16c5f55ff5efff6ded74d"
-DOWNLOAD_x86_64="https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.445/flash_player_npapi_linux.x86_64.tar.gz"
-MD5SUM_x86_64="4a5fbf321ae0c946a000ddd4fc7cb62e"
+DOWNLOAD="https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.465/flash_player_npapi_linux.i386.tar.gz"
+MD5SUM="d5630852001c5ddabdb2fa1915728e3a"
+DOWNLOAD_x86_64="https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.465/flash_player_npapi_linux.x86_64.tar.gz"
+MD5SUM_x86_64="86a40a0464fbd3ae85b6376aa794e79a"
 REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/multimedia/gnash/README b/multimedia/gnash/README
index 8b184d97eb..139c27d15c 100644
--- a/multimedia/gnash/README
+++ b/multimedia/gnash/README
@@ -1,9 +1,13 @@
 Gnash is the GNU SWF movie player, which can be run standalone on the
-desktop or an embedded device, as well as as a plugin for several browsers.
+desktop or an embedded device, as well as a plugin for several browsers.
 
-If you don't want to compile it or if you don't have KDE installed,
-you can disable the Konqueror plugin ("Klash") like this:
-  KLASH=no ./gnash.SlackBuild
+Plugins are now disabled by default due to browsers removing support.
+
+To enable the Mozilla NPAPI plugin, install xulrunner, then run
+  NPAPI=yes ./gnash.SlackBuild
+
+To enable the KDE4 Konqueror plugin, run
+  KPARTS4=yes ./gnash.SlackBuild
 
 Optional but recommended dependencies are speex, gst0-ffmpeg,
 and gst0-plugins-ugly.
diff --git a/multimedia/gnash/doinst.sh b/multimedia/gnash/doinst.sh
index 80505ba966..f33553f39b 100644
--- a/multimedia/gnash/doinst.sh
+++ b/multimedia/gnash/doinst.sh
@@ -11,9 +11,18 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+schema_install() {
+  SCHEMA="$1"
+  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
+  chroot . gconftool-2 --makefile-install-rule \
+    /etc/gconf/schemas/$SCHEMA \
+    1>/dev/null
+}
+
 config etc/gnashpluginrc.new
 config etc/gnashthumbnailrc.new
 config etc/gnashrc.new
+schema_install gnash.schemas
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index 99a4c07c84..6e359cf86e 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnash
 
-# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnash
-VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-7}
+VERSION=${VERSION:-0.8.11dev_20190130}
+SRCVER=${SRCVER:-583ccbc1275c7701dc4843ec12142ff86bb305b4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -37,7 +38,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO"
@@ -59,17 +60,32 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Set $KLASH to "no" to disable Klash, the Konqueror plugin.
-if [ "${KLASH:-yes}" = "yes" ]; then
-  KLASH_OPT="\
-  --with-kde4-incl=/usr/include \
-  --with-kde4-configdir=/usr/share/config \
+# Set $NPAPI to "yes" to enable the Mozilla plugin.  Requires xulrunner.
+if [ "${NPAPI:-no}" != "no" ]; then
+  NPAPI_OPT="--enable-write"  # This option no longer does anything?
+else
+  NPAPI_OPT="--disable-npapi"
+fi
+
+# TODO: Test the KPARTS3 plugin with KDE3/Trinity.
+if [ "${KPARTS3:-no}" != "no" ]; then
+  KPARTS3_OPT=""
+else
+  KPARTS3_OPT="--disable-kparts3"
+fi
+
+# Set $KPARTS4 to "yes" to enable the KDE4 Konqueror plugin.
+if [ "${KPARTS4:-no}" != "no" ]; then
+  KPARTS4_OPT=" \
   --with-kde4-prefix=/usr \
+  --with-kde4-incl=/usr/include \
   --with-kde4-lib=/usr/lib${LIBDIRSUFFIX} \
-  --with-kde-appsdatadir=/usr/share/apps/klash \
-  --with-kde4-servicesdir=/usr/share/kde4/services"
+  --with-kde4-plugindir=/usr/lib${LIBDIRSUFFIX}/kde4 \
+  --with-kde4-servicesdir=/usr/share/kde4/services \
+  --with-kde4-configdir=/usr/share/config \
+  --with-kde-appsdatadir=/usr/share/apps/klash"
 else
-  KLASH_OPT="--disable-kparts3 --disable-kparts4"
+  KPARTS4_OPT="--disable-kparts4"
 fi
 
 set -e
@@ -77,33 +93,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# Fix compilation with GCC 4.7.
-patch -p1 < $CWD/patch/gcc47.patch
-
-# Fix a boost linking error, paths for kde plugin, and a cve patch.
-# Ripped from gentoo
-patch -p1 < $CWD/patch/gnash-0.8.10-boost-1.50.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-klash.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-kde4-libdir.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch
-
-# Fix building with giflib-5.0
-# Also ripped from gentoo :-)
-patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
-patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
-
-# Fix build with new Boost
-# Taken from ARCH
-patch -p1 < $CWD/patch/gnash-boost.patch
-
-# The FFmpeg engine doesn't compile with FFmpeg 0.11.1.  Patches welcome.
-# In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg.
 autoreconf -vif
 ./configure \
   --prefix=/usr \
@@ -115,15 +110,14 @@ autoreconf -vif
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
   --disable-dependency-tracking \
-  --enable-media=gst \
   --enable-python \
   --enable-ssh \
   --enable-ssl \
-  --enable-write \
   --without-gconf \
   --with-plugins-install=system \
-  --with-speexdsp-incl=/usr/include/speex \
-  $KLASH_OPT \
+  $NPAPI_OPT \
+  $KPARTS3_OPT \
+  $KPARTS4_OPT \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
 
@@ -139,6 +133,9 @@ find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete
 find $PKG/etc -type f -exec mv {} {}.new \;
 find $PKG/usr/man -type f -exec gzip -9 {} +
 
+mkdir -p $PKG/etc/gconf/schemas
+mv $PKG/usr/share/applications/gnash.schemas $PKG/etc/gconf/schemas
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/gnash/gnash.info b/multimedia/gnash/gnash.info
index 012dd88c5f..1d609651ed 100644
--- a/multimedia/gnash/gnash.info
+++ b/multimedia/gnash/gnash.info
@@ -1,10 +1,10 @@
 PRGNAM="gnash"
-VERSION="0.8.10"
+VERSION="0.8.11dev_20190130"
 HOMEPAGE="https://www.gnu.org/software/gnash/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
-MD5SUM="63e9f79c41d93d48c5a2fa94856548c4"
+DOWNLOAD="https://git.savannah.gnu.org/cgit/gnash.git/snapshot/gnash-583ccbc1275c7701dc4843ec12142ff86bb305b4.tar.gz"
+MD5SUM="44dec2747ea79fd6bd68a58dc8512821"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="agg xulrunner"
+REQUIRES="agg"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
deleted file mode 100644
index b3242ce0d3..0000000000
--- a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 58dcdd9338d965e54c8f03ce3d2757388d82b7a3 Mon Sep 17 00:00:00 2001
-From: gustavo <gbuschle@hotmail.com>
-Date: Thu, 11 Sep 2014 14:12:17 +0000
-Subject: Add support for giflib 5.1
-
----
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index 84b09ce..2ae5ddb 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -120,7 +120,11 @@ GifInput::GifInput(std::shared_ptr<IOChannel> in)
- GifInput::~GifInput()
- {
-     // Clean up allocated data.
--    DGifCloseFile(_gif);
-+#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1
-+	DGifCloseFile(_gif, 0);
-+#else
-+	DGifCloseFile(_gif);
-+#endif
- }
- 
- size_t
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
deleted file mode 100644
index 6e90737d51..0000000000
--- a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cc22f2d0597f3a9547980f4786d918f8b5635472 Mon Sep 17 00:00:00 2001
-From: OBATA Akio <obata@lins.jp>
-Date: Mon, 15 Jul 2013 07:16:39 +0000
-Subject: Add support fir GIFLIB-5.0 (bug #39482)
-
-Signed-off-by: Sandro Santilli <strk@keybit.net>
----
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index eeba4b7..26865c1 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -269,7 +269,17 @@ GifInput::processRecord(GifRecordType record)
- void
- GifInput::read()
- {
-+#if GIFLIB_MAJOR >= 5
-+    int errorCode;
-+    _gif = DGifOpen(_inStream.get(), &readData, &errorCode); 
-+#else
-     _gif = DGifOpen(_inStream.get(), &readData); 
-+#endif
-+
-+    if ( ! _gif ) {
-+        // TODO: decode errorCode if available
-+        throw ParserException("Could not open input GIF stream");
-+    }
- 
-     GifRecordType record;
- 
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/gcc47.patch b/multimedia/gnash/patch/gcc47.patch
deleted file mode 100644
index 7886b097c9..0000000000
--- a/multimedia/gnash/patch/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/plugin/klash4/klash_part.cpp b/plugin/klash4/klash_part.cpp
---- a/plugin/klash4/klash_part.cpp
-+++ b/plugin/klash4/klash_part.cpp
-@@ -27,6 +27,7 @@
- #include <QByteArray>
- #include <QMenu>
- #include <QTimer>
-+#include <unistd.h>
- 
- #include <klibloader.h>
- #include <kdebug.h>
diff --git a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch b/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch
deleted file mode 100644
index 23282d1e89..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/macros/boost.m4 b/macros/boost.m4
---- a/macros/boost.m4	2012-09-03 17:11:43.000000000 +0200
-+++ b/macros/boost.m4	2012-10-16 01:58:28.000000000 +0200
-@@ -37,7 +37,7 @@
-   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
-   dnl this is a list of *required* libraries. If any of these are missing, this
-   dnl test will return a failure, and Gnash won't build.
--  boost_libs="thread program_options iostreams"
-+  boost_libs="thread program_options iostreams system"
-
-   dnl this is a list of *recommended* libraries. If any of these are missing, this
-   dnl test will return a warning, and Gnash will build, but testing won't work.
-diff -ur a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
---- a/plugin/npapi/Makefile.am	2012-09-03 17:11:43.000000000 +0200
-+++ b/plugin/npapi/Makefile.am	2012-10-16 01:58:57.000000000 +0200
-@@ -78,7 +78,7 @@
-
- libgnashplugin_la_LIBADD   = \
-	$(GLIB_LIBS) \
--	-lboost_iostreams \
-+	$(BOOST_LIBS) \
-	$(NULL)
- 
- # Scriptable plugin support
diff --git a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch b/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch
deleted file mode 100644
index 9a218d9216..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001
-From: Benjamin Wolsey <bwy@benjaminwolsey.de>
-Date: Sat, 10 Mar 2012 14:52:50 +0000
-Subject: Fix crash in GnashImage.cpp
-
----
-diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
-index 11c6956..03a6939 100644
---- a/libbase/GnashImage.cpp
-+++ b/libbase/GnashImage.cpp
-@@ -26,6 +26,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <algorithm>
-+#include <cassert>
- 
- #ifdef USE_PNG
- # include "GnashImagePng.h"
-@@ -44,6 +45,21 @@ namespace image {
- 
- namespace {
-     void processAlpha(GnashImage::iterator imageData, size_t pixels);
-+    bool checkValidSize(size_t width, size_t height, size_t channels) {
-+
-+        if (width == 0 || height == 0) return false;
-+
-+        assert(channels > 0);
-+
-+        boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max();
-+        if (width >= maxSize || height >= maxSize) return false;
-+
-+        maxSize /= channels;
-+        maxSize /= width;
-+        maxSize /= height;
-+
-+        return maxSize > 0;
-+    }
- }
- 
- GnashImage::GnashImage(iterator data, size_t width, size_t height,
-@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height,
-     _height(height),
-     _data(data)
- {
-+    // Callers should check dimensions
-+    assert(checkValidSize(_width, _height, channels()));
- }
- 
- /// Create an image allocating a buffer of height*pitch bytes
-@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type,
-     _width(width),
-     _height(height)
- {
--    const size_t max = std::numeric_limits<boost::int32_t>::max();
--    if (size() > max) {
-+    // Constructed from external input, so restrict dimensions to avoid
-+    // overflow in size calculations
-+    if (!checkValidSize(_width, _height, channels())) {
-         throw std::bad_alloc();
-     }
-     _data.reset(new value_type[size()]);
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch b/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch
deleted file mode 100644
index b3279441d2..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4	2011-11-25 18:09:25.000000000 +0100
-@@ -198,7 +198,7 @@
-       if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
-         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
-       else
--        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-+        KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
-       fi
-     fi
-     if test x"${with_kde4_servicesdir}" != x ; then 
diff --git a/multimedia/gnash/patch/gnash-0.8.10-klash.patch b/multimedia/gnash/patch/gnash-0.8.10-klash.patch
deleted file mode 100644
index e6afec04d2..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-klash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4	2011-03-21 00:04:38.845997945 +0100
-@@ -210,7 +210,7 @@
-       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
-     fi
-     if test x"${KDE4_APPSDATADIR}" = x ; then 
--      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
-     fi
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/multimedia/gnash/patch/gnash-boost.patch b/multimedia/gnash/patch/gnash-boost.patch
deleted file mode 100644
index 55208f1ae3..0000000000
--- a/multimedia/gnash/patch/gnash-boost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnash-0.8.10/libbase/accumulator.h.orig	2016-02-08 02:56:17.059694787 +0700
-+++ gnash-0.8.10/libbase/accumulator.h	2016-02-08 02:57:58.375615249 +0700
-@@ -61,6 +61,11 @@
-     virtual unsigned min_tokens() const { return 0; }
-     virtual unsigned max_tokens() const { return 0; }
- 
-+    #if BOOST_VERSION >= 105900
-+    /// There are no tokens, so this is indifferent.
-+    virtual bool adjacent_tokens_only() const { return false; }
-+    #endif
-+
-     /// Accumulating from different sources is silly.
-     virtual bool is_composing() const { return false; }
- 
diff --git a/multimedia/gpodder/README b/multimedia/gpodder/README
index af37efb180..082b27e420 100644
--- a/multimedia/gpodder/README
+++ b/multimedia/gpodder/README
@@ -1,6 +1,6 @@
 gPodder is a podcast receiver/catcher written in Python utilizing PyGTK
 for its user interface.  gPodder allows the user to subscribe to RSS
 feeds for podcasts, videocasts, and other similar content and download
-media files found in those feeds.  gPodder has system-tray notifications,
-remote access to the gpodder.net web services and optional support for
-Bluetooth and iPod synchronization.
+media files found in those feeds.  gPodder has system-tray
+notifications, remote access to the gpodder.net web services and
+optional support for Bluetooth and iPod synchronization.
diff --git a/multimedia/gpodder/gpodder.SlackBuild b/multimedia/gpodder/gpodder.SlackBuild
index 7659bbd4b2..cc5b973767 100644
--- a/multimedia/gpodder/gpodder.SlackBuild
+++ b/multimedia/gpodder/gpodder.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gpodder
-VERSION=${VERSION:-3.10.11}
+VERSION=${VERSION:-3.10.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/gpodder/gpodder.info b/multimedia/gpodder/gpodder.info
index c0f010dec7..83cbd9bab7 100644
--- a/multimedia/gpodder/gpodder.info
+++ b/multimedia/gpodder/gpodder.info
@@ -1,8 +1,8 @@
 PRGNAM="gpodder"
-VERSION="3.10.11"
+VERSION="3.10.17"
 HOMEPAGE="http://gpodder.org/"
-DOWNLOAD="https://github.com/gpodder/gpodder/archive/3.10.11/gpodder-3.10.11.tar.gz"
-MD5SUM="1dfcfb0360492357111393d27da55f5f"
+DOWNLOAD="https://github.com/gpodder/gpodder/archive/3.10.17/gpodder-3.10.17.tar.gz"
+MD5SUM="2262b6fa6f26a0e933a6ea8b0d68b33c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dbus-python3 pygobject3-python3 podcastparser mygpoclient"
diff --git a/multimedia/k9copy-reloaded/README b/multimedia/k9copy-reloaded/README
index d8f146a7d3..3f2efa3d1e 100644
--- a/multimedia/k9copy-reloaded/README
+++ b/multimedia/k9copy-reloaded/README
@@ -2,23 +2,22 @@ K9copy-reloaded is a continuation of the original k9copy program.
 It allows you to make 1:1 backups of both single-and dual-layer
 DVDs, as well as compress a dual-layer DVD to single-layer.
 
-NOTE 1: For some reason, this will not build properly if ccache is
-enabled.  (It will build and run, but the backups come out corrupted.)
+NOTE 1: This script now uses the system ffmpeg, so be sure it is
+installed before trying to run this script.
 
-NOTE 2: This script builds an internal copy of the ffmpeg 2.8.15
-static libaries.  It has been tested and does not (should not?)
-interfere with any existing ffmpeg installation.  Just remember that
-you need to be in a full shell (su - and not just su) for ffmpeg
-to build properly.
-
-NOTE 3: K9copy-reloaded is unable to open .iso files on 32-bit systems.
+NOTE 2: K9copy-reloaded is unable to open .iso files on 32-bit systems.
 This is an issue with libdvdread and not with k9copy-reloaded.
 They open just fine on 64-bit systems.
 
-NOTE 4: If you wish to build this on current (15.0 EXPERIMENTAL), you
-will need to build and install the gcc5 package from ponce's -current
-SBo repo, then pass CURRENT=yes to the script.
+NOTE 3: If you wish to build this on current (15.0 EXPERIMENTAL), you
+will need to pass CURRENT=yes to the script.
+
+NOTE 4: dvdauthor is listed as optional, but it is not necessary.
+It crashes k9copy if you try to use it in current, but it works fine
+in 14.2.  It is disabled by default in settings.
 
 NOTE 5: This program is only intended for personal backups, and is NOT
 intended for copying of copyrighted commercial DVDs.  Therefore, there 
 is NO CSS decription libary included in this package.
+
+Requires libmpeg2 and ffmpeg (ffmpeg is already included in current).
diff --git a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
index aa12e5ddd7..4f1e30b823 100644
--- a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
+++ b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
@@ -5,9 +5,6 @@
 # Copyright 2018, 2020 by Lenard Spencer (lenardrspencer@gmail.com)
 # All rights reserved.
 #
-# ffmpeg static library section borrowed (stolen?) from xine-lib.SlackBuild
-# from Slackware 14.2 source archives,copyrighted by Pat Volkerding, et. al.
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -29,8 +26,7 @@
 PRGNAM=k9copy-reloaded
 SRCNAM=k9copy
 VERSION=${VERSION:-3.0.3}
-BUILD=${BUILD:-4}
-FFMPEG_VERSION=${FFMPEG_VERSION:-2.8.16}
+BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,100 +41,27 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-NUMJOBS=${NUMJOBS:--j7}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  # 32bit x86 fails without this...
-  FFARCHOPTS="--disable-asm"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  # 32bit x86 fails without this...
-  FFARCHOPTS="--disable-asm"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  FFARCHOPTS="--arch=x86_64 --enable-pic"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  FFARCHOPTS=""
 fi
 
-CURRENT=${CURRENT:-no}
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-if [ "$CURRENT" = "yes" ]; then
-  # check for gcc5 and abort if not found:
-  if ! [ -x /usr/bin/gcc-5 ]; then
-    echo "Cannot find the gcc5 package.  Please install the gcc5 package"
-    echo "and rerun the SlackBuild script."
-    exit 1
-  fi
-  # Set gcc-5 vars to make it build with gcc5:
-  # cmake will use these settings to build k9copy-reloaded
-  source /etc/profile.d/gcc5.sh
-  # Options for ffmpeg:
-  GCC5OPTS="--cc=gcc-5 --cxx=g++-5 --ar=gcc-ar-5 --nm=gcc-nm-5 --ranlib=gcc-ranlib-5 --dep-cc=gcc-5"
-else
-  GCC5OPTS=""
-fi
-
-rm -rf ffmpeg*
-tar xvf $CWD/ffmpeg-$FFMPEG_VERSION.tar.?z* || exit 1
-cd ffmpeg* || exit 1
-
-  chown -R root:root .
-  find . \
-   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -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 {} \;
-
-  echo "Building static ffmpeg libs ..."
-
-  FFMPEGDIR=/$TMP/ffmpeg-temp
-
-  CFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
-  CXXFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
-  ./configure \
-    --prefix=$FFMPEGDIR/usr \
-    $GCC5OPTS \
-    --libdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \
-    --shlibdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-postproc \
-    --disable-doc \
-    --disable-avfilter \
-    --disable-avdevice \
-    --disable-swresample \
-    --disable-ffserver \
-    --disable-ffplay \
-    --disable-ffmpeg \
-    --disable-ffprobe \
-    --enable-pthreads \
-    --disable-debug \
-    --disable-shared \
-    --enable-static \
-    --enable-hardcoded-tables \
-    --enable-memalign-hack \
-    --enable-bzlib \
-    --enable-zlib \
-    --enable-libopenjpeg \
-    ${FFARCHOPTS}
-
-    make
-    make install # Note: no DESTDIR !!
-cd -
-
 rm -rf $SRCNAM
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM
@@ -149,28 +72,54 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patches from upstream and community:
-patch -p1 < $CWD/patches/k9copy-mimetype.patch
-patch -p0 < $CWD/patches/k9copy-tempdir.patch
-
-# Fix internal dvdnav to link against internal dvdread
+# Insert a blank CmakeLists.txt file in various subs
+# or the build will fail
+touch src/libdvdnav-NOW/CMakeLists.txt
+touch src/libdvdnav-NOW/vm/CMakeLists.txt
+touch src/libdvdnav-NOW/dvdnav/CMakeLists.txt
+touch src/libdvdread-NOW/CMakeLists.txt
+touch src/libdvdread-NOW/dvdread/CMakeLists.txt
+
+patch -p1 < $CWD/patches/k9copy-fix-desktop-files.patch
+patch -p1 < $CWD/patches/k9copy-installdirs.patch
+patch -p1 < $CWD/patches/k9copy-ffmpeg3.patch
+
+# from the Fedora community, MUCH better than the ill-conceived and
+# BROKEN gcc6 patch that has been floating around the web:
+patch -p1 < $CWD/patches/k9copy-gcc7.patch
+
+# There have been several attempts to remove the internal libdvdread
+# and libdvdnav, but NONE of then work properly (the program builds,
+# but the backups are corrupt and will not play).  I may revisit it
+# later, but for now, we must patch the internal dvdnav to properly
+# link to the internal dvdread:
 patch -p1 < $CWD/patches/k9copy-dvdnav.patch
 
-# Needed to link with the ffmpeg static libs we just built:
-export PKG_CONFIG_PATH="${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig:$PKG_CONFIG_PATH"
+# In current, dvdauthor crashes the program if we try to use it
+# for copy without menus, so we disable it by default in settings:
+patch -p1 < $CWD/patches/k9copy-uncheck-dvdauthor.patch
+
+# Patch for missing "Language=" entry in .po files:
+patch -p1 < $CWD/patches/k9copy-missing-language-in-po-files.patch
+
+# Patch for i18n (mitigates I18N_ARGUMENT_MISSING messages:
+patch -p1 < $CWD/patches/k9copy-i18n.patch
+
+if [ "${CURRENT:-no}" = "yes" ];then
+  QT5="ON"
+else
+  QT5="OFF"
+fi
 
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DFFMPEGSCALE_LIBRARY:FILEPATH=${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX} \
-    -DFFMPEGSCALE_INCLUDE_DIR_LAVC=${FFMPEGDIR}/usr/include \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS -std=c++11" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
+    -DQT5_BUILD="$QT5" \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/multimedia/k9copy-reloaded/k9copy-reloaded.info b/multimedia/k9copy-reloaded/k9copy-reloaded.info
index 09827a5505..a82603e1e8 100644
--- a/multimedia/k9copy-reloaded/k9copy-reloaded.info
+++ b/multimedia/k9copy-reloaded/k9copy-reloaded.info
@@ -1,12 +1,10 @@
 PRGNAM="k9copy-reloaded"
 VERSION="3.0.3"
 HOMEPAGE="http://k9copy-reloaded.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/k9copy-reloaded/k9copy-3.0.3.tar.gz \
-          http://www.ffmpeg.org/releases/ffmpeg-2.8.16.tar.bz2"
-MD5SUM="53158282e23a4aa4fb8f4336f1424521 \
-        d7aca0cd98f9e3b4a6085cd1e715ce43"
+DOWNLOAD="http://downloads.sourceforge.net/project/k9copy-reloaded/k9copy-3.0.3.tar.gz"
+MD5SUM="53158282e23a4aa4fb8f4336f1424521"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dvdauthor libmpeg2"
+REQUIRES="ffmpeg libmpeg2"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-ffmpeg3.patch b/multimedia/k9copy-reloaded/patches/k9copy-ffmpeg3.patch
new file mode 100644
index 0000000000..e01b562787
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-ffmpeg3.patch
@@ -0,0 +1,44 @@
+diff -Nru a/src/import/k9avidecode.cpp b/src/import/k9avidecode.cpp
+--- a/src/import/k9avidecode.cpp	2014-09-29 17:00:12.000000000 +0200
++++ b/src/import/k9avidecode.cpp	2017-03-10 06:42:21.692670007 +0100
+@@ -26,7 +26,6 @@
+ void av_free_packet_internal(AVPacket *pkt)
+ {
+     if (pkt) {
+-        if (pkt->destruct) pkt->destruct(pkt);
+         pkt->data = NULL; pkt->size = 0;
+     }
+ }
+@@ -238,14 +237,14 @@
+ 
+     int numBytes;
+ // Determine required buffer size and allocate buffer
+-    numBytes=avpicture_get_size(PIX_FMT_RGB24, m_CodecCtx->width,
++    numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, m_CodecCtx->width,
+                                 m_CodecCtx->height);
+     m_buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t));
+ 
+ // Assign appropriate parts of buffer to image planes in pFrameRGB
+ // Note that pFrameRGB is an AVFrame, but AVFrame is a superset
+ // of AVPicture
+-    avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, PIX_FMT_RGB24,
++    avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, AV_PIX_FMT_RGB24,
+                    m_CodecCtx->width, m_CodecCtx->height);
+ 
+  
+@@ -317,13 +316,13 @@
+                     bFound=true;
+ #ifndef HAVE_SWSCALE
+                   // Convert the image from its native format to RGB
+-                    img_convert((AVPicture *)m_FrameRGB, PIX_FMT_RGB24,
++                    img_convert((AVPicture *)m_FrameRGB, AV_PIX_FMT_RGB24,
+                                 (AVPicture*)m_Frame, m_CodecCtx->pix_fmt,
+                                 m_CodecCtx->width, m_CodecCtx->height);
+                     SaveFrame(m_FrameRGB, m_CodecCtx->width,
+                               m_CodecCtx->height);
+ #else
+-		    toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL);
++		    toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, AV_PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL);
+         		   sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize);
+                     // convert frame to QImage
+                     SaveFrame(m_FrameRGB, m_CodecCtx->width,
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-fix-desktop-files.patch b/multimedia/k9copy-reloaded/patches/k9copy-fix-desktop-files.patch
new file mode 100644
index 0000000000..ace6842e87
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-fix-desktop-files.patch
@@ -0,0 +1,66 @@
+diff -Naur a/k9copy.desktop b/k9copy.desktop
+--- a/k9copy.desktop	2014-09-29 11:00:11.000000000 -0400
++++ b/k9copy.desktop	2020-12-25 20:56:36.228414115 -0500
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+ Name=k9copy
+-Exec=k9copy -caption "%c" %i %u
++Exec=k9copy "%c" %i %u
+ Comment=DVD9 to DVD5 backup tool
+ Comment[fr]=Backup de DVD9 en DVD5
+ Comment[tr]=DVD9 DVD5 yedekleme aracı
+@@ -15,5 +15,5 @@
+ Terminal=false
+ Icon=k9copy
+ X-DocPath=k9copy/index.html
+-Categories=Qt;KDE;AudioVideo;DiscBurning;AudioVideoEditing;
++Categories=Qt;KDE;AudioVideo;DiscBurning;AudioVideoEditing;Video;
+ X-KDE-StartupNotify=true
+diff -Naur a/k9copy_assistant.desktop b/k9copy_assistant.desktop
+--- a/k9copy_assistant.desktop	2014-09-29 11:00:12.000000000 -0400
++++ b/k9copy_assistant.desktop	2020-12-25 20:56:36.228414115 -0500
+@@ -1,9 +1,7 @@
+-#!/usr/bin/env xdg-open
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=k9copy assistant
+-Exec=k9copy --assistant -caption "%c" %i %m  %u
++Exec=k9copy --assistant "%c" %i %m  %u
+ Comment=DVD9 to DVD5 backup tool
+ Comment[fr]=Backup de DVD9 en DVD5
+ Comment[tr]=DVD9 DVD5 yedekleme aracı
+@@ -14,9 +12,8 @@
+ GenericName[tr]=DVD Vidyo Yedekleme Aracı
+ GenericName[ru]=Копирование � видео-DVD
+ GenericName[uk]=Копіюванн� відео-DVD
+-MimeTypes=
+ Terminal=false
+ Icon=k9copy
+ X-DocPath=k9copy/index.html
+-Categories=Qt;KDE;AudioVideo;DiscBurning;
+-X-KDE-StartupNotify=true
+\ No newline at end of file
++Categories=Qt;KDE;AudioVideo;DiscBurning;Video;
++X-KDE-StartupNotify=true
+diff -Naur a/k9copy_assistant_open.desktop b/k9copy_assistant_open.desktop
+--- a/k9copy_assistant_open.desktop	2014-09-29 11:00:12.000000000 -0400
++++ b/k9copy_assistant_open.desktop	2020-12-25 20:57:16.993844890 -0500
+@@ -11,4 +11,4 @@
+ [Desktop Entry]
+ X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]]
+ Type=Service
+-Actions=open;
+\ No newline at end of file
++Actions=open;
+diff -Naur a/k9copy_open.desktop b/k9copy_open.desktop
+--- a/k9copy_open.desktop	2014-09-29 11:00:12.000000000 -0400
++++ b/k9copy_open.desktop	2020-12-25 20:57:45.522142523 -0500
+@@ -11,4 +11,4 @@
+ [Desktop Entry]
+ X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]]
+ Type=Service
+-Actions=open;
+\ No newline at end of file
++Actions=open;
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-gcc7.patch b/multimedia/k9copy-reloaded/patches/k9copy-gcc7.patch
new file mode 100644
index 0000000000..a90cd7b368
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-gcc7.patch
@@ -0,0 +1,30 @@
+diff -up k9copy/src/backup/k9dvdbackup.cpp.gcc7 k9copy/src/backup/k9dvdbackup.cpp
+--- k9copy/src/backup/k9dvdbackup.cpp.gcc7	2014-09-29 18:55:40.000000000 +0200
++++ k9copy/src/backup/k9dvdbackup.cpp	2017-10-04 14:48:33.100692360 +0200
+@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32
+ 
+ 
+         if ((vobu1 !=NULL) && (vobu2!=NULL)) {
+-            *_offset = abs(vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
++            *_offset = abs((int32_t)(vobu1->newSector - vobu2->newSector))  | maskOffset1 ;
+             *_offset |= maskOffset2;
+             return vobu2;
+         }
+diff -up k9copy/src/backup/k9execcopy.cpp.gcc7 k9copy/src/backup/k9execcopy.cpp
+--- k9copy/src/backup/k9execcopy.cpp.gcc7	2014-09-29 17:00:12.000000000 +0200
++++ k9copy/src/backup/k9execcopy.cpp	2017-10-04 14:51:04.899589523 +0200
+@@ -306,12 +306,12 @@ void k9ExecCopy::createMkv(k9DVDTitle *_
+ 
+ #if QT_VERSION >= 0x050000
+     m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() );
+-    m_progressDialog->setCancelButton(false);
++    m_progressDialog->setCancelButton(NULL);
+ 
+ #else
+     m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() );
+ 
+-    m_progressDialog->showCancelButton(false);
++    m_progressDialog->showCancelButton(NULL);
+ #endif
+ #if QT_VERSION >= 0x050000
+     m_progressDialog->setMaximum(100);
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-i18n.patch b/multimedia/k9copy-reloaded/patches/k9copy-i18n.patch
new file mode 100644
index 0000000000..365fa08a5b
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-i18n.patch
@@ -0,0 +1,942 @@
+diff -Naur k9copy-work/src/assistant/k9aststreams.cpp k9copy/src/assistant/k9aststreams.cpp
+--- k9copy-work/src/assistant/k9aststreams.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/assistant/k9aststreams.cpp	2020-12-23 23:53:38.473154933 -0500
+@@ -54,7 +54,7 @@
+     showDefault(false);
+     setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
+     setCheckState(0,_stream->getselected()?Qt::Checked:Qt::Unchecked);
+-    setText(0,i18n("%4 - %1 %2 %3 ch").arg(_stream->getlanguage()).arg(_stream->getformat()).arg(_stream->getchannels()).arg(_stream->getID()));
++    setText(0,i18n("%4 - %1 %2 %3 ch",_stream->getlanguage(),_stream->getformat(),_stream->getchannels(),_stream->getID()));
+     setIcon(0,SmallIcon("sound"))    ;
+     //setText(1,i18n("%1 MB",_stream->getsize_mb()));
+ }
+@@ -65,7 +65,7 @@
+     showDefault(false);
+     setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
+     setCheckState(0,_stream->getselected()?Qt::Checked:Qt::Unchecked);
+-    setText(0,i18n("%3 - %1 %2").arg(_stream->getlanguage()).arg(_stream->getcontent()).arg(_stream->getID().first()));
++    setText(0,i18n("%3 - %1 %2",_stream->getlanguage(),_stream->getcontent(),_stream->getID().first()));
+     setIcon(0,SmallIcon("subtitle"));
+ 
+     //setText(1,i18n("%1 MB",_stream->getsize_mb()));
+diff -Naur k9copy-work/src/assistant/k9asttitles.cpp k9copy/src/assistant/k9asttitles.cpp
+--- k9copy-work/src/assistant/k9asttitles.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/assistant/k9asttitles.cpp	2020-12-23 23:48:01.704471948 -0500
+@@ -276,22 +276,22 @@
+     int ch=0;
+     for (int i=0;i< _title->getchapterCount();i++) {
+         _k9ItemWidget *it =new _k9ItemWidget(_title->getChapter(i),_parent,k9astTitles::CHAPTER);
+-        it->setText(1,i18n("chapter %1").arg(++ch));
++        it->setText(1,i18n("chapter %1",++ch));
+         QString s;
+ 
+         s=QString("%1").arg((double)(_title->getChapter(i)->getsectors()) /512,0,'f',2);
+ 	it->setText(2,QString("%1").arg(_title->getChapter(i)->getLength().toString("hh:mm:ss")));
+-        it->setText(3,i18n("%1 MB").arg(s));
++        it->setText(3,i18n("%1 MB",s));
+     }
+     for (int j=0;j <_title->getTitles().count();j++) {
+         k9DVDTitle *title2=_title->getTitles().at(j);
+         for (int i=0;i< title2->getchapterCount();i++) {
+             _k9ItemWidget *it =new _k9ItemWidget(title2->getChapter(i),_parent,k9astTitles::CHAPTER);
+-            it->setText(1,i18n("chapter %1").arg(++ch));
++            it->setText(1,i18n("chapter %1",++ch));
+             QString s;
+             s=QString("%1").arg((double)(title2->getChapter(i)->getsectors()) /512,0,'f',2);
+ 	    it->setText(2,QString("%1").arg(title2->getChapter(i)->getLength().toString("hh:mm:ss")));
+-            it->setText(3,i18n("%1 MB").arg(s));
++            it->setText(3,i18n("%1 MB",s));
+         }
+ 
+     }
+diff -Naur k9copy-work/src/backup/k9dvdauthor.cpp k9copy/src/backup/k9dvdauthor.cpp
+--- k9copy-work/src/backup/k9dvdauthor.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/backup/k9dvdauthor.cpp	2020-12-23 23:48:01.704471948 -0500
+@@ -161,7 +161,7 @@
+             error=true;
+             QString sMsg;
+             //sMsg.QString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1());
+-            sMsg=i18n("'%1' not selected").arg(l_track->getname());
++            sMsg=i18n("'%1' not selected",l_track->getname());
+             k9Dialogs::error( sMsg, i18n("authoring"));
+         }
+         start.sprintf("jump titleset %d menu;",DVD->getnewTitleNum(l_track));
+@@ -415,7 +415,7 @@
+             c.sprintf("g1=%d;\ncall vmgm menu;",DVD->getnewTitleNum(l_next));
+             if ( DVD->getnewTitleNum(l_next)==-1) {
+                 error=true;
+-                c=i18n("'%1' not selected").arg(l_next->getname());
++                c=i18n("'%1' not selected",l_next->getname());
+                 k9Dialogs::error( c, i18n("authoring"));
+             }
+ 
+@@ -439,7 +439,7 @@
+ void k9DVDAuthor::author() {
+     k9Config config;
+     if ( ! k9Tools::checkProgram("dvdauthor")) {
+-        k9Dialogs::error (i18n("Unable to run %1").arg("dvdauthor") , i18n("authoring"));
++        k9Dialogs::error (i18n("Unable to run %1","dvdauthor") , i18n("authoring"));
+         error = TRUE;
+         return;
+     }
+diff -Naur k9copy-work/src/backup/k9dvdbackup.cpp k9copy/src/backup/k9dvdbackup.cpp
+--- k9copy-work/src/backup/k9dvdbackup.cpp	2020-12-23 23:47:42.374321418 -0500
++++ k9copy/src/backup/k9dvdbackup.cpp	2020-12-23 23:48:01.705471956 -0500
+@@ -295,13 +295,13 @@
+     k9DVDFile *dvdfile;
+     if ((dvdfile = m_dvdread->openTitle( _vts))== 0) {
+         QString stmp;
+-        stmp=i18n("Unable to open titleset %1").arg(_vts);
++        stmp=i18n("Unable to open titleset %1",_vts);
+         seterror(stmp);
+         return ;
+     }
+     setTotalSteps(vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs  -1);
+     QString c;
+-    c=i18n("Extracting titleset %1").arg(_vts);
++    c=i18n("Extracting titleset %1",_vts);
+     setProgressLabel(c);
+     if (!k9Tools::getBatchCopy())
+         backupDlg->show();
+@@ -477,7 +477,7 @@
+     k9DVDFile *dvdfile;
+     if ((dvdfile = m_dvdread->openMenu( _vts))== 0) {
+         QString stmp;
+-        stmp=i18n("Unable to open menu for titleset %1").arg(_vts);
++        stmp=i18n("Unable to open menu for titleset %1",_vts);
+         seterror (stmp);
+         return 0;
+     }
+@@ -503,7 +503,7 @@
+     uint32_t sector, dsi_next_vobu = 0;
+     uint32_t imax=length/sizeof(cell_adr_t);
+     QString c;
+-    c=i18n("Extracting menu for titleset %1").arg(_vts);
++    c=i18n("Extracting menu for titleset %1",_vts);
+     setProgressLabel(c);
+     if (!k9Tools::getBatchCopy()) {
+         backupDlg->show();
+@@ -597,7 +597,7 @@
+         vts_handle=currTS->ifoTitle->getIFO();
+         if (!vts_handle) {
+             QString stmp;
+-            stmp=i18n("Unable to open ifo file for titleset %1").arg(vts_num);
++            stmp=i18n("Unable to open ifo file for titleset %1",vts_num);
+             seterror (stmp);
+             //JMP            vamps->setNoData();
+             return;
+@@ -605,7 +605,7 @@
+ 
+         setTotalSteps( vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs  -1);
+         QString c;
+-        c=i18n("Extracting titleset %1").arg(vts_num);
++        c=i18n("Extracting titleset %1",vts_num);
+         setProgressLabel(c);
+         if (!k9Tools::getBatchCopy())
+             backupDlg->show();
+@@ -620,7 +620,7 @@
+     dvdfile = m_dvdread->openTitle (vts_num);
+     if (! dvdfile) {
+         QString stmp;
+-        stmp=i18n("Unable to open vobs for titleset %1").arg(vts_num);
++        stmp=i18n("Unable to open vobs for titleset %1",vts_num);
+         seterror( stmp);
+         //JMP        vamps->setNoData();
+         return;
+@@ -1450,7 +1450,7 @@
+                     sName="VIDEO_TS.VOB";
+                 else
+                     sName.sprintf("VTS_%02d_%d.VOB",(int)currVTS,(int)VobNum);
+-                dbg=i18n("Updating vob %1").arg(sName);
++                dbg=i18n("Updating vob %1",sName);
+                 sName=output+"/"+sName;
+                 QFileInfo finfo(sName);
+                 long fileSize=finfo.size();
+diff -Naur k9copy-work/src/backup/k9execcopy.cpp k9copy/src/backup/k9execcopy.cpp
+--- k9copy-work/src/backup/k9execcopy.cpp	2020-12-23 23:47:42.374321418 -0500
++++ k9copy/src/backup/k9execcopy.cpp	2020-12-23 23:48:01.705471956 -0500
+@@ -39,7 +39,7 @@
+     m_cancelled=false;
+     QString filename;
+     if (!m_dvd->getopened()) {
+-        k9Dialogs::error(  i18n("DVD is not opened"), i18n("DVD Copy"));
++        k9Dialogs::error(  i18n("DVD is not opened"),i18n("DVD Copy"));
+         return;
+     }
+ 
+@@ -70,7 +70,7 @@
+     long fs=k9Tools::getFreeSpace(outputDir);
+     int maxSize=config.getPrefSize() < (m_dvd->getsizeSelected(false)/512) ? config.getPrefSize():(m_dvd->getsizeSelected(false)/512);
+      if ((fs < maxSize) && (fs !=-1)) {
+-        if (k9Dialogs::warningContinueCancel ( i18n("Insufficient disk space on %1\n%2 MB expected.").arg(outputDir).arg(config.getPrefSize()),i18n("DVD Copy"))==cancel)
++        if (k9Dialogs::warningContinueCancel ( i18n("Insufficient disk space on %1\n%2 MB expected.",outputDir,config.getPrefSize()),i18n("DVD Copy"))==cancel)
+             return;
+     }
+ 
+@@ -188,7 +188,7 @@
+ 
+             if (matroska) {
+                 if ( ! k9Tools::checkProgram("mkvmerge") ) {
+-                    k9Dialogs::error (i18n("Unable to run %1").arg("mkvmerge") , i18n("Encoding error"));
++                    k9Dialogs::error (i18n("Unable to run %1","mkvmerge") , i18n("Encoding error"));
+ 		    delete mp4;
+                     return ;
+                 }
+diff -Naur k9copy-work/src/backup/k9mp4enc.cpp k9copy/src/backup/k9mp4enc.cpp
+--- k9copy-work/src/backup/k9mp4enc.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/backup/k9mp4enc.cpp	2020-12-23 23:48:01.706471964 -0500
+@@ -157,8 +157,8 @@
+ 
+     if (!m_extractAudio) {
+         if ( ! k9Tools::checkProgram(sCodecV) ) {
+-            k9log::add(i18n("Unable to run %1").arg(sCodecV),k9logLevel::ERROR);
+-            k9Dialogs::error (i18n("Unable to run %1").arg(sCodecV) , i18n("Encoding error"));
++            k9log::add(i18n("Unable to run %1",sCodecV),k9logLevel::ERROR);
++            k9Dialogs::error (i18n("Unable to run %1",sCodecV) , i18n("Encoding error"));
+             m_error = TRUE;
+             return false;
+         }
+@@ -168,8 +168,8 @@
+ 
+     if ((sCodecA!=sCodecV) || m_extractAudio) {
+         if ( ! k9Tools::checkProgram(sCodecA) ) {
+-            k9log::add(i18n("Unable to run %1").arg(sCodecV),k9logLevel::ERROR);
+-            k9Dialogs::error (i18n("Unable to run %1").arg(sCodecA) , i18n("Encoding error"));
++            k9log::add(i18n("Unable to run %1",sCodecV),k9logLevel::ERROR);
++            k9Dialogs::error (i18n("Unable to run %1",sCodecA) , i18n("Encoding error"));
+             m_error = TRUE;
+             return false;
+         }
+@@ -181,12 +181,12 @@
+ 
+ void k9MP4Enc::execute(k9DVDTitle *_title) {
+     if (m_mpeg2)
+-        k9log::add(i18n("Starting extraction of %1, chapters %2").arg(_title->getname()).arg(getChapterList( _title)),k9logLevel::INFO);
++        k9log::add(i18n("Starting extraction of %1, chapters %2",_title->getname(),getChapterList( _title)),k9logLevel::INFO);
+     else
+-        k9log::add(i18n("Starting encoding of %1, chapters %2").arg(_title->getname()).arg(getChapterList( _title)),k9logLevel::INFO);
+-    k9log::add(i18n("source : %1").arg(m_device),k9logLevel::INFO);
+-    k9log::add(i18n("destination : %1").arg(m_filename),k9logLevel::INFO);
+-    k9log::add(i18n("disk cache : %1").arg( m_usecache ? i18n("activated"):i18n("disabled")),k9logLevel::INFO);
++        k9log::add(i18n("Starting encoding of %1, chapters %2",_title->getname(),getChapterList( _title)),k9logLevel::INFO);
++    k9log::add(i18n("source : %1",m_device),k9logLevel::INFO);
++    k9log::add(i18n("destination : %1",m_filename),k9logLevel::INFO);
++    k9log::add(i18n("disk cache : %1", m_usecache ? i18n("activated"):i18n("disabled")),k9logLevel::INFO);
+     m_currentChapter=0;
+     m_error=false;
+     m_outputFile=NULL;
+@@ -205,14 +205,14 @@
+     m_remain="--:--:--";
+ 
+     m_totalSize=_title->getChaptersSize(true);
+-    k9log::add(i18n("size : %1 MB").arg(m_totalSize/512),k9logLevel::INFO);
++    k9log::add(i18n("size : %1 MB",m_totalSize/512),k9logLevel::INFO);
+     if (!m_mpeg2) {
+-        k9log::add(i18n("audio bitrate : %1").arg(m_audioBitrate),k9logLevel::INFO);
++        k9log::add(i18n("audio bitrate : %1",m_audioBitrate),k9logLevel::INFO);
+         if (!m_extractAudio) {
+             if (m_videoBitrate !="")
+-                k9log::add(i18n("user defined video bitrate : %1").arg(m_videoBitrate),k9logLevel::INFO);
++                k9log::add(i18n("user defined video bitrate : %1",m_videoBitrate),k9logLevel::INFO);
+             else
+-                k9log::add(i18n("calculated video bitrate : %1").arg(getBitRate(_title)),k9logLevel::INFO);
++                k9log::add(i18n("calculated video bitrate : %1",getBitRate(_title)),k9logLevel::INFO);
+             }
+     }
+     QString injectName;
+@@ -239,7 +239,7 @@
+ 
+         do {
+             if (!m_mpeg2)
+-                k9log::add(i18n("starting pass %1 of %2").arg(pass==0 ? 1:pass).arg(maxPass==0 ? 1 : maxPass),k9logLevel::INFO);
++                k9log::add(i18n("starting pass %1 of %2",pass==0 ? 1:pass,maxPass==0 ? 1 : maxPass),k9logLevel::INFO);
+             m_totalBytes=0;
+             m_vamps=new k9vamps(this,m_usecache);;
+             m_player=new k9play(this);
+@@ -507,7 +507,7 @@
+ 
+             QString sAOption=replaceParams(audioCodecs->getOptions(m_audioCodec)).trimmed();
+ 
+-            m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
++            m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
+             QString path,ext=audioCodecs->getExtension(m_audioCodec) ;
+             if (!ext.startsWith("."))
+                 ext="."+ext;
+@@ -519,7 +519,7 @@
+ 
+             cmd  << m_ffmpegPath << "-i" << "/dev/stdin" <<sAOption.split(" ") <<  KShell::quoteArg(path) ;
+ 
+-            k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
++            k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
+             k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
+             m_converters[BASE_CONV_AUDIO+i]=converter;
+             m_convertersToDelete << converter;
+@@ -571,9 +571,9 @@
+     cmd << sVOption.split(" ");
+ 
+     if (pass >0)
+-        m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec)+" - "+i18n("pass %1").arg(pass));
++        m_progress->setTitleLabel(i18n("Encoding %1",sCodec)+" - "+i18n("pass %1",pass));
+     else
+-        m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
++        m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
+ 
+     if (m_fourcc !="")
+         cmd << "-vtag" << m_fourcc;
+@@ -640,7 +640,7 @@
+     cmd << "-y"  << KShell::quoteArg(path);
+     cmd << slNewAudio;
+ //    if (m_extractMkv) {
+-    k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
++    k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
+     k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
+     //converter->setDebug(true);
+     m_converters[BASE_CONV_VIDEO]=converter;
+@@ -690,9 +690,9 @@
+ 
+ 
+     if (pass >0)
+-        m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec)+" - "+i18n("pass %1").arg(pass));
++        m_progress->setTitleLabel(i18n("Encoding %1",sCodec)+" - "+i18n("pass %1",pass));
+     else
+-        m_progress->setTitleLabel(i18n("Encoding %1").arg(sCodec));
++        m_progress->setTitleLabel(i18n("Encoding %1",sCodec));
+ 
+     if (m_fourcc !="")
+         cmd << "-ffourcc" << m_fourcc;
+@@ -747,7 +747,7 @@
+         //      cmd << "-of" << "lavf";
+         //      cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
+     }
+-    k9log::add(i18n("starting thread : %1").arg(cmd.join(" ")),k9logLevel::INFO);
++    k9log::add(i18n("starting thread : %1",cmd.join(" ")),k9logLevel::INFO);
+     k9ConvertAudio *converter=new k9ConvertAudio("",cmd);
+     converter->setDebug(false);
+     m_converters[BASE_CONV_VIDEO]=converter;
+@@ -894,7 +894,7 @@
+         else {
+             m_player->setAborted(true);
+             m_error=true;
+-            m_msgError=i18n("An error occured while encoding the %1 stream").arg(i18n("audio"));
++            m_msgError=i18n("An error occured while encoding the %1 stream",i18n("audio"));
+             m_ErrorDetail=c->getOutput();
+             k9log::add(m_msgError,k9logLevel::ERROR);
+         }
+@@ -919,7 +919,7 @@
+             else {
+                 m_player->setAborted(true);
+                 m_error=true;
+-                m_msgError=i18n("An error occured while encoding the %1 stream").arg(i18n("video"));
++                m_msgError=i18n("An error occured while encoding the %1 stream",i18n("video"));
+                 m_ErrorDetail=c->getOutput();
+                 k9log::add(m_msgError,k9logLevel::ERROR);
+             }
+diff -Naur k9copy-work/src/core/k9burndvd.cpp k9copy/src/core/k9burndvd.cpp
+--- k9copy-work/src/core/k9burndvd.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/core/k9burndvd.cpp	2020-12-23 23:48:01.706471964 -0500
+@@ -148,7 +148,7 @@
+         proc2->sync();
+         if (proc2->exitStatus()==0) {
+             delete proc2;
+-            k9log::add(i18n("image size : %1").arg(imageSize),k9logLevel::INFO);
++            k9log::add(i18n("image size : %1",imageSize),k9logLevel::INFO);
+             return imageSize;
+         }
+     }
+@@ -234,7 +234,7 @@
+             connect( proc2, SIGNAL(receivedStdout(char *, int)),this, SLOT(mkisoSizeStdout(char *, int)) );
+             k9log::add(i18n("computing image size"),k9logLevel::INFO);
+             proc2->setShellCommand(proc2Cmd.join(" "));;
+-            k9log::add(i18n("starting thread : %1").arg(proc2Cmd.join(" ")),k9logLevel::INFO);
++            k9log::add(i18n("starting thread : %1",proc2Cmd.join(" ")),k9logLevel::INFO);
+             proc2->start();
+             proc2->sync();
+             getWodimCmd(procCmd);
+@@ -243,7 +243,7 @@
+ 
+             if (!autoBurn) {
+ #if QT_VERSION >= 0x050000
+-               	if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"), i18n("DVD burning"))!=QMessageBox::Ignore)
++               	if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"),i18n("DVD burning"))!=QMessageBox::Ignore)
+ #else
+                 if ( k9Dialogs::warningContinueCancel ( i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
+ #endif
+@@ -255,12 +255,12 @@
+ 
+         if (!cancelled) {
+             k9log::add(i18n("start burning"),k9logLevel::INFO);
+-            k9log::add(i18n("starting thread : %1").arg(procCmd.join(" ")),k9logLevel::INFO);
++            k9log::add(i18n("starting thread : %1",procCmd.join(" ")),k9logLevel::INFO);
+ 
+             int res=progress->execute();
+             if ( res==-1 ) {
+                 k9log::add(i18n("Error"),k9logLevel::ERROR);
+-                k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg("genisoimage"), i18n("DVD burning") );
++                k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1", "genisoimage"),i18n("DVD burning") );
+                 cancelled=true;
+             } else {
+ 
+@@ -353,13 +353,13 @@
+         }
+         if (!cancelled) {
+             k9log::add(i18n("start burning"),k9logLevel::INFO);
+-            k9log::add(i18n("starting thread : %1").arg(proc->debug()),k9logLevel::INFO);
++            k9log::add(i18n("starting thread : %1",proc->debug()),k9logLevel::INFO);
+ 
+             int res=progress->execute();
+             if ( res==-1 ) {
+                 k9log::add(i18n("Error"),k9logLevel::ERROR);
+ 
+-                k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg(progname), i18n("DVD burning") );
++                k9Dialogs::error( i18n("Error burning DVD :\n")+i18n("Unable to run %1",progname), i18n("DVD burning") );
+                 cancelled=true;
+             } else {
+ 
+@@ -413,7 +413,7 @@
+         }
+ 
+         progress->setTitle(i18n("Burning DVD"));
+-        progress->setLabelText(i18n("Current write speed :%1 x").arg(burnSpeed));
++        progress->setLabelText(i18n("Current write speed :%1 x",burnSpeed));
+         if (c.contains("% done")) {
+             pos=c.indexOf("%");
+             if (pos!=-1) {
+@@ -433,7 +433,7 @@
+                 }
+             }
+         }
+-        else k9log::add(i18n("%1").arg(c),k9logLevel::INFO);
++        else k9log::add(i18n("%1",c),k9logLevel::INFO);
+     }
+ }
+ void k9BurnDVD::growisoStdout(char *buffer, int buflen) {
+diff -Naur k9copy-work/src/core/k9dvd.cpp k9copy/src/core/k9dvd.cpp
+--- k9copy-work/src/core/k9dvd.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/core/k9dvd.cpp	2020-12-23 23:48:01.707471971 -0500
+@@ -214,7 +214,7 @@
+     int  i;
+     QString c;
+     if (! (filehandle = fopen(dvd_device, "r"))) {
+-        c=i18n("Couldn't open %1 for title\n").arg(dvd_device);
++        c=i18n("Couldn't open %1 for title\n",dvd_device);
+         // setError(c );
+         strcpy(title, i18n("unknown").toUtf8());
+         return -1;
+@@ -222,7 +222,7 @@
+ 
+     if ( fseek(filehandle, 32808, SEEK_SET )) {
+         fclose(filehandle);
+-        c=i18n("Couldn't seek in %1 for title\n").arg(dvd_device);
++        c=i18n("Couldn't seek in %1 for title\n",dvd_device);
+         setError(c);
+         strcpy(title, i18n("unknown").toUtf8());
+         return -1;
+@@ -377,7 +377,7 @@
+         m_dvd.close();
+     m_dvd.openDevice(device);
+     if ( !m_dvd.opened() ) {
+-        c=i18n("Can't open disc %1!\n").arg(device);
++        c=i18n("Can't open disc %1!\n",device);
+         setError(c);
+         return 2;
+     }
+@@ -411,7 +411,7 @@
+         ifo = kifo->getIFO();
+         if (ifo==NULL) {
+             //ifo is null when trying to open a protected dvd
+-            setError(i18n("Can't open disc %1!\n").arg(device));
++            setError(i18n("Can't open disc %1!\n",device));
+             return 2;
+             //continue;
+         }
+@@ -435,7 +435,7 @@
+                 vts_ttn =  ttn;//ifo->vts_ptt_srpt->title[j].ptt[0].pgcn; //ifo_zero->tt_srpt->title[j].vts_ttn;
+ 
+                 //JMPtxt=i18n("Title %1").arg(indexedCount);
+-                txt=i18n("Title %1").arg(numTitle);
++                txt=i18n("Title %1",numTitle);
+                 emit sigTotalText (txt);
+                 emit sigTitleProgress(numTitle,ltitles);
+                 video_attr = &vtsi_mat->vts_video_attr;
+@@ -725,7 +725,7 @@
+     }
+     if (bappend)
+         m_titles.append(track);
+-    track->name=i18n("Title %1").arg(num);
++    track->name=i18n("Title %1",num);
+ 
+     if (!_indexed) {
+         for (int i=0;i<m_titles.count();i++) {
+@@ -895,7 +895,7 @@
+     QString c;
+     dvdfile =m_dvd.openTitle( title);
+     if ( !dvdfile ) {
+-        c=i18n("Error opening vobs for title %1\n").arg(title);
++        c=i18n("Error opening vobs for title %1\n",title);
+         setError(c);
+         return 0;
+     }
+@@ -906,7 +906,7 @@
+         emit sigVobProgress(i-startblock,lastblock-startblock);
+         total+=size;
+         if ( !size ) {
+-            c=i18n("ERROR reading block %1\n").arg(i);
++            c=i18n("ERROR reading block %1\n",i);
+             setError(c);
+             break;
+         }
+diff -Naur k9copy-work/src/import/k9avidecode.cpp k9copy/src/import/k9avidecode.cpp
+--- k9copy-work/src/import/k9avidecode.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/import/k9avidecode.cpp	2020-12-23 23:48:01.707471971 -0500
+@@ -53,20 +53,20 @@
+     m_error="";
+     QStringList errs;
+     if (!CodecHandle) {
+-        errs << i18n("Cannot open the library %1").arg("libavcodec");
++        errs << i18n("Cannot open the library %1","libavcodec");
+     }
+     if (!FormatHandle ) {
+-        errs << i18n("Cannot open the library %1").arg("libavformat");
++        errs << i18n("Cannot open the library %1","libavformat");
+     }
+ #   if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
+     if (!UtilHandle) {
+-        m_error =i18n("Cannot open then library %1").arg("libavutil");
++        m_error =i18n("Cannot open then library %1","libavutil");
+         return;
+     }
+ #   endif
+ #ifdef HAVE_SWSCALE
+     if (!SwscaleHandle) {
+-        errs << i18n("Cannot open the library %1").arg("libswscale");
++        errs << i18n("Cannot open the library %1","libswscale");
+     }
+ #endif
+ 
+@@ -101,7 +101,7 @@
+     img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
+ //if img_convert is null (deprecated in ffmpeg), we need libswscale
+     if (!img_convert)
+-      errs << i18n("Cannot open the library %1").arg("libswscale");
++      errs << i18n("Cannot open the library %1","libswscale");
+ #endif
+     av_free = (av_free_t)dlsym(CodecHandle,"av_free");
+     av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
+@@ -174,7 +174,7 @@
+         av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
+ #       endif
+        ) {
+-        m_error=i18n("Couldn't open the file %1").arg(_fileName);
++        m_error=i18n("Couldn't open the file %1",_fileName);
+         return false; // Couldn't open file}
+     }
+ // Retrieve stream information
+@@ -231,7 +231,7 @@
+ // Allocate an AVFrame structure
+     m_FrameRGB=avcodec_alloc_frame();
+     if (m_FrameRGB==NULL) {
+-        m_error =i18n ("Unable to allocate memory for frames");
++        m_error =i18n("Unable to allocate memory for frames");
+         return false;
+     }
+ 
+diff -Naur k9copy-work/src/import/k9import.cpp k9copy/src/import/k9import.cpp
+--- k9copy-work/src/import/k9import.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/import/k9import.cpp	2020-12-23 23:48:01.707471971 -0500
+@@ -186,7 +186,7 @@
+ 
+ 
+    k9LvItemImport * itemch=new k9LvItemImport(title,k9LvItemImport::CHAPTER);
+-   itemch->setText(0,i18n("chapter %1").arg(title->childCount()));
++   itemch->setText(0,i18n("chapter %1",title->childCount()));
+    itemch->setAviFile(file);
+    itemch->setTitle(title->getTitle());
+    connect(file,SIGNAL(aviFileUpdated(k9AviFile*)),this,SLOT(aviFileUpdated(k9AviFile*)));
+@@ -201,7 +201,7 @@
+    btn->setHeight(config.getPrefButtonHeight());
+    btn->setScript(QString("jump title 1 chapter %1 ;").arg(title->childCount()));
+    btn->setTextPosition(BOTTOM);
+-   btn->setText(i18n("chapter %1").arg(title->childCount()));
++   btn->setText(i18n("chapter %1",title->childCount()));
+    btn->setColor(config.getPrefButtonTextColor());
+    btn->setFont(config.getPrefButtonFont());
+    file->setButton(btn);
+diff -Naur k9copy-work/src/import/k9menu.cpp k9copy/src/import/k9menu.cpp
+--- k9copy-work/src/import/k9menu.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/import/k9menu.cpp	2020-12-23 23:48:01.707471971 -0500
+@@ -145,7 +145,7 @@
+ void k9Menu::createAudio(const QString & _audioFile) {
+     if (! (k9Tools::checkProgram("twolame",false) || k9Tools::checkProgram("toolame",false))) {
+ 	m_error=true;
+-        k9Dialogs::error(i18n("Error starting program %1").arg("twolame | toolame"),i18n("Running program"));
++        k9Dialogs::error(i18n("Error starting program %1","twolame | toolame"),i18n("Running program"));
+ 	return;
+     }
+ 
+diff -Naur k9copy-work/src/import/k9menuedit.cpp k9copy/src/import/k9menuedit.cpp
+--- k9copy-work/src/import/k9menuedit.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/import/k9menuedit.cpp	2020-12-23 23:48:01.708471979 -0500
+@@ -298,7 +298,7 @@
+     disconnect (this,SIGNAL(endScriptChanged(const QString&)),0,0);
+     Ui_menuEdit.cbEnd->setEnabled(true);
+     m_scene->clearSelection();;
+-    Ui_menuEdit.lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
++    Ui_menuEdit.lTitle->setText(i18n("Title %1 Menu",_title->getNum()+1));
+     setScene(_title->getMenu()->getScene());
+     m_menuType=TITLEMENU;
+     Ui_menuEdit.cbStart->clear();
+@@ -322,7 +322,7 @@
+     k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
+     k9NewDVDItems *items=newDVD->getTitles();
+     foreach (k9Title *title,*items) {
+-        Ui_menuEdit.cbEnd->addItem(i18n("Play Title %1").arg(title->getNum()+1));
++        Ui_menuEdit.cbEnd->addItem(i18n("Play Title %1",title->getNum()+1));
+         QString script=QString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1);
+         m_endScripts << script;
+     }
+@@ -348,7 +348,7 @@
+     m_startScripts << "";
+     k9NewDVDItems *items=_newDVD->getTitles();
+     foreach (k9Title *title,*items) {
+-        Ui_menuEdit.cbStart->addItem(i18n("Play Title %1").arg(title->getNum()+1));
++        Ui_menuEdit.cbStart->addItem(i18n("Play Title %1",title->getNum()+1));
+         // QString script=QString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1);
+         QString script=QString("g6=%1;" ).arg(title->getNum()+1);
+         m_startScripts << script;
+diff -Naur k9copy-work/src/import/k9newdvd.cpp k9copy/src/import/k9newdvd.cpp
+--- k9copy-work/src/import/k9newdvd.cpp	2020-12-23 23:47:42.375321426 -0500
++++ k9copy/src/import/k9newdvd.cpp	2020-12-23 23:48:01.708471979 -0500
+@@ -175,7 +175,7 @@
+         QString menuFileName=m_workDir+k9Tools::randomFileName()+".mpg";
+         m_tmpFiles << menuFileName,
+         menu->setMenuFileName(menuFileName);
+-        m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1));
++        m_processList->addProgress(i18n("Creating menu for title %1",title->getNum()+1));
+         if (!menu->createMenus(&titleSet))
+ 		return;
+ 
+@@ -282,7 +282,7 @@
+             break;
+         }
+ 
+-        k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName()));
++        k9Process *process=m_processList->addProcess(i18n("Encoding %1",_aviFile->getFileName()));
+         m_processList->setFileName(process,_aviFile->getFileName());
+ 
+         QTime t(0,0);
+@@ -499,7 +499,7 @@
+     btn->setHeight(m_config->getPrefButtonHeight());
+     btn->setScript(QString("g1=0;jump titleset %1  menu;").arg(_title->getNum()+1));
+     btn->setTextPosition(RIGHT);
+-    btn->setText(i18n("title %1").arg(_title->getNum()+1));
++    btn->setText(i18n("title %1",_title->getNum()+1));
+     btn->setColor(m_config->getPrefButtonTextColor());
+     btn->setFont(m_config->getPrefButtonFont());
+ 
+diff -Naur k9copy-work/src/import/k9newtitle.cpp k9copy/src/import/k9newtitle.cpp
+--- k9copy-work/src/import/k9newtitle.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/import/k9newtitle.cpp	2020-12-23 23:48:01.708471979 -0500
+@@ -126,7 +126,7 @@
+     k9LvItemImport *item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE);
+     item->setExpanded(true);
+     k9Title *title=new k9Title( m_k9Import->getNewDVD());
+-    item->setText(0,i18n("title %1").arg(title->getNum() +1));
++    item->setText(0,i18n("title %1",title->getNum() +1));
+ 
+     connect( title->getButton(),SIGNAL(sigsetImage(k9MenuButton*, const QImage&)),m_k9Import,SLOT(buttonUpdated(k9MenuButton*, const QImage&)));
+     item->setTitle(title);
+@@ -180,7 +180,7 @@
+         file->setEnd(t.addMSecs(qMin(pos,fileInfo.getDuration()) *1000));
+ 	file->setReencode(!Ui_newTitle.ckReencode->isChecked());
+         k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER);
+-        itemch->setText(0,i18n("chapter %1").arg(i+1));
++        itemch->setText(0,i18n("chapter %1",i+1));
+         itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") );
+         itemch->setAviFile(file);
+         itemch->setTitle(title);
+@@ -202,7 +202,7 @@
+         btn->setHeight(height);
+         btn->setScript(QString("jump title 1 chapter %1 ;").arg(i+1));
+         btn->setTextPosition(BOTTOM);
+-        btn->setText(i18n("chapter %1").arg(i+1));
++        btn->setText(i18n("chapter %1",i+1));
+         btn->setColor(config.getPrefButtonTextColor());
+         btn->setFont(config.getPrefButtonFont());
+ 	file->setButton(btn);
+diff -Naur k9copy-work/src/main/k9main.cpp k9copy/src/main/k9main.cpp
+--- k9copy-work/src/main/k9main.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/main/k9main.cpp	2020-12-23 23:48:01.708471979 -0500
+@@ -436,7 +436,7 @@
+ 	  execCopy.copyDVD();
+ 	  break;
+     }
+-    changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
++    changeStatusbar ( i18n( "Ready" ) ,sbMessage );
+ 
+ }
+ 
+@@ -457,7 +457,7 @@
+             index=i;
+     }
+     QString res="";
+-    if ( ( index==-1 ) || ( _combo->currentText() ==i18n ( "ISO Image" ) ) ) {
++    if ( ( index==-1 ) || ( _combo->currentText() ==i18n( "ISO Image" ) ) ) {
+         res=_combo->currentText();
+     } else {
+         k9CdDrive * drive= ( k9CdDrive* ) driveList.at ( index );
+@@ -512,12 +512,12 @@
+ 
+     dvd->scandvd ( sDevice,m_quickScan );
+     if ( dvd->geterror() ) {
+-        k9Dialogs::error ( dvd->geterrMsg(), i18n ( "Open DVD" ) );
++        k9Dialogs::error ( dvd->geterrMsg(), i18n( "Open DVD" ) );
+         return;
+     }
+     
+     m_parent->setDvdOpened(true);
+-    if ( dvd->getDVDTitle() ==i18n ( "unknown" ) && sVolName!="" ) {
++    if ( dvd->getDVDTitle() ==i18n( "unknown" ) && sVolName!="" ) {
+         dvd->setDVDTitle ( sVolName );
+     }
+ 
+@@ -535,14 +535,14 @@
+         ckLvItem *tsItem = new ckLvItem ( root,this,TITLESET );
+         tsItem->setExpanded ( TRUE );
+         QString c;
+-        c=i18n ( "Titleset %1").arg(i+1 );
++        c=i18n( "Titleset %1",i+1 );
+         tsItem->setText ( 0,c );
+         QFont font=tsItem->font ( 1 );
+         font.setWeight ( QFont::Bold );
+         tsItem->setFont ( 1,font );
+ 
+ 
+-        tsItem->setText ( 1,"   "+dvd->gettitleset ( i )->getsize_mb() +" " +i18n ( "MB" ) );
++        tsItem->setText ( 1,"   "+dvd->gettitleset ( i )->getsize_mb() +" " +i18n( "MB" ) );
+         tsItem->setTextAlignment ( 1,Qt::AlignRight );
+         tsItem->obj=dvd->gettitleset ( i ) ;
+         tsItem->streamType=NONE;
+@@ -561,7 +561,7 @@
+     m_playbackOptions->fillTitleList();
+     m_langSelect->fillLvLanguages();
+     listView1->setSortingEnabled ( true );
+-    changeStatusbar ( i18n ( "Ready" ),sbMessage );
++    changeStatusbar ( i18n( "Ready" ),sbMessage );
+     emit SelectionChanged ( dvd,withMenus() );
+     this->setEnabled ( true );
+ 
+@@ -606,18 +606,18 @@
+ 
+ void k9Main::addChapters ( QTreeWidgetItem *_parent,k9DVDTitle *_title ) {
+     LvItem *chapter = new LvItem ( _parent,CHAPTER );
+-    chapter->setText ( 0, i18n ( "chapters" ) );
++    chapter->setText ( 0, i18n( "chapters" ) );
+     chapter->setExpanded ( false );
+     chapter->setIcon ( 0,pxChapter );
+ 
+     int ch=0;
+     for ( int i=0;i< _title->getchapterCount();i++ ) {
+         ckLvItem *it =new ckLvItem ( chapter,this,CHAPTER );
+-        it->setText ( 0,i18n ( "chapter %1").arg(++ch ) );
++        it->setText ( 0,i18n( "chapter %1",++ch ) );
+         QString s;
+ 
+         s=QString ( "%1" ).arg ( ( double ) ( _title->getChapter ( i )->getsectors() ) /512,0,'f',2 );
+-        it->setText ( 1,i18n ( "%1 MB").arg(s ) );
++        it->setText ( 1,i18n( "%1 MB",s ) );
+         it->setTextAlignment ( 1,Qt::AlignRight | Qt::AlignVCenter);
+         it->setTextAlignment ( 2,Qt::AlignRight | Qt::AlignVCenter);
+ 
+@@ -631,13 +631,13 @@
+         k9DVDTitle *title2=_title->getTitles().at ( j );
+         for ( int i=0;i< title2->getchapterCount();i++ ) {
+             ckLvItem *it =new ckLvItem ( chapter,this,CHAPTER );
+-            it->setText ( 0,i18n ( "chapter %1").arg(++ch ) );
++            it->setText ( 0,i18n( "chapter %1",++ch ) );
+             it->streamType=CHAP;
+             it->obj=title2->getChapter ( i );
+             QString s;
+             s=QString ( "%1" ).arg ( ( double ) ( title2->getChapter ( i )->getsectors() ) /512,0,'f',2 );
+ 
+-            it->setText ( 1,i18n ( "%1 MB").arg(s ) );
++            it->setText ( 1,i18n( "%1 MB",s ) );
+             it->setTextAlignment ( 1,Qt::AlignRight | Qt::AlignVCenter );
+             it->setTextAlignment ( 2,Qt::AlignRight | Qt::AlignVCenter );
+ 
+@@ -672,7 +672,7 @@
+     itemTrack->setIcon ( col1,SmallIcon ( "title" ) );
+     c.sprintf ( "%.2f ", track->gettotalsize_mb() );
+ 
+-    itemTrack->setText ( col2,c+i18n ( "MB" ) );
++    itemTrack->setText ( col2,c+i18n( "MB" ) );
+     itemTrack->setText (col4,track->gettotallength().toString ( "h:mm:ss" ));
+     itemTrack->setTextAlignment ( col2,Qt::AlignRight|Qt::AlignVCenter );
+     itemTrack->setTextAlignment ( col4,Qt::AlignRight|Qt::AlignVCenter );
+@@ -690,20 +690,20 @@
+     video->setIcon ( 0,SmallIcon ( "video" ) );
+     addListItem ( track,video,VID );
+     video->setExpanded ( false );
+-    c=i18n ( "video %1 ").arg(track->getformat() );
++    c=i18n( "video %1 ",track->getformat() );
+     c.append ( " - " + track->getaspectRatio() );
+      
+     video->setText ( col1, c );
+     if ( track->gettotalvideosize_mb() ) {
+         c.sprintf ( "%.2f ",  track->gettotalvideosize_mb() );
+-        video->setText ( col2,c +i18n ( "MB" ) );
++        video->setText ( col2,c +i18n( "MB" ) );
+         video->setTextAlignment ( col2,Qt::AlignRight );
+     }
+     video->obj=track;
+ 
+     for ( i=0;i< track->getaudioStreamCount();i++ ) {
+         l_auds=track->getaudioStream ( i );
+-        c=i18n ( "audio %1 ").arg(i+1 );
++        c=i18n( "audio %1 ",i+1 );
+         c.append ( l_auds->getlanguage() + " " +l_auds->getformat() +" " );
+         ch.sprintf ( "%dch ",l_auds->getchannels() );
+         c.append ( ch+l_auds->getfrequency() +" "+l_auds->getquantization() );
+@@ -717,7 +717,7 @@
+         item->setText ( col1,  c );
+         if ( l_auds->getsize_mb() ) {
+             c.sprintf ( "%.2f ",  l_auds->getsize_mb());
+-            item->setText ( col2,c +i18n ( "MB" ) );
++            item->setText ( col2,c +i18n( "MB" ) );
+             item->setTextAlignment ( col2,Qt::AlignRight );
+         }
+         item->setText ( col3,l_auds->getcontent() );
+@@ -727,7 +727,7 @@
+     }
+     for ( i=0;i< track->getsubPictureCount();i++ ) {
+         l_sub=track->getsubtitle ( i );
+-        c=i18n ( "subpicture %1 ").arg(i+1 );
++        c=i18n( "subpicture %1 ",i+1 );
+         c.append ( l_sub->getlanguage() );
+         ckLvItem * item = new ckLvItem ( itemTrack,this,STREAM );
+ 
+@@ -738,7 +738,7 @@
+         item->setText ( col1,  c );
+         if ( l_sub->getsize_mb() ) {
+             c.sprintf ( "%.2f ",  l_sub->getsize_mb());
+-            item->setText ( col2,c +i18n ( "MB" ) );
++            item->setText ( col2,c +i18n( "MB" ) );
+             item->setTextAlignment ( col2,Qt::AlignRight );
+         }
+         item->setText ( col3, l_sub->getcontent() );
+@@ -1207,7 +1207,7 @@
+     execCopy.setDvd ( dvd );
+     execCopy.setPath(Ui_MainDlg.urOutput->url().path());
+     execCopy.CreateMP4();
+-    changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
++    changeStatusbar ( i18n( "Ready" ) ,sbMessage );
+ 
+ }
+ 
+@@ -1216,7 +1216,7 @@
+     execCopy.setDvd ( dvd );
+     execCopy.setPath(Ui_MainDlg.urOutput->url().path());
+     execCopy.extractAudio();
+-    changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
++    changeStatusbar ( i18n( "Ready" ) ,sbMessage );
+ 
+ }
+ 
+@@ -1226,7 +1226,7 @@
+     execCopy.setDvd ( dvd );
+     execCopy.setPath(Ui_MainDlg.urOutput->url().path());
+     execCopy.extractMPEG2();
+-    changeStatusbar ( i18n ( "Ready" ) ,sbMessage );
++    changeStatusbar ( i18n( "Ready" ) ,sbMessage );
+ 
+ 
+ }
+@@ -1365,7 +1365,7 @@
+     if ( drive !=NULL ) {
+         QList <int>list=drive->getWriteSpeeds();
+         Ui_MainDlg.cbBurnSpeed->clear();
+-        Ui_MainDlg.cbBurnSpeed->addItem ( i18n ( "default" ) );
++        Ui_MainDlg.cbBurnSpeed->addItem ( i18n( "default" ) );
+         foreach ( int speed,list ) {
+             Ui_MainDlg.cbBurnSpeed->addItem ( QString::number ( ( double ) ( speed ) /1385 ) );
+         }
+@@ -1389,7 +1389,7 @@
+ 
+ 
+ void k9Main::bInputOpenClick() {
+-    QString result=k9Dialogs::getOpenFileName ( QDir::homePath(),"*.iso", 0,i18n ( "Open ISO Image" ) );
++    QString result=k9Dialogs::getOpenFileName ( QDir::homePath(),"*.iso", 0,i18n( "Open ISO Image" ) );
+     if ( result!="" ) {
+         k9Tools::setComboText ( Ui_MainDlg.cbInputDev,result );
+         Open();
+@@ -1482,7 +1482,7 @@
+ 	}
+         else {
+             changeStatusbar ( QString::number ( dbfactor,'f',2 ),sbFactor );
+-            changeStatusbar ( i18n("%1 MB").arg(QString::number ((double)sizeSelected/512.,'f',2)),sbSelSize);
++            changeStatusbar ( i18n("%1 MB",QString::number ((double)sizeSelected/512.,'f',2)),sbSelSize);
+ 	}
+         emit SelectionChanged ( dvd,withMenus() );
+         m_mutex.unlock();
+diff -Naur k9copy-work/src/main/k9titlefactor.cpp k9copy/src/main/k9titlefactor.cpp
+--- k9copy-work/src/main/k9titlefactor.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/main/k9titlefactor.cpp	2020-12-23 23:51:35.909155787 -0500
+@@ -60,7 +60,7 @@
+         }
+ 	double size;
+ 	size =m_current->getChaptersSize_mb(true) / getFactor();
+-        Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
++        Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
+     }
+ }
+ 
+@@ -97,7 +97,7 @@
+  		Ui_titleFactor.tFactor->setText(QString("%1").arg(getFactor(),4,'f',2));
+ 		size =m_current->getChaptersSize_mb(true) / getFactor();
+ 	}
+-        Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
++        Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
+ 
+ 
+     }
+@@ -118,7 +118,7 @@
+ 	Ui_titleFactor.gbTitle->setChecked(m_current->getforceFactor());
+ 	m_updating=false;
+ 	
+-        Ui_titleFactor.lbTitle->setText(i18n("Shrink Factor for %1").arg(m_current->getname()));
++        Ui_titleFactor.lbTitle->setText(i18n("Shrink Factor for %1",m_current->getname()));
+ 	double size;
+ 	if (m_current->getforceFactor()) {
+ 		Ui_titleFactor.slFactor->setValue(m_current->getfactor()*100.0);
+@@ -131,7 +131,7 @@
+ 		Ui_titleFactor.slFactor->setMinimum(100);
+ 		size =m_current->getChaptersSize_mb(true) / getFactor();
+ 	}
+-        Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB").arg(size ));
++        Ui_titleFactor.lTargetSize->setText(i18n("size : %1 MB",size ));
+ 		
+ }
+ 
+diff -Naur k9copy-work/src/mplayer/k9mplayer.cpp k9copy/src/mplayer/k9mplayer.cpp
+--- k9copy-work/src/mplayer/k9mplayer.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/mplayer/k9mplayer.cpp	2020-12-23 23:48:01.709471987 -0500
+@@ -174,7 +174,7 @@
+ 
+     qDebug() << m_process->debug();
+     if (!m_process->start()) {
+-         k9Dialogs::error (i18n("Unable to run %1").arg("mplayer") , i18n("Preview"));
++         k9Dialogs::error (i18n("Unable to run %1","mplayer") , i18n("Preview"));
+     }
+ 
+     m_canwrite=TRUE;
+diff -Naur k9copy-work/src/player/k9play.cpp k9copy/src/player/k9play.cpp
+--- k9copy-work/src/player/k9play.cpp	2020-12-23 23:47:42.379321457 -0500
++++ k9copy/src/player/k9play.cpp	2020-12-23 23:48:01.709471987 -0500
+@@ -366,7 +366,7 @@
+     /* set read ahead cache usage */
+     if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) {
+         writeOutput( QString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
+-        emit sigError(i18n("Error on dvdnav_set_readahead_flag: %1").arg(dvdnav_err_to_string(dvdnav)));
++        emit sigError(i18n("Error on dvdnav_set_readahead_flag: %1",dvdnav_err_to_string(dvdnav)));
+         end();
+         return;
+     }
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-installdirs.patch b/multimedia/k9copy-reloaded/patches/k9copy-installdirs.patch
new file mode 100644
index 0000000000..ec923d1706
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-installdirs.patch
@@ -0,0 +1,29 @@
+diff -Naur k9copy.orig/CMakeLists.txt k9copy/CMakeLists.txt
+--- k9copy.orig/CMakeLists.txt  2014-10-16 07:58:20.000000000 -0400
++++ k9copy/CMakeLists.txt   2020-12-24 10:48:11.088907284 -0500
+@@ -1,3 +1,4 @@
++cmake_minimum_required(VERSION 3.1)
+ project(k9copy)
+ set (VERSION 3.0.3)
+ 
+@@ -38,7 +38,7 @@ find_package(Qt5DBus REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+ 
+-find_package(KF5 COMPONENTS REQUIRED I18n Config Su CoreAddons WidgetsAddons DocTools XmlGui Solid KIO IconThemes)
++find_package(KF5 COMPONENTS REQUIRED Auth I18n Config Su CoreAddons WidgetsAddons DocTools XmlGui Solid KIO IconThemes)
+ 
+ else()
+ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+@@ -568,7 +569,11 @@
+ 
+ install( FILES k9copy.desktop k9copy_assistant.desktop DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+ #install( FILES k9copy.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
++if(QT5_BUILD)
++install( FILES k9copyui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/k9copy )
++else()
+ install( FILES k9copyui.rc  DESTINATION  ${DATA_INSTALL_DIR}/k9copy )
++endif()
+ 
+ install(FILES k9copy_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
+ install(FILES k9copy_assistant_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-mimetype.patch b/multimedia/k9copy-reloaded/patches/k9copy-mimetype.patch
deleted file mode 100644
index 1c156d6055..0000000000
--- a/multimedia/k9copy-reloaded/patches/k9copy-mimetype.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- k9copy.orig/k9copy_assistant.desktop	2014-09-29 16:00:12.000000000 +0100
-+++ k9copy/k9copy_assistant.desktop	2015-05-28 20:08:49.318602109 +0100
-@@ -14,9 +14,8 @@ GenericName[fr]=Backup de DVD Video
- GenericName[tr]=DVD Vidyo Yedekleme Aracı
- GenericName[ru]=Копирование � видео-DVD
- GenericName[uk]=Копіюванн� відео-DVD
--MimeTypes=
- Terminal=false
- Icon=k9copy
- X-DocPath=k9copy/index.html
- Categories=Qt;KDE;AudioVideo;DiscBurning;
--X-KDE-StartupNotify=true
-\ No newline at end of file
-+X-KDE-StartupNotify=true
---- k9copy.orig/k9copy_assistant_open.desktop	2014-09-29 16:00:12.000000000 +0100
-+++ k9copy/k9copy_assistant_open.desktop	2015-05-28 20:06:11.140619453 +0100
-@@ -11,4 +11,4 @@ NAme[uk]=Копіювати за допÐ
- [Desktop Entry]
- X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]]
- Type=Service
--Actions=open;
-\ No newline at end of file
-+Actions=open;
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-missing-language-in-po-files.patch b/multimedia/k9copy-reloaded/patches/k9copy-missing-language-in-po-files.patch
new file mode 100644
index 0000000000..6db2f51708
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-missing-language-in-po-files.patch
@@ -0,0 +1,221 @@
+diff -Naur k9copy.orig/po/ca.po k9copy/po/ca.po
+--- k9copy.orig/po/ca.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/ca.po	2020-12-24 10:48:11.122907577 -0500
+@@ -12,6 +12,7 @@
+ "PO-Revision-Date: 2006-09-06 19:13+0200\n"
+ "Last-Translator: Daniel Balagué Guardia <bullet@k-demar.org>\n"
+ "Language-Team: Català <ca@li.org>\n"
++"Language: ca\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/cs.po k9copy/po/cs.po
+--- k9copy.orig/po/cs.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/cs.po	2020-12-24 10:48:11.123907586 -0500
+@@ -13,6 +13,7 @@
+ "PO-Revision-Date: 2004-01-01 00:36+0100\n"
+ "Last-Translator: \n"
+ "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/da.po k9copy/po/da.po
+--- k9copy.orig/po/da.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/da.po	2020-12-24 10:48:11.125907603 -0500
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2010-05-12 14:26+0200\n"
+ "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
+ "Language-Team: Danish <opensuse-translation@opensuse.org>\n"
++"Language: da\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/de.po k9copy/po/de.po
+--- k9copy.orig/po/de.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/de.po	2020-12-24 10:48:11.126907611 -0500
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2009-06-12 14:13+0200\n"
+ "Last-Translator: Jan Berndt <Jan.Berndt@gmx.de>\n"
+ "Language-Team: deutsch <de@li.org>\n"
++"Language: de\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/el.po k9copy/po/el.po
+--- k9copy.orig/po/el.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/el.po	2020-12-24 10:48:11.127907620 -0500
+@@ -13,6 +13,7 @@
+ "PO-Revision-Date: 2007-10-17 11:33+0300\n"
+ "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
+ "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
++"Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/es.po k9copy/po/es.po
+--- k9copy.orig/po/es.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/es.po	2020-12-24 10:48:11.127907620 -0500
+@@ -12,6 +12,7 @@
+ "PO-Revision-Date: 2006-09-06 19:11+0200\n"
+ "Last-Translator: Daniel Balagué Guardia <bullet@k-demar.org>\n"
+ "Language-Team: Català <ca@li.org>\n"
++"Language: es\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/es_AR.po k9copy/po/es_AR.po
+--- k9copy.orig/po/es_AR.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/es_AR.po	2020-12-24 10:48:11.128907629 -0500
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2008-04-30 03:57-0300\n"
+ "Last-Translator: Fernando Toledo <ftoledo@docksud.com.ar>\n"
+ "Language-Team: Español (Argentina) <es@li.org>\n"
++"Language: es_AR\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/fr.po k9copy/po/fr.po
+--- k9copy.orig/po/fr.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/fr.po	2020-12-24 10:48:11.128907629 -0500
+@@ -9,6 +9,7 @@
+ "PO-Revision-Date: 2007-07-24 09:24+0200\n"
+ "Last-Translator: Jean-Michel Petit <k9copy@free.fr>\n"
+ "Language-Team:  <fr@li.org>\n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/it.po k9copy/po/it.po
+--- k9copy.orig/po/it.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/it.po	2020-12-24 10:48:11.129907637 -0500
+@@ -15,6 +15,7 @@
+ "PO-Revision-Date: 2008-03-25 18:47+0100\n"
+ "Last-Translator: Leonardo Finetti <finex@finex.org>\n"
+ "Language-Team: italian <kde-i18n-it@kde.org>\n"
++"Language: it\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/ja.po k9copy/po/ja.po
+--- k9copy.orig/po/ja.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/ja.po	2020-12-24 10:48:11.129907637 -0500
+@@ -12,6 +12,7 @@
+ "PO-Revision-Date: 2010-07-11 10:17+0900\n"
+ "Last-Translator: Munehiro Yamamoto <munepixyz@gmail.com>\n"
+ "Language-Team: munepi <munepixyz@gmail.com>\n"
++"Language: ja\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: \n"
+diff -Naur k9copy.orig/po/k9copy.pot k9copy/po/k9copy.pot
+--- k9copy.orig/po/k9copy.pot	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/k9copy.pot	2020-12-24 10:48:11.130907646 -0500
+@@ -13,6 +13,7 @@
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: en\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/nl.po k9copy/po/nl.po
+--- k9copy.orig/po/nl.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/nl.po	2020-12-24 10:48:11.130907646 -0500
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2009-05-10 16:15+0200\n"
+ "Last-Translator: \n"
+ "Language-Team: Dutch <kde-i18n-doc@kde.org>\n"
++"Language: nl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/pl.po k9copy/po/pl.po
+--- k9copy.orig/po/pl.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/pl.po	2020-12-24 10:48:11.130907646 -0500
+@@ -13,6 +13,7 @@
+ "PO-Revision-Date: 2006-09-27 11:51+0200\n"
+ "Last-Translator: Wojciech Nawrocki <wojtasin@o2.pl>\n"
+ "Language-Team: Polski <pl@li.org>\n"
++"Language: pl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/pt_BR.po k9copy/po/pt_BR.po
+--- k9copy.orig/po/pt_BR.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/pt_BR.po	2020-12-24 10:48:11.131907655 -0500
+@@ -14,6 +14,7 @@
+ "PO-Revision-Date: 2010-02-08 21:04-0200\n"
+ "Last-Translator: Phantom X <megaphantomx at bol.com.br>\n"
+ "Language-Team: Português do Brasil <pt@li.org>\n"
++"Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/ru.po k9copy/po/ru.po
+--- k9copy.orig/po/ru.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/ru.po	2020-12-24 10:48:11.133907672 -0500
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2010-01-01 17:32+0000\n"
+ "Last-Translator: kostya_hm <kostya.hm@rambler.ru>\n"
+ "Language-Team: Russian <none>\n"
++"Language: ru\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/sr.po k9copy/po/sr.po
+--- k9copy.orig/po/sr.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/sr.po	2020-12-24 10:48:11.133907672 -0500
+@@ -14,6 +14,7 @@
+ "PO-Revision-Date: 2007-08-15 11:15+0100\n"
+ "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
+ "Language-Team: Serbian <gnom@prevod.org>\n"
++"Language: sr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/sr@Latn.po k9copy/po/sr@Latn.po
+--- k9copy.orig/po/sr@Latn.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/sr@Latn.po	2020-12-24 10:48:11.135907689 -0500
+@@ -14,6 +14,7 @@
+ "PO-Revision-Date: 2007-08-15 11:15+0100\n"
+ "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
+ "Language-Team: Serbian <gnom@prevod.org>\n"
++"Language: sr@Latn\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/tr.po k9copy/po/tr.po
+--- k9copy.orig/po/tr.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/tr.po	2020-12-24 10:48:11.136907698 -0500
+@@ -14,6 +14,7 @@
+ "PO-Revision-Date: 2007-10-17 11:01+0300\n"
+ "Last-Translator: Murat Åženel <muratasenel@gmail.com>\n"
+ "Language-Team:  <tr@li.org>\n"
++"Language: tr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/uk.po k9copy/po/uk.po
+--- k9copy.orig/po/uk.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/uk.po	2020-12-24 10:48:11.137907707 -0500
+@@ -11,7 +11,7 @@
+ "PO-Revision-Date: 2011-07-24 12:18+0300\n"
+ "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+ "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
+-"Language: \n"
++"Language: uk\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -Naur k9copy.orig/po/zh_TW.po k9copy/po/zh_TW.po
+--- k9copy.orig/po/zh_TW.po	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/po/zh_TW.po	2020-12-24 10:48:11.137907707 -0500
+@@ -12,6 +12,7 @@
+ "PO-Revision-Date: 2007-10-24 19:43+0800\n"
+ "Last-Translator: 洪任諭 <pcman.tw@gmail.com>\n"
+ "Language-Team: Traditional Chinese <LL@li.org>\n"
++"Language: zh_TW\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-tempdir.patch b/multimedia/k9copy-reloaded/patches/k9copy-tempdir.patch
deleted file mode 100644
index e9376cf291..0000000000
--- a/multimedia/k9copy-reloaded/patches/k9copy-tempdir.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/core/k9tools.cpp.org	2014-09-29 17:00:12.000000000 +0200
-+++ src/core/k9tools.cpp	2015-12-19 19:18:40.474442195 +0100
-@@ -48,7 +48,7 @@
- const QString  k9Tools::getTempPath() {
- QString sPath;
- 
--sPath=QString("%1/%2/").arg(QDir::tempPath() + '/' + "k9copy/");
-+sPath=QString("%1/%2/").arg(QDir::tempPath(),"k9copy/");
- 
- return sPath;
- }
---- src/vamps/k9fifo.cpp.org	2014-09-29 17:00:12.000000000 +0200
-+++ src/vamps/k9fifo.cpp	2015-12-19 19:04:18.616261661 +0100
-@@ -11,6 +11,8 @@
- //
- #include "k9fifo.h"
- #include <QDir>
-+#include <errno.h>
-+#include <KDebug>
- 
- uint64_t k9MemoryFifo::count() {
- 	return m_count;
-@@ -134,12 +136,19 @@
-      m_wait.wait(&m_mutex);
-    }
-    m_wfile->seek(m_fstart);
--   m_wfile->write((const char*)_buffer,_size);
-+   int rc=m_wfile->write((const char*)_buffer,_size) ;
-+   if (rc != (int) _size) {
-+	kFatal() << QString("error writing to tempfile (%1)").arg(strerror (errno));
-+	abort();
-+   }
-    m_fstart=m_wfile->pos();
-    if (m_fstart > MAX_FILE_SIZE) {
-         m_wfile=new QTemporaryFile(QDir::cleanPath(m_output +"/k9b"));
-         m_wfile->setAutoRemove(true);
--	m_wfile->open();
-+	if(m_wfile->open() == false) {
-+		kFatal() << QString("error creating tempfile in %1 (%1)").arg(QDir::cleanPath(m_output +"/k9b"), strerror (errno));
-+		abort();
-+	}
- 	m_queue.enqueue(m_wfile);
-   	m_fstart=0;
-    }
-@@ -190,12 +199,17 @@
- 	if (m_rfile) {
-           m_rfile->close();
-           delete m_rfile;
-+	  m_rfile=NULL;
-         }
- 	qDeleteAll(m_queue);
- 
-+
- 	m_fstart=m_fend=0;
-         m_rfile=new QTemporaryFile(QDir::cleanPath(m_output +"/k9b"));
-         m_rfile->setAutoRemove(true);
--	m_rfile->open();
-+	if(m_rfile->open() == false) {
-+		kFatal() << QString("error creating tempfile in %1 (%1)").arg(QDir::cleanPath(m_output +"/k9b"), strerror (errno));
-+		abort();
-+	}
- 	m_start=m_end=0;
- }
diff --git a/multimedia/k9copy-reloaded/patches/k9copy-uncheck-dvdauthor.patch b/multimedia/k9copy-reloaded/patches/k9copy-uncheck-dvdauthor.patch
new file mode 100644
index 0000000000..58814b7941
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-uncheck-dvdauthor.patch
@@ -0,0 +1,12 @@
+diff -Naur k9copy.orig/src/core/k9config.cpp k9copy/src/core/k9config.cpp
+--- k9copy.orig/src/core/k9config.cpp	2014-09-29 11:00:12.000000000 -0400
++++ k9copy/src/core/k9config.cpp	2020-12-26 12:17:00.538310987 -0500
+@@ -100,7 +100,7 @@
+     m_prefAutoBurn=group.readEntry("autoburn",false);
+     m_quickScan=group.readEntry("quickscan",true);
+     m_prefSize=group.readEntry("dvdsize",4400);
+-    m_useDvdAuthor=group.readEntry("useDvdAuthor",true);
++    m_useDvdAuthor=group.readEntry("useDvdAuthor",false);
+     m_keepMenus=group.readEntry("keepMenus",true);
+     m_prefDelTmpFiles=group.readEntry("deltmpfiles",false);
+     m_prefReadAhead=group.readEntry("readahead",-1);
diff --git a/multimedia/lightspark/README b/multimedia/lightspark/README
index 5d48aaefc4..a2343f66ce 100644
--- a/multimedia/lightspark/README
+++ b/multimedia/lightspark/README
@@ -1,10 +1,9 @@
 Lightspark is an open source Flash player implementation for playing
-files in SWF format. Lightspark can run as a web browser plugin or as
-a standalone application.
+files in the SWF format. Lightspark can run as a web browser plugin or
+as a standalone application.
 
-Lightspark supports SWF files written on the newest version of the
-ActionScript language, ActionScript 3.0, which was introduced at the
-same time as Flash player 9.
+Lightspark supports SWF files written on all versions of the
+ActionScript language.
 
 Optional Dependency
 
diff --git a/multimedia/lightspark/lightspark.SlackBuild b/multimedia/lightspark/lightspark.SlackBuild
index 1c63d41310..734d2a164f 100644
--- a/multimedia/lightspark/lightspark.SlackBuild
+++ b/multimedia/lightspark/lightspark.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lightspark
 
-# Copyright 2016-2019 Hunter Sezen California, USA
+# Copyright 2016-2021 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lightspark
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.8.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,10 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-mv $PKG/etc/xdg/lightspark.conf $PKG/etc/xdg/lightspark.conf.new
+# lightspark depends on the rpath
+#    -DCMAKE_SKIP_RPATH=TRUE \
+
+mv -- $PKG/etc/xdg/lightspark.conf $PKG/etc/xdg/lightspark.conf.new
 
 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
diff --git a/multimedia/lightspark/lightspark.info b/multimedia/lightspark/lightspark.info
index 97dc5b2655..e597dad478 100644
--- a/multimedia/lightspark/lightspark.info
+++ b/multimedia/lightspark/lightspark.info
@@ -1,8 +1,8 @@
 PRGNAM="lightspark"
-VERSION="0.8.2"
+VERSION="0.8.4.1"
 HOMEPAGE="https://lightspark.github.io/"
-DOWNLOAD="https://github.com/lightspark/lightspark/archive/0.8.2/lightspark-0.8.2.tar.gz"
-MD5SUM="297f20078ca7f14b85ece994910a937b"
+DOWNLOAD="https://github.com/lightspark/lightspark/archive/0.8.4.1/lightspark-0.8.4.1.tar.gz"
+MD5SUM="27c1ad450eb1c8f47bd07dbc2ba34a5a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg rtmpdump SDL2_mixer"
diff --git a/multimedia/lives/README b/multimedia/lives/README
index a0296a8354..8772d9807b 100644
--- a/multimedia/lives/README
+++ b/multimedia/lives/README
@@ -20,10 +20,23 @@ performances, and as a video editor is capable of creating dazzling
 clips in a huge variety of formats.
 
 Optional dependencies:
-ffmpeg mjpegtools ladspa_sdk libunicap libdv schroedinger frei0r libavc1394
+ffmpeg mjpegtools ladspa_sdk libunicap libdv schroedinger frei0r
+  libavc1394 opencv (or opencv-legacy - If opencv-legacy is installed,
+  the toonz plugin will not be built.)
+
+
+If after initialization the program does not properly come up on the
+screen, right-click on the entry in the taskbar, then go to
+'More Actions -> Resize', then click anywhere on the screen and it
+should lock in.
+
+NOTE!  You must remove any previous installation of lives before
+running this script or the build will fail.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
 may be considered a security/stability risk. Please read
 http://www.slackbuilds.org/caps/ for more information. To disable
 capabilities, pass SETCAP=no to the script.
+
+Version 3.0.2 will be the last for Slackware 14.2.
diff --git a/multimedia/lives/lives.SlackBuild b/multimedia/lives/lives.SlackBuild
index c99f6006ed..c224ef53ef 100644
--- a/multimedia/lives/lives.SlackBuild
+++ b/multimedia/lives/lives.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2014-2015 Yanes Checcacci Balod <yanes@pobox.com>, Brazil
 # Copyright 2015-2016 Marcel Saegebarth <marc@mos6581.de>
-# Copyright 2020 Lenard Spencer <lenardrspencer@gmail.com>
+# Copyright 2020 Lenard Spencer, Orlando,Florida, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 PRGNAM=lives
 SRCNAM=LiVES
 VERSION=${VERSION:-3.0.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -59,11 +59,17 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Check for a previous LiVES installation:
+if [ -e /usr/bin/lives ]; then
+  echo "ERROR: A previous LiVES installation is detected!"
+  echo "Please remove it before running this script."
+  exit 1
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
@@ -75,14 +81,16 @@ 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 {} \;
 
-# Don't build toonz plugin (build failure when opencv is present)
-# https://sourceforge.net/p/lives/bugs/217/
-sed -i -e '/toonz/d' lives-plugins/weed-plugins/Makefile.am
-autoreconf -fi
-automake
+# Don't build toonz plugin if opencv-legacy is found (breaks build)
+# (opencv 4.x reports as opencv4):
+if [ pkg-config --exists opencv ]; then
+  sed -i -e '/toonz/d' lives-plugins/weed-plugins/Makefile.am
+  autoreconf -fiv
+  automake
+fi
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -92,16 +100,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-# Parallel builds break, so we make sure MAKEFLAGS is clear:
-unset MAKEFLAGS
-make
-make install-strip DESTDIR=$PKG
+make -j1 # Parallel builds have a tendency to fail
+make install DESTDIR=$PKG
+
+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 \
-  ABOUT-NLS AUTHORS COPYING* ChangeLog FEATURES GETTING.STARTED INSTALL \
+  ABOUT-NLS AUTHORS COPYING ChangeLog FEATURES GETTING.STARTED INSTALL \
   NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION || true
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 (
diff --git a/multimedia/lives/slack-desc b/multimedia/lives/slack-desc
index f156f9040e..00576dd9d0 100644
--- a/multimedia/lives/slack-desc
+++ b/multimedia/lives/slack-desc
@@ -11,9 +11,9 @@ lives:
 lives: LiVES is a Video Editing System. It is designed to be simple to use,
 lives: yet powerful. It is small in size, yet it has many advanced features.
 lives:
-lives: Homepage: http://lives-video.com/
-lives:
-lives:
-lives:
+lives: LiVES is good enough to be used as a VJ tool for professional
+lives: performances, and as a video editor is capable of creating dazzling
+lives: clips in a huge variety of formats.
 lives:
+lives: Homepage: http://lives.sourceforge.net/
 lives:
diff --git a/multimedia/mediainfo/mediainfo.SlackBuild b/multimedia/mediainfo/mediainfo.SlackBuild
index 03855eba57..410d331fa0 100644
--- a/multimedia/mediainfo/mediainfo.SlackBuild
+++ b/multimedia/mediainfo/mediainfo.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mediainfo
-VERSION=${VERSION:-20.08}
+VERSION=${VERSION:-20.09}
 SRCNAM=MediaInfo
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/multimedia/mediainfo/mediainfo.info b/multimedia/mediainfo/mediainfo.info
index f0a4dd4361..a7713afba0 100644
--- a/multimedia/mediainfo/mediainfo.info
+++ b/multimedia/mediainfo/mediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="mediainfo"
-VERSION="20.08"
+VERSION="20.09"
 HOMEPAGE="https://mediaarea.net/MediaInfo/"
-DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v20.08/MediaInfo-20.08.tar.gz"
-MD5SUM="e946a94a3776f2f5016db20dfad2d35d"
+DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v20.09/MediaInfo-20.09.tar.gz"
+MD5SUM="5814d9ed34be0719cc71a7d90967bc16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmediainfo"
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index f679709e54..d4e5ce2a0b 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpv
-VERSION=${VERSION:-0.32.0}
+VERSION=${VERSION:-0.33.0}
 WAF_VERSION=${WAF_VERSION:-2.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -66,9 +66,10 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cp $CWD/waf-$WAF_VERSION $PRGNAM-$VERSION/waf
-chmod +x $PRGNAM-$VERSION/waf
 cd $PRGNAM-$VERSION
+cp $CWD/waf-$WAF_VERSION ./waf
+sed -i -e 's/python$/python3/' waf
+chmod +x waf
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
index 890c2baa00..8dd18520f5 100644
--- a/multimedia/mpv/mpv.info
+++ b/multimedia/mpv/mpv.info
@@ -1,9 +1,9 @@
 PRGNAM="mpv"
-VERSION="0.32.0"
+VERSION="0.33.0"
 HOMEPAGE="https://mpv.io/"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.32.0/mpv-0.32.0.tar.gz \
+DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.33.0/mpv-0.33.0.tar.gz \
           https://waf.io/waf-2.0.20"
-MD5SUM="1f7d23afe7a8639dedc9f7beef4e90d7 \
+MD5SUM="b08d25d3a44c3362984636e5dfa78ecc \
         eb0cd320fc8838971cfa735ad78f6de8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/multimedia/openshot/openshot.info b/multimedia/openshot/openshot.info
index 513e4e0e48..a34cc5b29d 100644
--- a/multimedia/openshot/openshot.info
+++ b/multimedia/openshot/openshot.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/OpenShot/openshot-qt/archive/v2.5.1/openshot-qt-2.5
 MD5SUM="e59bf56ac01aee5f43491aebebe479a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python3-pyzmq libopenshot python-chardet httplib2 jack python3-certifi python-requests"
+REQUIRES="python3-PyQt5 python3-pyzmq libopenshot python-chardet httplib2 jack python-certifi python-requests"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/multimedia/pepperflash-plugin/pepperflash-plugin.SlackBuild b/multimedia/pepperflash-plugin/pepperflash-plugin.SlackBuild
index 8a2fe1d8af..a2ebc50aa8 100644
--- a/multimedia/pepperflash-plugin/pepperflash-plugin.SlackBuild
+++ b/multimedia/pepperflash-plugin/pepperflash-plugin.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=pepperflash-plugin
 SRCNAM=flash_player_ppapi_linux
-VERSION=${VERSION:-32.0.0.445}
+VERSION=${VERSION:-32.0.0.465}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/pepperflash-plugin/pepperflash-plugin.info b/multimedia/pepperflash-plugin/pepperflash-plugin.info
index 9ac49eda5e..442300d550 100644
--- a/multimedia/pepperflash-plugin/pepperflash-plugin.info
+++ b/multimedia/pepperflash-plugin/pepperflash-plugin.info
@@ -1,10 +1,10 @@
 PRGNAM="pepperflash-plugin"
-VERSION="32.0.0.445"
+VERSION="32.0.0.465"
 HOMEPAGE="https://get.adobe.com/flashplayer/otherversions/"
-DOWNLOAD="https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_ppapi_linux.i386.tar.gz"
-MD5SUM="e586ccef937a753085f0b6d926623bc0"
-DOWNLOAD_x86_64="https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_ppapi_linux.x86_64.tar.gz"
-MD5SUM_x86_64="c820951b6444b668d9913d393d84712e"
+DOWNLOAD="https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.465/flash_player_ppapi_linux.i386.tar.gz"
+MD5SUM="1fd125d28a90892691b70a9198a6c208"
+DOWNLOAD_x86_64="https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.465/flash_player_ppapi_linux.x86_64.tar.gz"
+MD5SUM_x86_64="04d9e5a07f9e457b40f9e790437b2782"
 REQUIRES=""
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/multimedia/plexmediaserver/README b/multimedia/plexmediaserver/README
index 755950fce4..3c0e127c73 100644
--- a/multimedia/plexmediaserver/README
+++ b/multimedia/plexmediaserver/README
@@ -1,9 +1,10 @@
 Plex Media Server is the backend for the Plex media system.
 
 Plex's frontend media player, Plex Home Theater, is Windows/Mac only;
-however, you can stream your local files on Linux from your web browser.
-Plex Home Theater allows the user to manage and play video, photos, music,
-and podcasts from a local or remote computer running Plex Media Server.
+however, you can stream your local files on Linux from your web
+browser. Plex Home Theater allows the user to manage and play video,
+photos, music, and podcasts from a local or remote computer running
+Plex Media Server.
 
 Plex Media Server runs as plex:plex (UID/GID 279) with its $HOME as
 /var/lib/plexmediaserver:
diff --git a/multimedia/plexmediaserver/plexmediaserver.SlackBuild b/multimedia/plexmediaserver/plexmediaserver.SlackBuild
index 66b08af597..462c61ed14 100644
--- a/multimedia/plexmediaserver/plexmediaserver.SlackBuild
+++ b/multimedia/plexmediaserver/plexmediaserver.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright 2014-2015 Lionel Young <lionelyoung@gmail.com>
 # Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de>
 # Copyright 2017-2020 Kevin Matthew <kevin@kevinmatthew.com>
-# Copyright 2020 Stu Miller <slackbuilds@go4it2day.com>
+# Copyright 2020-2021 Stu Miller <slackbuilds@go4it2day.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=plexmediaserver
-VERSION=${VERSION:-1.20.3.3437_f1f08d65b}
+VERSION=${VERSION:-1.22.2.4282_a97b03fad}
 PKG_VERSION=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/multimedia/plexmediaserver/plexmediaserver.info b/multimedia/plexmediaserver/plexmediaserver.info
index f453fc8674..2ac5b50f07 100644
--- a/multimedia/plexmediaserver/plexmediaserver.info
+++ b/multimedia/plexmediaserver/plexmediaserver.info
@@ -1,10 +1,10 @@
 PRGNAM="plexmediaserver"
-VERSION="1.20.3.3437_f1f08d65b"
+VERSION="1.22.2.4282_a97b03fad"
 HOMEPAGE="https://plex.tv/"
-DOWNLOAD="https://downloads.plex.tv/plex-media-server-new/1.20.3.3437-f1f08d65b/debian/plexmediaserver_1.20.3.3437-f1f08d65b_i386.deb"
-MD5SUM="8160c313a33e2aebbf986500aced6bf7"
-DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server-new/1.20.3.3437-f1f08d65b/debian/plexmediaserver_1.20.3.3437-f1f08d65b_amd64.deb"
-MD5SUM_x86_64="2b04b76ff8b017c31aa5f0fec3366cff"
+DOWNLOAD="https://downloads.plex.tv/plex-media-server-new/1.22.2.4282-a97b03fad/debian/plexmediaserver_1.22.2.4282-a97b03fad_i386.deb"
+MD5SUM="6f9bf1be451504c1a23e1050162f5eb6"
+DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server-new/1.22.2.4282-a97b03fad/debian/plexmediaserver_1.22.2.4282-a97b03fad_amd64.deb"
+MD5SUM_x86_64="c57ad0e9fc1c14fafe67f35624047b4d"
 REQUIRES=""
 MAINTAINER="Stu Miller"
 EMAIL="slackbuilds@go4it2day.com"
diff --git a/multimedia/pyradio/pyradio.SlackBuild b/multimedia/pyradio/pyradio.SlackBuild
index 69a85bb7a2..7489d189f6 100644
--- a/multimedia/pyradio/pyradio.SlackBuild
+++ b/multimedia/pyradio/pyradio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyradio 
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
  
 
 PRGNAM=pyradio
diff --git a/multimedia/pyradio/pyradio.info b/multimedia/pyradio/pyradio.info
index 3bc67d90b0..2f8d48ed97 100644
--- a/multimedia/pyradio/pyradio.info
+++ b/multimedia/pyradio/pyradio.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/multimedia/rtmpdump/rtmpdump.SlackBuild b/multimedia/rtmpdump/rtmpdump.SlackBuild
index 7728e656d5..b54b9fc9fe 100644
--- a/multimedia/rtmpdump/rtmpdump.SlackBuild
+++ b/multimedia/rtmpdump/rtmpdump.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=rtmpdump
-VERSION=${VERSION:-20151223_fa8646d}
+VERSION=${VERSION:-20210219_f1b83c1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/rtmpdump/rtmpdump.info b/multimedia/rtmpdump/rtmpdump.info
index 32d0018f4d..f941dccc28 100644
--- a/multimedia/rtmpdump/rtmpdump.info
+++ b/multimedia/rtmpdump/rtmpdump.info
@@ -1,8 +1,8 @@
 PRGNAM="rtmpdump"
-VERSION="20151223_fa8646d"
+VERSION="20210219_f1b83c1"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/rtmpdump-20151223_fa8646d.tar.xz"
-MD5SUM="344bbd75df62bd19c983f58137726932"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/rtmpdump-20210219_f1b83c1.tar.xz"
+MD5SUM="b50be8df554bf1a8632fb1daa8bd5b7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/srt-to-vtt-cl/README b/multimedia/srt-to-vtt-cl/README
new file mode 100644
index 0000000000..31ade96dde
--- /dev/null
+++ b/multimedia/srt-to-vtt-cl/README
@@ -0,0 +1,2 @@
+A command line tool that converts subtitle files from SubRib (.srt)
+format to WebVTT (.vtt) format.
diff --git a/multimedia/srt-to-vtt-cl/slack-desc b/multimedia/srt-to-vtt-cl/slack-desc
new file mode 100644
index 0000000000..5ee4085a49
--- /dev/null
+++ b/multimedia/srt-to-vtt-cl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+srt-to-vtt-cl: srt-to-vtt-cl (convert srt files to webtvv)
+srt-to-vtt-cl:
+srt-to-vtt-cl: A command line tool that converts subtitle files from
+srt-to-vtt-cl: SubRib (.srt) format to WebVTT (.vtt) format.
+srt-to-vtt-cl:
+srt-to-vtt-cl:
+srt-to-vtt-cl:
+srt-to-vtt-cl:
+srt-to-vtt-cl:
+srt-to-vtt-cl:
+srt-to-vtt-cl:
diff --git a/multimedia/srt-to-vtt-cl/srt-to-vtt-cl.SlackBuild b/multimedia/srt-to-vtt-cl/srt-to-vtt-cl.SlackBuild
new file mode 100644
index 0000000000..83d58c3a27
--- /dev/null
+++ b/multimedia/srt-to-vtt-cl/srt-to-vtt-cl.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for <srt-to-vtt-cl>
+
+# Copyright 2021, Michales Michaloudes (clavisound), Greece
+# 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=srt-to-vtt-cl
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}	
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION/SRT\ to\ VTT\ Converter/
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make
+
+mkdir -p $PKG/usr/bin
+cp ../bin/Linux/*/srt-vtt $PKG/usr/bin/
+
+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
+
+cd $TMP/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE.txt README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/srt-to-vtt-cl/srt-to-vtt-cl.info b/multimedia/srt-to-vtt-cl/srt-to-vtt-cl.info
new file mode 100644
index 0000000000..2b698bab60
--- /dev/null
+++ b/multimedia/srt-to-vtt-cl/srt-to-vtt-cl.info
@@ -0,0 +1,11 @@
+PRGNAM="srt-to-vtt-cl"
+VERSION="1.2.0"
+HOMEPAGE="https://github.com/nwoltman/srt-to-vtt-cl"
+DOWNLOAD="https://github.com/nwoltman/srt-to-vtt-cl/archive/v1.2.0/srt-to-vtt-cl-1.2.0.tar.gz"
+MD5SUM="613910cce5cf1c865ca89fa3c4a608e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Michales Michaloudes"
+EMAIL="korgie@gmail.com"
+
diff --git a/multimedia/straw-viewer/straw-viewer.SlackBuild b/multimedia/straw-viewer/straw-viewer.SlackBuild
index 09db74f36e..763f6bfa41 100644
--- a/multimedia/straw-viewer/straw-viewer.SlackBuild
+++ b/multimedia/straw-viewer/straw-viewer.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201208 bkw: update for v0.1.2.
+# 20201109 bkw: update for v0.1.1.
 # 20201012 bkw: update for v0.1.0.
 # 20200814 bkw: update for v0.0.7.
 # 20200626 bkw: update to latest git. Which (for me anyway) works a lot better.
@@ -25,7 +27,7 @@
 # issues that have been fixed.
 
 PRGNAM=straw-viewer
-VERSION=${VERSION:-0.1.0}
+VERSION=${VERSION:-0.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/straw-viewer/straw-viewer.info b/multimedia/straw-viewer/straw-viewer.info
index d8e1285ce9..14c1670ef1 100644
--- a/multimedia/straw-viewer/straw-viewer.info
+++ b/multimedia/straw-viewer/straw-viewer.info
@@ -1,8 +1,8 @@
 PRGNAM="straw-viewer"
-VERSION="0.1.0"
+VERSION="0.1.2"
 HOMEPAGE="https://github.com/trizen/straw-viewer/"
-DOWNLOAD="https://github.com/trizen/straw-viewer/archive/0.1.0/straw-viewer-0.1.0.tar.gz"
-MD5SUM="c7946aed9361e937f49d8c0f98b210e2"
+DOWNLOAD="https://github.com/trizen/straw-viewer/archive/0.1.2/straw-viewer-0.1.2.tar.gz"
+MD5SUM="dcee29de09e239cf1bbb6ebc8909b351"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-LWP-Protocol-https perl-JSON perl-Module-Build perl-List-MoreUtils"
diff --git a/multimedia/tomahawk/tomahawk.info b/multimedia/tomahawk/tomahawk.info
index 9a939fd8c5..1cdfb0f718 100644
--- a/multimedia/tomahawk/tomahawk.info
+++ b/multimedia/tomahawk/tomahawk.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.tomahawk-player.org/tomahawk-0.8.4.tar.bz2"
 MD5SUM="04832abe1786edcc55805875b5882445"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jreen libechonest LucenePlusPlus qtkeychain sparsehash quazip libwebsocketpp"
+REQUIRES="jreen libechonest LucenePlusPlus qtkeychain sparsehash quazip-qt4 libwebsocketpp"
 MAINTAINER="Thorn Inurcide"
 EMAIL="thorn_inurcide@zoho.com"
diff --git a/multimedia/vapoursynth-mvtools/README b/multimedia/vapoursynth-mvtools/README
new file mode 100644
index 0000000000..e58694f6b9
--- /dev/null
+++ b/multimedia/vapoursynth-mvtools/README
@@ -0,0 +1 @@
+MVTools is a set of filters for motion estimation and compensation.
diff --git a/multimedia/vapoursynth-mvtools/slack-desc b/multimedia/vapoursynth-mvtools/slack-desc
new file mode 100644
index 0000000000..ec91c8a36a
--- /dev/null
+++ b/multimedia/vapoursynth-mvtools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+vapoursynth-mvtools: vapoursynth-mvtools (motion estimation vapoursynth plugin)
+vapoursynth-mvtools:
+vapoursynth-mvtools: MVTools is a set of filters for motion estimation and compensation.
+vapoursynth-mvtools:
+vapoursynth-mvtools: Homepage: https://github.com/dubhater/vapoursynth-mvtools
+vapoursynth-mvtools:
+vapoursynth-mvtools:
+vapoursynth-mvtools:
+vapoursynth-mvtools:
+vapoursynth-mvtools:
+vapoursynth-mvtools:
diff --git a/multimedia/vapoursynth-mvtools/vapoursynth-mvtools.SlackBuild b/multimedia/vapoursynth-mvtools/vapoursynth-mvtools.SlackBuild
new file mode 100644
index 0000000000..5a05905a2c
--- /dev/null
+++ b/multimedia/vapoursynth-mvtools/vapoursynth-mvtools.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for vapoursynth-mvtools
+
+# Copyright 2021 Hunter Sezen California, USA
+# 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=vapoursynth-mvtools
+VERSION=${VERSION:-23}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+autoreconf -fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/vapoursynth \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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 readme.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/vapoursynth-mvtools/vapoursynth-mvtools.info b/multimedia/vapoursynth-mvtools/vapoursynth-mvtools.info
new file mode 100644
index 0000000000..4151904dca
--- /dev/null
+++ b/multimedia/vapoursynth-mvtools/vapoursynth-mvtools.info
@@ -0,0 +1,10 @@
+PRGNAM="vapoursynth-mvtools"
+VERSION="23"
+HOMEPAGE="https://github.com/dubhater/vapoursynth-mvtools"
+DOWNLOAD="https://github.com/dubhater/vapoursynth-mvtools/archive/v23/vapoursynth-mvtools-23.tar.gz"
+MD5SUM="08bb2a31c63d0075ea3bf2dcb8370502"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="vapoursynth"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/multimedia/vapoursynth/650.patch b/multimedia/vapoursynth/650.patch
new file mode 100644
index 0000000000..6c2358b951
--- /dev/null
+++ b/multimedia/vapoursynth/650.patch
@@ -0,0 +1,560 @@
+From 14b36ee7a300aa47e08df06241bc409e213edff2 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 1 Jan 2021 06:28:18 -0800
+Subject: [PATCH] Add missing pthread dependency.
+
+---
+ Makefile.am      |   5 +-
+ configure.ac     |   1 +
+ m4/ax_pthread.m4 | 507 +++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 511 insertions(+), 2 deletions(-)
+ create mode 100644 m4/ax_pthread.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index 123a3488..3844afb7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,7 @@ warningflags = -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-ign
+ commoncflags = -O3 -fvisibility=hidden $(warningflags) -I$(srcdir)/include $(DEBUGCFLAGS) $(MFLAGS) $(UNICODECFLAGS) $(STACKREALIGN)
+ AM_CXXFLAGS = -std=c++11 $(commoncflags)
+ AM_CFLAGS = -std=c99 $(commoncflags)
++ACLOCAL_AMFLAGS = -I m4
+ 
+ 
+ 
+@@ -80,8 +81,8 @@ pkginclude_HEADERS = include/VapourSynth.h \
+ pkgconfig_DATA += pc/vapoursynth.pc
+ 
+ libvapoursynth_la_LDFLAGS = -no-undefined -avoid-version
+-libvapoursynth_la_CPPFLAGS = $(ZIMG_CFLAGS) -DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"'
+-libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
++libvapoursynth_la_CPPFLAGS = $(PTHREAD_CFLAGS) $(ZIMG_CFLAGS) -DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"'
++libvapoursynth_la_LIBADD = $(PTHREAD_LIBS) $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
+ 
+ 
+ if X86ASM
+diff --git a/configure.ac b/configure.ac
+index b898d411..1566c6e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,7 @@ AC_PROG_CXX
+ 
+ AC_SYS_LARGEFILE
+ AC_FUNC_FSEEKO
++AX_PTHREAD
+ 
+ 
+ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable compilation options required for debugging. (default=no)]))
+diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
+new file mode 100644
+index 00000000..1598d077
+--- /dev/null
++++ b/m4/ax_pthread.m4
+@@ -0,0 +1,507 @@
++# ===========================================================================
++#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also to link with them as well. For example, you might link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threaded programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
++#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 27
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_CC])
++AC_REQUIRE([AC_PROG_SED])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on Tru64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
++        ax_pthread_save_CC="$CC"
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
++        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = "xno"; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        CC="$ax_pthread_save_CC"
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try. Items with a "," contain both
++# C compiler flags (before ",") and linker flags (after ","). Other items
++# starting with a "-" are C compiler flags, and remaining items are
++# library names, except for "none" which indicates that we try without
++# any flags at all, and "pthread-config" which is a program returning
++# the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
++#           (Note: HP C rejects this with "bad form for `-t' option")
++# -pthreads: Solaris/gcc (Note: HP C also rejects)
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads and
++#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
++#      is present but should not be used directly; and before -mthreads,
++#      because the compiler interprets this as "-mt" + "-hreads")
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case $host_os in
++
++        freebsd*)
++
++        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++
++        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
++        ;;
++
++        hpux*)
++
++        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
++        # multi-threading and also sets -lpthread."
++
++        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
++        ;;
++
++        openedition*)
++
++        # IBM z/OS requires a feature-test macro to be defined in order to
++        # enable POSIX threads at all, so give the user a hint if this is
++        # not set. (We don't define these ourselves, as they can affect
++        # other portions of the system API in unpredictable ways.)
++
++        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
++            [
++#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
++             AX_PTHREAD_ZOS_MISSING
++#            endif
++            ],
++            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
++        ;;
++
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed. (N.B.: The stubs are missing
++        # pthread_cleanup_push, or rather a function called by this macro,
++        # so we could check for that, but who knows whether they'll stub
++        # that too in a future libc.)  So we'll check first for the
++        # standard Solaris way of linking pthreads (-mt -lpthread).
++
++        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Are we compiling with Clang?
++
++AC_CACHE_CHECK([whether $CC is Clang],
++    [ax_cv_PTHREAD_CLANG],
++    [ax_cv_PTHREAD_CLANG=no
++     # Note that Autoconf sets GCC=yes for Clang as well as GCC
++     if test "x$GCC" = "xyes"; then
++        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
++            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
++#            if defined(__clang__) && defined(__llvm__)
++             AX_PTHREAD_CC_IS_CLANG
++#            endif
++            ],
++            [ax_cv_PTHREAD_CLANG=yes])
++     fi
++    ])
++ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
++
++
++# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
++
++# Note that for GCC and Clang -pthread generally implies -lpthread,
++# except when -nostdlib is passed.
++# This is problematic using libtool to build C++ shared libraries with pthread:
++# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
++# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
++# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
++# To solve this, first try -pthread together with -lpthread for GCC
++
++AS_IF([test "x$GCC" = "xyes"],
++      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
++
++# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
++
++AS_IF([test "x$ax_pthread_clang" = "xyes"],
++      [ax_pthread_flags="-pthread,-lpthread -pthread"])
++
++
++# The presence of a feature test macro requesting re-entrant function
++# definitions is, on some systems, a strong hint that pthreads support is
++# correctly enabled
++
++case $host_os in
++        darwin* | hpux* | linux* | osf* | solaris*)
++        ax_pthread_check_macro="_REENTRANT"
++        ;;
++
++        aix*)
++        ax_pthread_check_macro="_THREAD_SAFE"
++        ;;
++
++        *)
++        ax_pthread_check_macro="--"
++        ;;
++esac
++AS_IF([test "x$ax_pthread_check_macro" = "x--"],
++      [ax_pthread_check_cond=0],
++      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
++
++
++if test "x$ax_pthread_ok" = "xno"; then
++for ax_pthread_try_flag in $ax_pthread_flags; do
++
++        case $ax_pthread_try_flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                *,*)
++                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
++                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
++                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
++                PTHREAD_CFLAGS="$ax_pthread_try_flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
++                PTHREAD_LIBS="-l$ax_pthread_try_flag"
++                ;;
++        esac
++
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++#                       if $ax_pthread_check_cond
++#                        error "$ax_pthread_check_macro must be defined"
++#                       endif
++                        static void *some_global = NULL;
++                        static void routine(void *a)
++                          {
++                             /* To avoid any unused-parameter or
++                                unused-but-set-parameter warning.  */
++                             some_global = a;
++                          }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++            [ax_pthread_ok=yes],
++            [])
++
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++
++# Clang needs special handling, because older versions handle the -pthread
++# option in a rather... idiosyncratic way
++
++if test "x$ax_pthread_clang" = "xyes"; then
++
++        # Clang takes -pthread; it has never supported any other flag
++
++        # (Note 1: This will need to be revisited if a system that Clang
++        # supports has POSIX threads in a separate library.  This tends not
++        # to be the way of modern systems, but it's conceivable.)
++
++        # (Note 2: On some systems, notably Darwin, -pthread is not needed
++        # to get POSIX threads support; the API is always present and
++        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
++        # -pthread does define _REENTRANT, and while the Darwin headers
++        # ignore this macro, third-party headers might not.)
++
++        # However, older versions of Clang make a point of warning the user
++        # that, in an invocation where only linking and no compilation is
++        # taking place, the -pthread option has no effect ("argument unused
++        # during compilation").  They expect -pthread to be passed in only
++        # when source code is being compiled.
++        #
++        # Problem is, this is at odds with the way Automake and most other
++        # C build frameworks function, which is that the same flags used in
++        # compilation (CFLAGS) are also used in linking.  Many systems
++        # supported by AX_PTHREAD require exactly this for POSIX threads
++        # support, and in fact it is often not straightforward to specify a
++        # flag that is used only in the compilation phase and not in
++        # linking.  Such a scenario is extremely rare in practice.
++        #
++        # Even though use of the -pthread flag in linking would only print
++        # a warning, this can be a nuisance for well-run software projects
++        # that build with -Werror.  So if the active version of Clang has
++        # this misfeature, we search for an option to squash it.
++
++        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
++            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
++            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
++             # Create an alternate version of $ac_link that compiles and
++             # links in two steps (.c -> .o, .o -> exe) instead of one
++             # (.c -> exe), because the warning occurs only in the second
++             # step
++             ax_pthread_save_ac_link="$ac_link"
++             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
++             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
++             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
++             ax_pthread_save_CFLAGS="$CFLAGS"
++             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
++                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
++                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
++                ac_link="$ax_pthread_save_ac_link"
++                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++                    [ac_link="$ax_pthread_2step_ac_link"
++                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++                         [break])
++                    ])
++             done
++             ac_link="$ax_pthread_save_ac_link"
++             CFLAGS="$ax_pthread_save_CFLAGS"
++             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
++             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
++            ])
++
++        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
++                no | unknown) ;;
++                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
++        esac
++
++fi # $ax_pthread_clang = yes
++
++
++
++# Various other checks:
++if test "x$ax_pthread_ok" = "xyes"; then
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_CACHE_CHECK([for joinable pthread attribute],
++            [ax_cv_PTHREAD_JOINABLE_ATTR],
++            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
++             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
++                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
++                                [])
++             done
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
++               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
++               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
++              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
++                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
++                                  [Define to necessary symbol if this constant
++                                   uses a non-standard name on your system.])
++               ax_pthread_joinable_attr_defined=yes
++              ])
++
++        AC_CACHE_CHECK([whether more special flags are required for pthreads],
++            [ax_cv_PTHREAD_SPECIAL_FLAGS],
++            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
++             case $host_os in
++             solaris*)
++             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
++             ;;
++             esac
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
++               test "x$ax_pthread_special_flags_added" != "xyes"],
++              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
++               ax_pthread_special_flags_added=yes])
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT],
++            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                             [[int i = PTHREAD_PRIO_INHERIT;
++                                               return i;]])],
++                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
++               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
++              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
++               ax_pthread_prio_inherit_defined=yes
++              ])
++
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != "xyes"; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                    [#handle absolute path differently from PATH based program lookup
++                     AS_CASE(["x$CC"],
++                         [x/*],
++                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test "x$ax_pthread_ok" = "xyes"; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
diff --git a/multimedia/vapoursynth/README b/multimedia/vapoursynth/README
new file mode 100644
index 0000000000..76b8668386
--- /dev/null
+++ b/multimedia/vapoursynth/README
@@ -0,0 +1,3 @@
+VapourSynth is an application for video manipulation. Or a plugin. Or
+a library. It’s hard to tell because it has a core library written
+in C++ and a Python module to allow video scripts to be created.
diff --git a/multimedia/vapoursynth/slack-desc b/multimedia/vapoursynth/slack-desc
new file mode 100644
index 0000000000..c247102a84
--- /dev/null
+++ b/multimedia/vapoursynth/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+vapoursynth: vapoursynth (video processing framework)
+vapoursynth:
+vapoursynth: A video processing framework with simplicity in mind.
+vapoursynth:
+vapoursynth: Homepage: https://www.vapoursynth.com/
+vapoursynth:
+vapoursynth:
+vapoursynth:
+vapoursynth:
+vapoursynth:
+vapoursynth:
diff --git a/multimedia/vapoursynth/vapoursynth.SlackBuild b/multimedia/vapoursynth/vapoursynth.SlackBuild
new file mode 100644
index 0000000000..72a383dbf9
--- /dev/null
+++ b/multimedia/vapoursynth/vapoursynth.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for vapoursynth
+
+# Copyright 2020 Hunter Sezen California, USA
+# 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=vapoursynth
+VERSION=${VERSION:-R52}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Fix undefined reference.
+# https://github.com/vapoursynth/vapoursynth/pull/650
+patch -p1 < $CWD/650.patch
+
+autoreconf -fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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 COPYING.LESSER ChangeLog README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/vapoursynth/vapoursynth.info b/multimedia/vapoursynth/vapoursynth.info
new file mode 100644
index 0000000000..de096be1a1
--- /dev/null
+++ b/multimedia/vapoursynth/vapoursynth.info
@@ -0,0 +1,10 @@
+PRGNAM="vapoursynth"
+VERSION="R52"
+HOMEPAGE="https://www.vapoursynth.com/"
+DOWNLOAD="https://github.com/vapoursynth/vapoursynth/archive/R52/vapoursynth-R52.tar.gz"
+MD5SUM="e6b37c3c7af6902f3835182292668550"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-Cython zimg"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index f03775b29e..8b8543a820 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -6,7 +6,7 @@
 # modified to build VLC only, shared libraries needed.
 
 # Copyright (c) 2007,2008,2009,2010,2011  Eric Hameleers, Eindhoven, Netherlands
-# Copyright (c) 2014-2020  Christoph Willing, Brisbane, Australia
+# Copyright (c) 2014-2021  Christoph Willing, Brisbane, Australia
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -28,7 +28,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=vlc
-VERSION=${VERSION:-3.0.11.1}
+VERSION=${VERSION:-3.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 1176501d10..08febffa16 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -1,8 +1,8 @@
 PRGNAM="vlc"
-VERSION="3.0.11.1"
+VERSION="3.0.12"
 HOMEPAGE="https://www.videolan.org/vlc/"
-DOWNLOAD="https://get.videolan.org/vlc/3.0.11.1/vlc-3.0.11.1.tar.xz"
-MD5SUM="f797dc97305639f6270df619fe1c5962"
+DOWNLOAD="https://get.videolan.org/vlc/3.0.12/vlc-3.0.12.tar.xz"
+MD5SUM="452d3423bcbaf1b85faebab0c45a7ecf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm libtar libkate faac libdca libmatroska libshout speex avahi projectM jack libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 qt5 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray libnfs protobuf"
diff --git a/multimedia/vokoscreen/README b/multimedia/vokoscreen/README
deleted file mode 100644
index 4bb086a679..0000000000
--- a/multimedia/vokoscreen/README
+++ /dev/null
@@ -1,2 +0,0 @@
-vokoscreen is an easy to use screencast creator to record educational videos,
-live recordings of browser, installation, videoconferences, etc.
diff --git a/multimedia/vokoscreen/vokoscreen.info b/multimedia/vokoscreen/vokoscreen.info
deleted file mode 100644
index f42e9a9389..0000000000
--- a/multimedia/vokoscreen/vokoscreen.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="vokoscreen"
-VERSION="2.5.0"
-HOMEPAGE="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"
-DOWNLOAD="https://github.com/vkohaupt/vokoscreen/archive/2.5.0/vokoscreen-2.5.0.tar.gz"
-MD5SUM="c4fd74a1a459dab818eb05df1ca93be0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5 ffmpeg lame"
-MAINTAINER="Harald Achitz"
-EMAIL="harald.achitz@gmail.com"
diff --git a/multimedia/vokoscreenNG/0001-Add-better-integration-for-Linux.patch b/multimedia/vokoscreenNG/0001-Add-better-integration-for-Linux.patch
new file mode 100644
index 0000000000..521793a33f
--- /dev/null
+++ b/multimedia/vokoscreenNG/0001-Add-better-integration-for-Linux.patch
@@ -0,0 +1,110 @@
+The original patch was from an ArchLinux package
+https://github.com/archlinux/svntogit-community/blob/packages/vokoscreen/trunk/0001-Add-better-integration-for-Linux.patch
+
+I got this one from https://github.com/City-busz/vokoscreenNG branch 'linux-support', and modified it to work with 3.0.8
+
+commit 0a378409 (HEAD -> linux-support, origin/linux-support)
+Author: Balló György <ballogyor@gmail.com>
+Date:   2020-07-06 07:14:26 -0600
+
+    Add better integration for Linux
+    
+    Add AppStream metadata, add installation target.
+
+diff --git a/src/applications/INFO b/src/applications/INFO
+index 4195de8f..1c1bd870 100644
+--- a/src/applications/INFO
++++ b/src/applications/INFO
+@@ -1,2 +1,3 @@
++vokoscreenNG.appdata.xml
+ vokoscreenNG.desktop
+ vokoscreenNG.png
+diff --git a/src/applications/vokoscreenNG.appdata.xml b/src/applications/vokoscreenNG.appdata.xml
+new file mode 100644
+index 00000000..883f4ae2
+--- /dev/null
++++ b/src/applications/vokoscreenNG.appdata.xml
+@@ -0,0 +1,45 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop">
++  <id>vokoscreenNG.desktop</id>
++  <metadata_license>CC0-1.0</metadata_license>
++  <project_license>GPL-2.0</project_license>
++  <name>vokoscreenNG</name>
++  <summary>Easy to use desktop recorder</summary>
++  <description>
++    <p>vokoscreenNG is an easy to use screencast creator to record educational videos,
++       live recordings of browser, installation, videoconferences, etc.</p>
++  </description>
++  <screenshots>
++    <screenshot type="default">
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-0.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-1.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-2.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-3.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-4.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-5.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-6.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-7.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://vokoscreen.volkoh.de/3.0/picture/screencast-8.png</image>
++    </screenshot>
++  </screenshots>
++  <url type="homepage">https://linuxecke.volkoh.de/vokoscreen/vokoscreen.html</url>
++  <url type="bugtracker">https://github.com/vkohaupt/vokoscreenNG/issues</url>
++  <url type="donation">https://linuxecke.volkoh.de/vokoscreen/vokoscreen-donate.html</url>
++  <developer_name>Volker Kohaupt</developer_name>
++</component>
+diff --git a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro
+index 69bc5a33..fdf7fd07 100644
+--- a/src/vokoscreenNG.pro
++++ b/src/vokoscreenNG.pro
+@@ -163,4 +163,29 @@
+ # ciscoOpenh264
+ win32:include(ciscoOpenh264/ciscoOpenh264.pri)
+ 
+-unix:include(wayland/wayland.pri)
+\ No newline at end of file
++unix:include(wayland/wayland.pri)
++
++unix:!macx {
++  isEmpty(PREFIX) {
++    PREFIX = /usr/local
++  }
++  isEmpty(BINDIR) {
++    BINDIR = $$PREFIX/bin
++  }
++  isEmpty(DATADIR) {
++    DATADIR = $$PREFIX/share
++  }
++
++  target.path = $$BINDIR
++
++  icon.files = applications/vokoscreenNG.png
++  icon.path = $$DATADIR/icons/hicolor/256x256/apps/
++
++  desktop.files = applications/vokoscreenNG.desktop
++  desktop.path = $$DATADIR/applications/
++
++  appdata.files = applications/vokoscreenNG.appdata.xml
++  appdata.path = $$DATADIR/metainfo/
++
++  INSTALLS += target icon desktop appdata
++}
+Only in vokoscreenNG-3.0.8/src: vokoscreenNG.pro.orig
+Only in vokoscreenNG-3.0.8/src: vokoscreenNG.pro.rej
diff --git a/multimedia/vokoscreenNG/README b/multimedia/vokoscreenNG/README
new file mode 100644
index 0000000000..ed98b62da4
--- /dev/null
+++ b/multimedia/vokoscreenNG/README
@@ -0,0 +1,13 @@
+vokoscreenNG is an easy to use screencast creator to record educational
+videos, live recordings of browser, installation, videoconferences, etc.
+
+This application requires that $XDG_SESSION_TYPE be exported with either
+"X11" or "Wayland".  This SlackBuild installs profile scripts under
+/etc/profile.d to set this variable.  These scripts use the value of
+XDG_SESSION_TYPE from the environment in which this SlackBuild is run,
+defaulting to XDG_SESSION_TYPE=X11.
+
+To control the session type, run this script with your preferred
+definition of XDG_SESSION_TYPE:
+
+  XDG_SESSION_TYPE=Wayland ./vokoscreenNG.SlackBuild
diff --git a/multimedia/vokoscreenNG/doinst.sh b/multimedia/vokoscreenNG/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/multimedia/vokoscreenNG/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/multimedia/vokoscreenNG/slack-desc b/multimedia/vokoscreenNG/slack-desc
new file mode 100644
index 0000000000..f8188ae4cc
--- /dev/null
+++ b/multimedia/vokoscreenNG/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+vokoscreenNG: vokoscreenNG (screencast creator)
+vokoscreenNG:
+vokoscreenNG: vokoscreenNG is an easy to use screencast creator to record
+vokoscreenNG: educational videos, live recordings of browser, installation,
+vokoscreenNG: videoconferences, etc.
+vokoscreenNG:
+vokoscreenNG:
+vokoscreenNG:
+vokoscreenNG:
+vokoscreenNG: http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
+vokoscreenNG:
diff --git a/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild b/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild
new file mode 100644
index 0000000000..4b4eadadc5
--- /dev/null
+++ b/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for VokoscreenNG
+
+# Erik Falor | Logan Utah, USA | ewfalor@gmail.com
+# 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=vokoscreenNG
+VERSION=${VERSION:-3.0.8}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+patch -Np1 -i $CWD/0001-Add-better-integration-for-Linux.patch
+
+qmake-qt5 PREFIX=/usr QMAKE_CXXFLAGS="$SLKCFLAGS" src/vokoscreenNG.pro
+make -j $(nproc)
+make INSTALL_ROOT=$PKG install
+
+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.md COPYING README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+mkdir -p etc/profile.d
+cat > etc/profile.d/$PRGNAM.sh << EOF
+#!/bin/sh
+export XDG_SESSION_TYPE=${XDG_SESSION_TYPE:-X11}
+EOF
+
+cat > etc/profile.d/$PRGNAM.csh << EOF
+#!/bin/csh
+setenv XDG_SESSION_TYPE ${XDG_SESSION_TYPE:-X11}
+EOF
+
+chmod 755 etc/profile.d/*
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/vokoscreenNG/vokoscreenNG.info b/multimedia/vokoscreenNG/vokoscreenNG.info
new file mode 100644
index 0000000000..f9bbbb5aad
--- /dev/null
+++ b/multimedia/vokoscreenNG/vokoscreenNG.info
@@ -0,0 +1,10 @@
+PRGNAM="vokoscreenNG"
+VERSION="3.0.8"
+HOMEPAGE="https://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"
+DOWNLOAD="https://github.com/vkohaupt/vokoscreenNG/archive/3.0.8/vokoscreenNG-3.0.8.tar.gz"
+MD5SUM="88aacbf74cb543ed0db2397abe3ac74a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5 ffmpeg lame %README%"
+MAINTAINER="Erik Falor"
+EMAIL="ewfalor@gmail.com"
diff --git a/multimedia/youtube-viewer/README b/multimedia/youtube-viewer/README
index e757d99e39..e8be3fd76e 100644
--- a/multimedia/youtube-viewer/README
+++ b/multimedia/youtube-viewer/README
@@ -13,6 +13,15 @@ See https://github.com/trizen/youtube-viewer/issues/308 for more
 information.
 
 If you don't like this restriction, try using straw-viewer instead.
+
+Further note: I (B. Watson) am no longer updating this SlackBuild
+because I don't care to register for an API key, so I can't test
+it. If you use this and want to take over, please let me know (or
+mention it on the mailing list).
+
+This build will be REMOVED from the repository either in March 2021, or
+whenever Slackware 15.0 releases (whichever comes first) unless someone
+takes over as maintainer.
 *********
 
 Optional dependencies:
diff --git a/multimedia/youtube-viewer/youtube-viewer.SlackBuild b/multimedia/youtube-viewer/youtube-viewer.SlackBuild
index a12b886b9d..9e4d09598e 100644
--- a/multimedia/youtube-viewer/youtube-viewer.SlackBuild
+++ b/multimedia/youtube-viewer/youtube-viewer.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw: orphan this build. See README note about removal.
 # 20200305 bkw: updated for 3.7.4, add README stuff about API keys.
 # 20200110 bkw: updated for 3.7.0, add .sqf.
 # 20191220 bkw: updated for 3.6.0.
diff --git a/multimedia/youtube-viewer/youtube-viewer.info b/multimedia/youtube-viewer/youtube-viewer.info
index 39c9f54166..83016c7904 100644
--- a/multimedia/youtube-viewer/youtube-viewer.info
+++ b/multimedia/youtube-viewer/youtube-viewer.info
@@ -6,5 +6,5 @@ MD5SUM="17e183cdccfe30c04aed7263d26654a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-LWP-Protocol-https perl-lwp-useragent-cached perl-JSON perl-JSON-XS perl-Module-Build"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/network/AdGuardHome/AdGuardHome.SlackBuild b/network/AdGuardHome/AdGuardHome.SlackBuild
index 72f8daf7b4..85e19365bc 100644
--- a/network/AdGuardHome/AdGuardHome.SlackBuild
+++ b/network/AdGuardHome/AdGuardHome.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for AdGuardHome
 
-# Copyright 2019-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,14 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=AdGuardHome
-VERSION=${VERSION:-0.103.3}
+VERSION=${VERSION:-0.105.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -40,16 +39,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SUFFIX="linux_386"
-elif [ "$ARCH" = "x86_64" ]; then
-  SUFFIX="linux_amd64"
-elif [ "$ARCH" = "arm" ]; then
-  SUFFIX="linux_arm"
-else
-  echo "$ARCH is not supported." >&2
-  exit 1
-fi
+case "$ARCH" in
+    i?86) SUFFIX="linux_386" ;;
+  x86_64) SUFFIX="linux_amd64" ;;
+       *) echo "$ARCH is not supported." >&2
+          exit 1
+          ;;
+esac
 
 set -e
 
diff --git a/network/AdGuardHome/AdGuardHome.info b/network/AdGuardHome/AdGuardHome.info
index e5e3e827ee..b254d22293 100644
--- a/network/AdGuardHome/AdGuardHome.info
+++ b/network/AdGuardHome/AdGuardHome.info
@@ -1,10 +1,10 @@
 PRGNAM="AdGuardHome"
-VERSION="0.103.3"
+VERSION="0.105.2"
 HOMEPAGE="https://adguard.com/adguard-home.html"
-DOWNLOAD="https://static.adguard.com/adguardhome/release/AdGuardHome_linux_386.tar.gz"
-MD5SUM="bb6152c5ad1849c8281698e61ba62e2e"
-DOWNLOAD_x86_64="https://static.adguard.com/adguardhome/release/AdGuardHome_linux_amd64.tar.gz"
-MD5SUM_x86_64="0585bd80cf047f9a1353385eed3d717a"
+DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.105.2/AdGuardHome_linux_386.tar.gz"
+MD5SUM="257243522f370491c4c3515270dbf5f1"
+DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.105.2/AdGuardHome_linux_amd64.tar.gz"
+MD5SUM_x86_64="e7e99dda4cbe67e8f65545440805b4e2"
 REQUIRES=""
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/network/Electrum/Electrum.SlackBuild b/network/Electrum/Electrum.SlackBuild
index 475770b513..7b9877ac08 100644
--- a/network/Electrum/Electrum.SlackBuild
+++ b/network/Electrum/Electrum.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Electrum
 
 # Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# Copyright 2019 nomnombtc <nomnombtc@arcor.de>
+# Copyright 2019-2021 nomnombtc <nomnombtc@arcor.de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Electrum
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/Electrum/Electrum.info b/network/Electrum/Electrum.info
index 5d92f2f9fb..c11549a938 100644
--- a/network/Electrum/Electrum.info
+++ b/network/Electrum/Electrum.info
@@ -1,10 +1,10 @@
 PRGNAM="Electrum"
-VERSION="4.0.4"
+VERSION="4.1.1"
 HOMEPAGE="https://electrum.org/"
-DOWNLOAD="https://download.electrum.org/4.0.4/Electrum-4.0.4.tar.gz"
-MD5SUM="533ca2ddfe068fd979079a3a4ea49440"
+DOWNLOAD="https://download.electrum.org/4.1.1/Electrum-4.1.1.tar.gz"
+MD5SUM="e15a6260cdb4af85d324ce9cb68bec35"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 protobuf3 ecdsa cryptography dnspython secp256k1 python3-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX python-qrcode python-chardet python-bitstring QDarkStyle"
+REQUIRES="python3-PyQt5 protobuf3 cryptography dnspython secp256k1 python-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX-legacy python-qrcode python-chardet python-bitstring QDarkStyle"
 MAINTAINER="nomnombtc"
 EMAIL="nomnombtc@arcor.de"
diff --git a/network/TeamSpeak3/TeamSpeak3.SlackBuild b/network/TeamSpeak3/TeamSpeak3.SlackBuild
index 0ed6eb10af..c6921a424e 100644
--- a/network/TeamSpeak3/TeamSpeak3.SlackBuild
+++ b/network/TeamSpeak3/TeamSpeak3.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=TeamSpeak3
-VERSION=${VERSION:-3.5.3}
+VERSION=${VERSION:-3.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/TeamSpeak3/TeamSpeak3.info b/network/TeamSpeak3/TeamSpeak3.info
index aafc1bfdab..f6d5be52f0 100644
--- a/network/TeamSpeak3/TeamSpeak3.info
+++ b/network/TeamSpeak3/TeamSpeak3.info
@@ -1,10 +1,10 @@
 PRGNAM="TeamSpeak3"
-VERSION="3.5.3"
+VERSION="3.5.6"
 HOMEPAGE="https://www.teamspeak.com/en/"
-DOWNLOAD="https://files.teamspeak-services.com/releases/client/3.5.3/TeamSpeak3-Client-linux_x86-3.5.3.run"
-MD5SUM="7f18bda1c7df1e9cc25ccb5ca51c2560"
-DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.5.3/TeamSpeak3-Client-linux_amd64-3.5.3.run"
-MD5SUM_x86_64="5f822f58d380ac716c2208675eac310e"
+DOWNLOAD="https://files.teamspeak-services.com/releases/client/3.5.6/TeamSpeak3-Client-linux_x86-3.5.6.run"
+MD5SUM="8b667d366c0e257ae58c4688de5a923f"
+DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.5.6/TeamSpeak3-Client-linux_amd64-3.5.6.run"
+MD5SUM_x86_64="15d6e255515f37cc514dcf4f0f7cf23d"
 REQUIRES="libxkbcommon"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/network/XD/README b/network/XD/README
new file mode 100644
index 0000000000..530e0c7d26
--- /dev/null
+++ b/network/XD/README
@@ -0,0 +1,13 @@
+XD - I2P BitTorrent Client written in GO
+
+Features:
+
+    - i2p only, no chances of cross network contamination,
+      aka no way to leak IP.
+    - works with i2pd and Java I2P using the SAM api
+    - Magnet URIs
+
+Build options:
+
+    - To enable Lokinet, pass "LOKINET=1" to the script.
+    - To disable the web-ui, pass "no-webui" to the script.
diff --git a/network/XD/XD.SlackBuild b/network/XD/XD.SlackBuild
new file mode 100644
index 0000000000..89018797d3
--- /dev/null
+++ b/network/XD/XD.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackbuild for XD
+
+# Written by shelldweller <shelldweller@beauxbead.com>
+# 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=XD
+VERSION=${VERSION:-0.3.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+   case "$( uname -m )" in
+     i?86) ARCH=i586 ;;
+     arm*) ARCH=arm ;;
+        *) ARCH=$( uname -m ) ;;
+   esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make install PREFIX=$PKG/usr
+
+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 CODE_OF_CONDUCT.md LICENSE README.md docs/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/XD/XD.info b/network/XD/XD.info
new file mode 100644
index 0000000000..373a095c1d
--- /dev/null
+++ b/network/XD/XD.info
@@ -0,0 +1,10 @@
+PRGNAM="XD"
+VERSION="0.3.4"
+HOMEPAGE="https://github.com/majestrate/XD"
+DOWNLOAD="https://github.com/majestrate/XD/archive/v0.3.4.tar.gz"
+MD5SUM="e68c243f875de6e791ef27b5564f1bb6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="shelldweller"
+EMAIL="shelldweller@beauxbead.com"
diff --git a/network/XD/slack-desc b/network/XD/slack-desc
new file mode 100644
index 0000000000..6e4eece61e
--- /dev/null
+++ b/network/XD/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+XD: XD (I2P BitTorrent Client written in GO)
+XD:
+XD: Features:
+XD:
+XD:    - i2p only, no chances of cross network contamination,
+XD:      aka no way to leak IP.
+XD:
+XD:    - works with i2pd and Java I2P using the SAM api
+XD:
+XD:    - Magnet URIs
+XD:
diff --git a/network/acme.sh/README b/network/acme.sh/README
index c251271d74..44518a476a 100644
--- a/network/acme.sh/README
+++ b/network/acme.sh/README
@@ -1,22 +1,24 @@
 An ACME Shell script
 
-- An ACME protocol client written purely in Shell (Unix shell) language.
-- Full ACME protocol implementation.
-- Support ACME v1 and ACME v2
-- Support ACME v2 wildcard certs
-- Simple, powerful and very easy to use. You only need 3 minutes to
-  learn it.
-- Bash, dash and sh compatible.
-- Simplest shell script for Let's Encrypt free certificate client.
-- Purely written in Shell with no dependencies on python or the
-  official Let's Encrypt client.
-- Just one script to issue, renew and install your certificates
-  automatically.
-- DOES NOT require root/sudoer access.
-- Docker friendly
-- IPv6 support
-- Cron job notifications for renewal or error etc.
+ - An ACME protocol client written purely in Shell (Unix shell)
+   language.
+ - Full ACME protocol implementation.
+ - Support ACME v1 and ACME v2
+ - Support ACME v2 wildcard certs
+ - Simple, powerful and very easy to use. You only need 3 minutes to
+   learn it.
+ - Bash, dash and sh compatible.
+ - Simplest shell script for Let's Encrypt free certificate client.
+ - Purely written in Shell with no dependencies on python or the
+   official Let's Encrypt client.
+ - Just one script to issue, renew and install your certificates
+   automatically.
+ - DOES NOT require root/sudoer access.
+ - Docker friendly
+ - IPv6 support
+ - Cron job notifications for renewal or error etc.
 
  Optional dependencies:
 
 * socat - to standalone mode
+
diff --git a/network/acme.sh/acme.sh.SlackBuild b/network/acme.sh/acme.sh.SlackBuild
index 6fa631cebc..554aa6df98 100644
--- a/network/acme.sh/acme.sh.SlackBuild
+++ b/network/acme.sh/acme.sh.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for acme.sh
 #
-# Copyright 2019-2020 Corrado Franco (https://corradofranco.it)
+# Copyright 2019-2021 Corrado Franco (https://corradofranco.it)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
 
 PRGNAM=acme.sh
-VERSION=${VERSION:-2.8.5}
+VERSION=${VERSION:-2.8.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/acme.sh/acme.sh.info b/network/acme.sh/acme.sh.info
index 05eb09d638..2e4561fcd0 100644
--- a/network/acme.sh/acme.sh.info
+++ b/network/acme.sh/acme.sh.info
@@ -1,8 +1,8 @@
 PRGNAM="acme.sh"
-VERSION="2.8.5"
+VERSION="2.8.8"
 HOMEPAGE="https://acme.sh/"
-DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.5/acme.sh-2.8.5.tar.gz"
-MD5SUM="226b7155fe85316a7fbd1b54f9639fd2"
+DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.8/acme.sh-2.8.8.tar.gz"
+MD5SUM="92260273122eed14607db4f1306cd25a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/anydesk/anydesk.SlackBuild b/network/anydesk/anydesk.SlackBuild
index aac6be4bfd..dff8b6f1b5 100644
--- a/network/anydesk/anydesk.SlackBuild
+++ b/network/anydesk/anydesk.SlackBuild
@@ -23,16 +23,17 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=anydesk
-VERSION=${VERSION:-6.0.1}
+VERSION=${VERSION:-6.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "Package for $ARCH architecture is not available."
+  exit 1
 fi
 
 CWD=$(pwd)
@@ -42,15 +43,6 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-if [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -71,7 +63,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 mkdir -p $PKG/etc/rc.d/
-cp $CWD/rc.anydesk $PKG/etc/rc.d/rc.anydesk
+cat $CWD/rc.anydesk > $PKG/etc/rc.d/rc.anydesk.new
 
 cd $PKG
 /sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/anydesk/anydesk.info b/network/anydesk/anydesk.info
index 1ab5b2b2fb..15a9deed47 100644
--- a/network/anydesk/anydesk.info
+++ b/network/anydesk/anydesk.info
@@ -1,10 +1,10 @@
 PRGNAM="anydesk"
-VERSION="6.0.1"
+VERSION="6.1.0"
 HOMEPAGE="https://anydesk.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_6.0.1-1_x86_64.rpm"
-MD5SUM_x86_64="5660c68e7dd31ce95dc74e02e74f776d"
+DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_6.1.0-1_x86_64.rpm"
+MD5SUM_x86_64="34fcffc15185cdd658353b95c814d0f7"
 REQUIRES="gtkglext lsb-release"
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/anydesk/doinst.sh b/network/anydesk/doinst.sh
index aea0f894eb..4a1462ff3a 100644
--- a/network/anydesk/doinst.sh
+++ b/network/anydesk/doinst.sh
@@ -1,3 +1,27 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -11,3 +35,5 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+preserve_perms etc/rc.d/rc.anydesk.new
diff --git a/network/asterisk/README.SBo b/network/asterisk/README.SBo
index 1b353f35e8..0ef4f7bc94 100644
--- a/network/asterisk/README.SBo
+++ b/network/asterisk/README.SBo
@@ -17,7 +17,7 @@ need to install libpri, again before compiling Asterisk.
 
 Examples
 ========
-Be sure to see /usr/doc/asterisk-16.13.0/sample_confs/ after
+Be sure to see /usr/doc/asterisk-16.15.0/sample_confs/ after
 installation for any additional configuration files you may need.
 
 Database Support
@@ -27,7 +27,7 @@ want to install the alembic package. Since version 12.0 the database
 schemas that Asterisk uses are being captured in the form of python
 script files that use alembic to create/update database schemas. The
 asterisk package places these database scripts in the
-/usr/doc/asterisk-16.13.0/ast-db-manage directory.
+/usr/doc/asterisk-16.15.0/ast-db-manage directory.
 
 Build Flags
 ===========
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 6519b55495..c918343a87 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asterisk
-VERSION=${VERSION:-16.13.0}
+VERSION=${VERSION:-16.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index 36ea17a8e0..00aca78b29 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,7 +1,7 @@
 PRGNAM="asterisk"
-VERSION="16.13.0"
+VERSION="16.15.0"
 HOMEPAGE="https://www.asterisk.org"
-DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.13.0.tar.gz \
+DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.15.0.tar.gz \
           https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \
           https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \
           https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \
@@ -37,7 +37,7 @@ DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/releases/asteris
           https://raw.githubusercontent.com/asterisk/third-party/master/jansson/2.12/jansson-2.12.tar.bz2 \
           https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2 \
           http://ponce.cc/slackware/sources/repo/imap.tar.Z"
-MD5SUM="e084339d4d3ce1efce415150d7447c0a \
+MD5SUM="2f03204a38e8ed49e58474961d43f363 \
         d90e24e30d707e2932cf419cfccff25a \
         3c071029c1ab648367666d1e384394bb \
         e4a9ee348028fc0e47148f783e7f945b \
diff --git a/network/atftp/atftp.SlackBuild b/network/atftp/atftp.SlackBuild
index c5f7d225e9..4ae86a9fb8 100644
--- a/network/atftp/atftp.SlackBuild
+++ b/network/atftp/atftp.SlackBuild
@@ -23,6 +23,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>.
 
+# 20210223 bkw: update for v0.7.4.
 # 20191129 bkw: update for v0.7.2.
 
 # 20180629 bkw:
@@ -33,8 +34,8 @@
 #   the package since it overrides some of the info from upstream's docs.
 
 PRGNAM=atftp
-VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.7.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/atftp/atftp.info b/network/atftp/atftp.info
index 58e6c6f694..7de5174fa6 100644
--- a/network/atftp/atftp.info
+++ b/network/atftp/atftp.info
@@ -1,8 +1,8 @@
 PRGNAM="atftp"
-VERSION="0.7.2"
+VERSION="0.7.4"
 HOMEPAGE="https://sourceforge.net/projects/atftp"
-DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.2.tar.gz"
-MD5SUM="eb358eb1af10ae5dc51095cd10b6738b"
+DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.4.tar.gz"
+MD5SUM="f15e2b89498106f68b798ad027a85e8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/avahi/avahi-discover.1 b/network/avahi/avahi-discover.1
new file mode 100644
index 0000000000..085ff1354e
--- /dev/null
+++ b/network/avahi/avahi-discover.1
@@ -0,0 +1,16 @@
+.TH avahi-discover 1 User Manuals
+.SH NAME
+avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon
+.SH SYNOPSIS
+\fBavahi-discover
+\f1
+.SH DESCRIPTION
+Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon.
+.SH OPTIONS
+avahi-discover takes no command line arguments at the moment.
+.SH AUTHORS
+The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+.SH SEE ALSO
+\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1
+.SH COMMENTS
+This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index 0593618738..b2b984d3b3 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -2,11 +2,8 @@
 
 # Slackware build script for avahi
 
-# Written by David Somero <dsomero@hotmail.com>
-# Derived from Slackware's Slackbuilds.
-#
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2008-2012  David Somero (dsomero@hotmail.com) Athens, TN, USA
+# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avahi
-VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -96,8 +93,17 @@ 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 {} \;
 
-# Thanks to Robby Workman for this patch.
 patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch
+patch -p1 --verbose < $CWD/ipv6_race_condition_fix.patch	# thanks, LFS
+
+# Okay, I had to cheat a bit on the manual pages; there's a commit
+# in git that will fix this, so I just built a git checkout, grabbed
+# the built manual pages, and we'll drop them into place so the build
+# will work for this released version...
+cat $CWD/build-db > service-type-database/build-db
+chmod 0755 service-type-database/build-db
+cat $CWD/bssh.1 > man/bssh.1
+cat $CWD/avahi-discover.1 > man/avahi-discover.1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -108,23 +114,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-systemdsystemunitdir=no \
   --enable-tests \
   --disable-static \
   --disable-monodoc \
   --disable-autoipd \
+  --enable-compat-libdns_sd \
   --enable-python-dbus \
-  --enable-pygtk\
   --enable-glib \
   --enable-dbus \
   --enable-python \
   --enable-gtk \
   --enable-gtk3 \
-  --enable-qt4 \
+  --disable-qt5 \
+  --disable-qt4 \
   --disable-qt3 \
   --enable-core-docs \
-  --enable-compat-howl \
-  --enable-compat-libdns_sd \
-  --with-dbus-sys=/etc/dbus-1/system.d \
+  --with-dbus-sys=/usr/share/dbus-1/system.d \
   --with-avahi-user=avahi \
   --with-avahi-group=avahi \
   --with-avahi-priv-access-group=netdev \
@@ -137,10 +143,6 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# howl and mdnsresponder compatability
-(cd $PKG/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
-(cd $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -150,8 +152,6 @@ for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i;
 mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new
 mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new
 mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new
-mv $PKG/etc/dbus-1/system.d/avahi-dbus.conf \
-  $PKG/etc/dbus-1/system.d/avahi-dbus.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
index 7f842f50e1..ced5e61121 100644
--- a/network/avahi/avahi.info
+++ b/network/avahi/avahi.info
@@ -1,8 +1,8 @@
 PRGNAM="avahi"
-VERSION="0.7"
+VERSION="0.8"
 HOMEPAGE="http://avahi.org/"
-DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz"
-MD5SUM="d76c59d0882ac6c256d70a2a585362a6"
+DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz"
+MD5SUM="229c6aa30674fc43c202b22c5f8c2be7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libdaemon"
diff --git a/network/avahi/bssh.1 b/network/avahi/bssh.1
new file mode 100644
index 0000000000..913554eb30
--- /dev/null
+++ b/network/avahi/bssh.1
@@ -0,0 +1,36 @@
+.TH bssh/bvnc/bshell 1 User Manuals
+.SH NAME
+bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network
+.SH SYNOPSIS
+\fBbssh
+
+bvnc
+
+bshell
+\f1
+.SH DESCRIPTION
+bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made.
+
+If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown.
+.SH OPTIONS
+.TP
+\fB-s | --ssh\f1
+Browse for SSH servers (and only SSH servers) regardless under which name the binary is called.
+.TP
+\fB-v | --vnc\f1
+Browse for VNC servers (and only VNC servers) regardless under which name the binary is called.
+.TP
+\fB-S | --shell\f1
+Browse for both VNC and SSH servers regardless under which name the binary is called.
+.TP
+\fB-d | --domain=\f1 \fIDOMAIN\f1
+Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local)
+.TP
+\fB-h | --help\f1
+Show help.
+.SH AUTHORS
+The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+.SH SEE ALSO
+\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1
+.SH COMMENTS
+This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/build-db b/network/avahi/build-db
new file mode 100644
index 0000000000..78ee892f60
--- /dev/null
+++ b/network/avahi/build-db
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# -*-python-*-
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+try:
+    import anydbm as dbm
+except ImportError:
+    import dbm
+
+import sys
+
+if len(sys.argv) > 1:
+    infn = sys.argv[1]
+else:
+    infn = "service-types"
+
+if len(sys.argv) > 2:
+    outfn = sys.argv[2]
+else:
+    outfn = infn + ".db"
+
+db = dbm.open(outfn, "n")
+
+for ln in open(infn, "r"):
+    ln = ln.strip(" \r\n\t")
+    
+    if ln == "" or ln.startswith("#"):
+        continue
+
+    t, n = ln.split(":", 1)
+
+    db[t.strip()] = n.strip()
+
+db.close()
diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh
index d22f3fa394..9bf5bd8772 100644
--- a/network/avahi/doinst.sh
+++ b/network/avahi/doinst.sh
@@ -26,7 +26,6 @@ preserve_perms() {
 preserve_perms etc/rc.d/rc.avahidaemon.new
 preserve_perms etc/rc.d/rc.avahidnsconfd.new
 preserve_perms etc/avahi/avahi-daemon.conf.new
-preserve_perms etc/dbus-1/system.d/avahi-dbus.conf.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/network/avahi/ipv6_race_condition_fix.patch b/network/avahi/ipv6_race_condition_fix.patch
new file mode 100644
index 0000000000..3418b1a11c
--- /dev/null
+++ b/network/avahi/ipv6_race_condition_fix.patch
@@ -0,0 +1,51 @@
+Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
+Date:                    2020-10-19
+Initial Package Version: 0.8
+Upstream Status:         PR, not applied
+Origin:                  Upstream PR (github.com/lathiat/avahi/pull/309)
+Description:             Fixes a race condition when multiple NICs are in use
+                         when IPv6 is enabled. This will exhibit behavior where
+                         messages about withdrawing address records, registering
+                         access records, and new hostname announcements are
+                         spammed to the log every second.
+
+diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c
+--- avahi-0.8.orig/avahi-core/server.c	2020-02-16 21:41:24.939967558 -0600
++++ avahi-0.8/avahi-core/server.c	2020-10-19 11:07:22.054861721 -0500
+@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer *
+         withdraw_entry(s, e);
+ }
+ 
+-static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) {
++static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) {
+     AvahiEntry *e, *n;
+     int ours = 0, won = 0, lost = 0;
+ 
+@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer *
+         if (e->dead)
+             continue;
+ 
+-        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) {
++        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) {
+             ours = 1;
+             break;
+         } else {
+@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer
+             if (!avahi_key_is_pattern(record->key)) {
+                 if (!from_local_iface)
+                     reflect_probe(s, i, record);
+-                incoming_probe(s, record, i);
++                incoming_probe(s, record, i, from_local_iface);
+             }
+ 
+             avahi_record_unref(record);
+@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer
+         return;
+ 
+     /* We don't want to reflect local traffic, so we check if this packet is generated locally. */
+-    if (s->config.enable_reflector)
+-        from_local_iface = originates_from_local_iface(s, iface, src_address, port);
++    from_local_iface = originates_from_local_iface(s, iface, src_address, port);
+ 
+     if (avahi_dns_packet_check_valid_multicast(p) < 0) {
+         avahi_log_debug("Received invalid packet.");
diff --git a/network/axel/README b/network/axel/README
index a1f6e0a8e7..3368633451 100644
--- a/network/axel/README
+++ b/network/axel/README
@@ -1,7 +1,7 @@
 Axel accelerates the HTTP/FTP downloading process by using multiple
-connections for one file. It can use multiple mirrors for a download. Axel
-has no dependencies and is lightweight, so it might be useful as a wget
-clone on byte-critical systems. Axel is the perfect utility for those
-connections to wherever you are downloading from that may have a limit
-on ftp stream speeds, http sessions that burst and slow down, or servers
-with a slow connection.
+connections for one file. It can use multiple mirrors for a download.
+Axel has no dependencies and is lightweight, so it might be useful as a
+wget clone on byte-critical systems. Axel is the perfect utility for
+those connections to wherever you are downloading from that may have a
+limit on ftp stream speeds, http sessions that burst and slow down, or
+servers with a slow connection.
diff --git a/network/axel/axel.SlackBuild b/network/axel/axel.SlackBuild
index 1fd45e4c8c..ada5d01ebe 100644
--- a/network/axel/axel.SlackBuild
+++ b/network/axel/axel.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2008  Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # Copyright 2011  Matthew "mfillpot" Fillpot
-# Copyright 2018-2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2018-2021  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=axel
-VERSION=${VERSION:-2.17.8}
+VERSION=${VERSION:-2.17.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,7 +84,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 AUTHORS CONTRIBUTING.md COPYING CREDITS INSTALL NEWS README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md COPYING INSTALL NEWS README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/axel/axel.info b/network/axel/axel.info
index f20e9d19a9..994749100c 100644
--- a/network/axel/axel.info
+++ b/network/axel/axel.info
@@ -1,10 +1,10 @@
 PRGNAM="axel"
-VERSION="2.17.8"
+VERSION="2.17.10"
 HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.8/axel-2.17.8.tar.gz"
-MD5SUM="15c0d085d33b3908ebd8debc41b25afa"
+DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.10/axel-2.17.10.tar.gz"
+MD5SUM="de52af0d6ed13e476107b17a802a6a64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/network/basilisk-bin/basilisk-bin.SlackBuild b/network/basilisk-bin/basilisk-bin.SlackBuild
index a30c712c8c..24b2e373fd 100644
--- a/network/basilisk-bin/basilisk-bin.SlackBuild
+++ b/network/basilisk-bin/basilisk-bin.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=basilisk-bin
 SRCNAM=basilisk
-VERSION=${VERSION:-2019.09.03}
+VERSION=${VERSION:-2021.03.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,7 +53,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-latest.linux64.tar.bz2
+tar xvf $CWD/$SRCNAM-latest.linux64.tar.xz
 cd $SRCNAM
 chown -R root:root .
 find -L . \
diff --git a/network/basilisk-bin/basilisk-bin.info b/network/basilisk-bin/basilisk-bin.info
index ead5cf5a63..1cf23772cb 100644
--- a/network/basilisk-bin/basilisk-bin.info
+++ b/network/basilisk-bin/basilisk-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="basilisk-bin"
-VERSION="2019.09.03"
+VERSION="2021.03.17"
 HOMEPAGE="https://www.basilisk-browser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://us.basilisk-browser.org/release/basilisk-latest.linux64.tar.bz2"
-MD5SUM_x86_64="c7106e3201d419da95f4508d80a5c3b0"
+DOWNLOAD_x86_64="http://repo.khronosschoty.org/Slackware/basilisk/basilisk-bin/basilisk-latest.linux64.tar.xz"
+MD5SUM_x86_64="5edda8852f40000a6a66848d2930c8a9"
 REQUIRES=""
 MAINTAINER="khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/network/bitcoin/README b/network/bitcoin/README
index d1f16ce23d..667e2935be 100644
--- a/network/bitcoin/README
+++ b/network/bitcoin/README
@@ -13,6 +13,6 @@ If you just want to send and receive Bitcoins you can also look
 at a light client like Electrum.
 
 Please make sure to read the release notes first before upgrading:
-https://bitcoincore.org/en/releases/0.20.1/
+https://bitcoincore.org/en/releases/0.21.0/
 
 qrencode is an optional but strongly recommended dependency.
diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild
index d800b5c8c3..658fc14a62 100644
--- a/network/bitcoin/bitcoin.SlackBuild
+++ b/network/bitcoin/bitcoin.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitcoin
-VERSION=${VERSION:-0.20.1}
+VERSION=${VERSION:-0.21.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
-BITCOIN_GENBUILD_NO_GIT=1 make
+make
 make install DESTDIR=$PKG
 
 # Remove the "test" binaries. Alternatively, you can explicitly disable tests
diff --git a/network/bitcoin/bitcoin.info b/network/bitcoin/bitcoin.info
index f3a9de4bb3..c9df6a1ae7 100644
--- a/network/bitcoin/bitcoin.info
+++ b/network/bitcoin/bitcoin.info
@@ -1,8 +1,8 @@
 PRGNAM="bitcoin"
-VERSION="0.20.1"
+VERSION="0.21.0"
 HOMEPAGE="https://bitcoincore.org"
-DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.20.1/bitcoin-0.20.1.tar.gz"
-MD5SUM="737cae01e759d28ac3ece3a1ad9c69a7"
+DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.21.0/bitcoin-0.21.0.tar.gz"
+MD5SUM="a99c80d18243db0b8089882f9be1302a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf qt5"
diff --git a/network/bluejeans/bluejeans.SlackBuild b/network/bluejeans/bluejeans.SlackBuild
index e47461723f..d322989b32 100644
--- a/network/bluejeans/bluejeans.SlackBuild
+++ b/network/bluejeans/bluejeans.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bluejeans
 
-# Copyright 2019, 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
+# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bluejeans
-VERSION=${VERSION:-2.17.0.11}
+VERSION=${VERSION:-2.21.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,7 +66,8 @@ find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 sed -i \
-  's#Categories=AudioVideo;#Categories=Network;AudioVideo;InstantMessaging;#' \
+  's#Categories=AudioVideo;#Categories=Network;#
+   s#^Exec=.*$#Exec=/usr/bin/bluejeans %U#' \
   usr/share/applications/bluejeans-v2.desktop
 
 mkdir -p usr/{bin,doc/$PRGNAM-$VERSION}
diff --git a/network/bluejeans/bluejeans.info b/network/bluejeans/bluejeans.info
index ee8c02cf6b..a348be5d79 100644
--- a/network/bluejeans/bluejeans.info
+++ b/network/bluejeans/bluejeans.info
@@ -1,10 +1,10 @@
 PRGNAM="bluejeans"
-VERSION="2.17.0.11"
+VERSION="2.21.3.2"
 HOMEPAGE="https://www.bluejeans.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop-app/linux/2.17.0/BlueJeans_2.17.0.11.rpm"
-MD5SUM_x86_64="dfee7f16fdd79ef21772f7cd55a693e3"
+DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop-app/linux/2.21.3/BlueJeans_2.21.3.2.rpm"
+MD5SUM_x86_64="c4e7f7931d3e40ccf31a8fd2cd09c631"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
 EMAIL="igor.alexandrov@outlook.com"
diff --git a/network/bombadillo/README b/network/bombadillo/README
new file mode 100644
index 0000000000..0f0da2a237
--- /dev/null
+++ b/network/bombadillo/README
@@ -0,0 +1,21 @@
+Bombadillo is a non-web browser, designed for a growing list of
+protocols operating outside of the web.
+
+Bombadillo is operated from your terminal, allowing you to browse
+content, follow links, and engage in the non-web with ease.
+The main features of Bombadillo are:
+ - Seamless browsing between multiple protocols, including Gopher,
+Gemini, Finger, and your local file system
+ - Additional support for telnet and the web through third-party
+applications - http/https connection support is opt-in, and is
+configurable in a few different ways
+ - Privacy focused - does not store usage or browsing data, will only
+store items you instruct it to (bookmarks, gemini certificates,
+settings and downloaded files)
+ - Does not send/transmit anything to anyone that you do not instruct
+it to
+ - Uses Vi/Vim-inspired keybindings and an easy command system
+ - Navigable history within a session (no storage of session data)
+ - Supports bookmarks
+ - Gemini Protocol support includes secure communication over TLS,
+and uses a TOFU-style certificate system
diff --git a/network/bombadillo/bombadillo.SlackBuild b/network/bombadillo/bombadillo.SlackBuild
new file mode 100644
index 0000000000..dafdbcdadf
--- /dev/null
+++ b/network/bombadillo/bombadillo.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# Slackware build script for bombadillo.
+#
+# Copyright 2021 Ivan Rozhkov, Russian Federation.
+# All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE. 
+
+PRGNAM=bombadillo
+VERSION=${VERSION:-2.3.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+   i?86) ARCH=i586 ;;
+   arm*) ARCH=arm ;;
+      *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM
+
+sed -i '/update-desktop-database/d' Makefile
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make -j1 \
+ DESTDIR=$PKG \
+ PREFIX=/usr \
+ MANDIR=/usr/man \
+  install
+
+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 \
+ DEVELOPING.md \
+ LICENSE \
+ README.md \
+ VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/network/bombadillo/bombadillo.info b/network/bombadillo/bombadillo.info
new file mode 100644
index 0000000000..9d374e9feb
--- /dev/null
+++ b/network/bombadillo/bombadillo.info
@@ -0,0 +1,10 @@
+PRGNAM="bombadillo"
+VERSION="2.3.3"
+HOMEPAGE="https://bombadillo.colorfield.space/"
+DOWNLOAD="https://tildegit.org/sloum/bombadillo/archive/2.3.3.tar.gz"
+MD5SUM="a112fdd9f388c62d9a67e47b9f8108c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Ivan Rozhkov"
+EMAIL="ris@disroot.org"
diff --git a/network/bombadillo/doinst.sh b/network/bombadillo/doinst.sh
new file mode 100644
index 0000000000..b3b5ad2b91
--- /dev/null
+++ b/network/bombadillo/doinst.sh
@@ -0,0 +1,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
\ No newline at end of file
diff --git a/network/bombadillo/slack-desc b/network/bombadillo/slack-desc
new file mode 100644
index 0000000000..12569a03c1
--- /dev/null
+++ b/network/bombadillo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+bombadillo: bombadillo 2.3.3 (bombadillo non-web browser)
+bombadillo:
+bombadillo: bombadillo is a non-web browser for the terminal. It features a
+bombadillo: full terminal user interface, vim-like keybindings, document
+bombadillo: pager, configurable settings, and a robust command selection.
+bombadillo: bombadillo supports the following protocols as first class
+bombadillo: citizens: gopher, gemini, finger, and local (a user's file
+bombadillo: system). Support for telnet, http and https is also available via
+bombadillo: integration with third party applications.
+bombadillo:
+bombadillo: http://bombadillo.colorfield.space/
diff --git a/network/bottle/README b/network/bottle/README
index f64ed2a768..65cf685e37 100644
--- a/network/bottle/README
+++ b/network/bottle/README
@@ -1,5 +1,3 @@
-bottle is a fast and simple micro-framework for small web applications. It
-offers request dispatching (Routes) with url parameter support, templates,
-a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and
-template engines - all in a single file and with no dependencies other than
-the Python Standard Library.
+bottle is a fast, simple and lightweight WSGI micro web-framework for
+Python.  It is distributed as a single file module and has no
+dependencies other than the Python Standard Library.
diff --git a/network/bottle/bottle.SlackBuild b/network/bottle/bottle.SlackBuild
index aa31d08f9c..1a017dd319 100644
--- a/network/bottle/bottle.SlackBuild
+++ b/network/bottle/bottle.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bottle
 
-# Copyright 2015-2020 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2021 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bottle
-VERSION=${VERSION:-0.12.18}
+VERSION=${VERSION:-0.12.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
 # Install documentation.
 mkdir -p $PRGDOC
-cp -a README.rst PKG-INFO $PRGDOC/
+cp -a AUTHORS README.rst LICENSE $PRGDOC/
 cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/bottle/bottle.info b/network/bottle/bottle.info
index a79ce8245d..4c38928e34 100644
--- a/network/bottle/bottle.info
+++ b/network/bottle/bottle.info
@@ -1,8 +1,8 @@
 PRGNAM="bottle"
-VERSION="0.12.18"
+VERSION="0.12.19"
 HOMEPAGE="https://bottlepy.org/docs/dev/"
-DOWNLOAD="https://files.pythonhosted.org/packages/d9/4f/57887a07944140dae0d039d8bc270c249fc7fc4a00744effd73ae2cde0a9/bottle-0.12.18.tar.gz"
-MD5SUM="a00b7e9a1ab3be7c19c1235fea2ccb40"
+DOWNLOAD="https://github.com/bottlepy/bottle/archive/0.12.19/bottle-0.12.19.tar.gz"
+MD5SUM="3c07bf37fdd43ab6fa3567b189b59ce7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild
index 1fba0eea92..8e30554400 100644
--- a/network/bozohttpd/bozohttpd.SlackBuild
+++ b/network/bozohttpd/bozohttpd.SlackBuild
@@ -24,6 +24,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>.
 
+# 20201102 bkw: Update for v20201014.
 # 20191201 bkw: Update for v20190228.
 
 # 20181203 bkw:
@@ -46,7 +47,7 @@
 # - Simplify script a bit.
 
 PRGNAM=bozohttpd
-VERSION=${VERSION:-20190228}
+VERSION=${VERSION:-20201014}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/bozohttpd/bozohttpd.info b/network/bozohttpd/bozohttpd.info
index 7897ab0ce5..5546582853 100644
--- a/network/bozohttpd/bozohttpd.info
+++ b/network/bozohttpd/bozohttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="bozohttpd"
-VERSION="20190228"
+VERSION="20201014"
 HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
-DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20190228.tar.bz2"
-MD5SUM="2a6bc4bf44cfc8e31559c29ce993e0b3"
+DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20201014.tar.bz2"
+MD5SUM="c93b63381e3a291d3be2c691396f8293"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bozohttpd/defines.default b/network/bozohttpd/defines.default
index ef1e392ea2..6f2a8e4a72 100644
--- a/network/bozohttpd/defines.default
+++ b/network/bozohttpd/defines.default
@@ -33,3 +33,6 @@
 
 # SSL support (-z, -Z options). Uncomment to disable:
 # -DNO_SSL_SUPPORT
+
+# blocklist(8) support. This is BSD-specific (for now?), DON'T comment out:
+-DNO_BLOCKLIST_SUPPORT
diff --git a/network/brave-browser/brave-browser.SlackBuild b/network/brave-browser/brave-browser.SlackBuild
index 763dd31ddd..0a6ef9d8be 100644
--- a/network/brave-browser/brave-browser.SlackBuild
+++ b/network/brave-browser/brave-browser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for brave-browser
 
-# Copyright 2019-2020 Andrew Payne <phalange@komputermatrix.com>
+# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=brave-browser
-VERSION=${VERSION:-1.15.75}
+VERSION=${VERSION:-1.23.71}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/brave-browser/brave-browser.info b/network/brave-browser/brave-browser.info
index 82295c650a..9e010bca35 100644
--- a/network/brave-browser/brave-browser.info
+++ b/network/brave-browser/brave-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="brave-browser"
-VERSION="1.15.75"
+VERSION="1.23.71"
 HOMEPAGE="https://brave.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.15.75/brave-browser-1.15.75-1.x86_64.rpm"
-MD5SUM_x86_64="b4a177ebe7bbc025a69f9eeddcc4d53b"
-REQUIRES=""
+DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.23.71/brave-browser-1.23.71-1.x86_64.rpm"
+MD5SUM_x86_64="af87c4368633ba97a73d13cbfec95d40"
+REQUIRES="libxkbcommon"
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild
index c4b3026d8c..e1258bdbad 100644
--- a/network/broadcom-sta/broadcom-sta.SlackBuild
+++ b/network/broadcom-sta/broadcom-sta.SlackBuild
@@ -87,6 +87,7 @@ patch -p2 < $CWD/patches/20-linux414.patch
 patch -p2 < $CWD/patches/21-linux415.patch
 patch -p2 < $CWD/patches/22-linux56.patch
 patch -p1 < $CWD/patches/009-fix_mac_profile_discrepancy.patch
+patch -p2 < $CWD/patches/23-get-rid-of-get_fs-set_fs-calls.patch
 
 # See https://lkml.org/lkml/2019/3/1/643
 sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c
diff --git a/network/broadcom-sta/broadcom-sta.info b/network/broadcom-sta/broadcom-sta.info
index 4d85e3f60e..bb46a80e45 100644
--- a/network/broadcom-sta/broadcom-sta.info
+++ b/network/broadcom-sta/broadcom-sta.info
@@ -10,5 +10,5 @@ DOWNLOAD_x86_64="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/REA
 MD5SUM_x86_64="e3dab6d9dea12b6487ccf24d012e0350 \
                115903050c41d466161784d4c843f4f9"
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/network/broadcom-sta/patches/23-get-rid-of-get_fs-set_fs-calls.patch b/network/broadcom-sta/patches/23-get-rid-of-get_fs-set_fs-calls.patch
new file mode 100644
index 0000000000..b7ba8cdbf5
--- /dev/null
+++ b/network/broadcom-sta/patches/23-get-rid-of-get_fs-set_fs-calls.patch
@@ -0,0 +1,207 @@
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sun, 13 Sep 2020 07:33:32 +0200
+Subject: Get rid of get_fs/set_fs calls in Broadcom WL driver.
+Origin: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
+
+Fixes linux-next where get_fs/set_fs is already removed for some architectures.
+
+NB: Some checks in wlc_ioctl_internal are likely superfluous,
+    but I'm not familiar enough with the driver to remove them with confidence.
+
+See also: https://lwn.net/Articles/722267/
+          https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/arch/x86/include/asm/uaccess.h?h=next-20200911&id=47058bb54b57962b3958a936ddbc59355e4c5504
+          https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/include/linux/uaccess.h?h=next-20200911&id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5
+
+Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
+---
+ amd64/src/wl/sys/wl_cfg80211_hybrid.c | 29 ++-----------------------
+ amd64/src/wl/sys/wl_iw.c              | 25 ++--------------------
+ amd64/src/wl/sys/wl_linux.c           | 40 ++++++++++++++++++++++++++++++-----
+ amd64/src/wl/sys/wl_linux.h           |  2 ++
+ amd64/src/wl/sys/wlc_pub.h            |  1 +
+ 5 files changed, 42 insertions(+), 55 deletions(-)
+
+diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
+index 8e01841..111ec5a 100644
+--- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -41,6 +41,7 @@
+ #include <wlioctl.h>
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
++#include <wl_linux.h>
+ 
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+@@ -442,30 +443,8 @@
+ static s32
+ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ {
+-	struct ifreq ifr;
+-	struct wl_ioctl ioc;
+-	mm_segment_t fs;
+-	s32 err = 0;
+-
+ 	BUG_ON(len < sizeof(int));
+-
+-	memset(&ioc, 0, sizeof(ioc));
+-	ioc.cmd = cmd;
+-	ioc.buf = arg;
+-	ioc.len = len;
+-	strcpy(ifr.ifr_name, dev->name);
+-	ifr.ifr_data = (caddr_t)&ioc;
+-
+-	fs = get_fs();
+-	set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+-	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+-	err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+-	set_fs(fs);
+-
+-	return err;
++	return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+ 
+ static s32
+diff --git a/amd64/src/wl/sys/wl_iw.c b/amd64/src/wl/sys/wl_iw.c
+index c4c610b..e346b15 100644
+--- a/amd64/src/wl/sys/wl_iw.c
++++ b/amd64/src/wl/sys/wl_iw.c
+@@ -37,6 +37,7 @@ typedef const struct si_pub	si_t;
+ 
+ #include <wl_dbg.h>
+ #include <wl_iw.h>
++#include <wl_linux.h>
+ 
+ extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
+ 	uint32 reason, char* stringBuf, uint buflen);
+@@ -103,29 +104,7 @@ dev_wlc_ioctl(
+ 	int len
+ )
+ {
+-	struct ifreq ifr;
+-	wl_ioctl_t ioc;
+-	mm_segment_t fs;
+-	int ret;
+-
+-	memset(&ioc, 0, sizeof(ioc));
+-	ioc.cmd = cmd;
+-	ioc.buf = arg;
+-	ioc.len = len;
+-
+-	strcpy(ifr.ifr_name, dev->name);
+-	ifr.ifr_data = (caddr_t) &ioc;
+-
+-	fs = get_fs();
+-	set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+-	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+-	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+-	set_fs(fs);
+-
+-	return ret;
++	return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+ 
+ static int
+diff --git a/amd64/src/wl/sys/wl_linux.c b/amd64/src/wl/sys/wl_linux.c
+index 66069d4..cc01d2b 100644
+--- a/amd64/src/wl/sys/wl_linux.c
++++ b/amd64/src/wl/sys/wl_linux.c
+@@ -1661,10 +1661,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ 		goto done2;
+ 	}
+ 
+-	if (segment_eq(get_fs(), KERNEL_DS))
+-		buf = ioc.buf;
+-
+-	else if (ioc.buf) {
++	if (ioc.buf) {
+ 		if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
+ 			bcmerror = BCME_NORESOURCE;
+ 			goto done2;
+@@ -1681,7 +1678,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ 	WL_UNLOCK(wl);
+ 
+ done1:
+-	if (ioc.buf && (ioc.buf != buf)) {
++	if (ioc.buf) {
+ 		if (copy_to_user(ioc.buf, buf, ioc.len))
+ 			bcmerror = BCME_BADADDR;
+ 		MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
+@@ -1694,6 +1691,39 @@ done2:
+ 	return (OSL_ERROR(bcmerror));
+ }
+ 
++int
++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
++{
++	wl_info_t *wl;
++	wl_if_t *wlif;
++	int bcmerror;
++
++	if (!dev)
++		return -ENETDOWN;
++
++	wl = WL_INFO(dev);
++	wlif = WL_DEV_IF(dev);
++	if (wlif == NULL || wl == NULL || wl->dev == NULL)
++		return -ENETDOWN;
++
++	bcmerror = 0;
++
++	WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
++
++	WL_LOCK(wl);
++	if (!capable(CAP_NET_ADMIN)) {
++		bcmerror = BCME_EPERM;
++	} else {
++		bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
++	}
++	WL_UNLOCK(wl);
++
++	ASSERT(VALID_BCMERROR(bcmerror));
++	if (bcmerror != 0)
++		wl->pub->bcmerror = bcmerror;
++	return (OSL_ERROR(bcmerror));
++}
++
+ static struct net_device_stats*
+ wl_get_stats(struct net_device *dev)
+ {
+diff --git a/amd64/src/wl/sys/wl_linux.h b/amd64/src/wl/sys/wl_linux.h
+index 5b1048e..c8c1f41 100644
+--- a/amd64/src/wl/sys/wl_linux.h
++++ b/amd64/src/wl/sys/wl_linux.h
+@@ -22,6 +22,7 @@
+ #define _wl_linux_h_
+ 
+ #include <wlc_types.h>
++#include <wlc_pub.h>
+ 
+ typedef struct wl_timer {
+ 	struct timer_list 	timer;
+@@ -187,6 +188,7 @@ extern irqreturn_t wl_isr(int irq, void *dev_id, struct pt_regs *ptregs);
+ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+ extern void wl_free(wl_info_t *wl);
+ extern int  wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+ 
+ #endif 
+diff --git a/amd64/src/wl/sys/wlc_pub.h b/amd64/src/wl/sys/wlc_pub.h
+index 53a98b8..2b5a029 100644
+--- a/amd64/src/wl/sys/wlc_pub.h
++++ b/amd64/src/wl/sys/wlc_pub.h
+@@ -24,6 +24,7 @@
+ 
+ #include <wlc_types.h>
+ #include <wlc_utils.h>
++#include <siutils.h>
+ #include "proto/802.11.h"
+ #include "proto/bcmevent.h"
+ 
diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild
index e9eb39918c..15da628506 100644
--- a/network/bwm-ng/bwm-ng.SlackBuild
+++ b/network/bwm-ng/bwm-ng.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for bwm-ng
 
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
-# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bwm-ng
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/bwm-ng/bwm-ng.info b/network/bwm-ng/bwm-ng.info
index 404db9af38..358c1d48da 100644
--- a/network/bwm-ng/bwm-ng.info
+++ b/network/bwm-ng/bwm-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="bwm-ng"
-VERSION="0.6.2"
+VERSION="0.6.3"
 HOMEPAGE="https://github.com/vgropp/bwm-ng"
-DOWNLOAD="https://github.com/vgropp/bwm-ng/archive/v0.6.2/bwm-ng-0.6.2.tar.gz"
-MD5SUM="1973976d7c8e8eea6f0545576a9159e8"
+DOWNLOAD="https://github.com/vgropp/bwm-ng/archive/v0.6.3/bwm-ng-0.6.3.tar.gz"
+MD5SUM="eb343c2b806c5e9a40611fc39e907a3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/c-toxcore/c-toxcore.SlackBuild b/network/c-toxcore/c-toxcore.SlackBuild
index 566512987b..4a4e742069 100644
--- a/network/c-toxcore/c-toxcore.SlackBuild
+++ b/network/c-toxcore/c-toxcore.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for c-toxcore
 
-# Copyright 2015, 2016, 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=c-toxcore
-VERSION=${VERSION:-0.2.10}
+VERSION=${VERSION:-0.2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/c-toxcore/c-toxcore.info b/network/c-toxcore/c-toxcore.info
index 9e0d8a9027..6344310375 100644
--- a/network/c-toxcore/c-toxcore.info
+++ b/network/c-toxcore/c-toxcore.info
@@ -1,8 +1,8 @@
 PRGNAM="c-toxcore"
-VERSION="0.2.10"
+VERSION="0.2.12"
 HOMEPAGE="https://github.com/TokTok/c-toxcore"
-DOWNLOAD="https://github.com/TokTok/c-toxcore/archive/v0.2.10/c-toxcore-0.2.10.tar.gz"
-MD5SUM="862307b485238f0a33b9dd0b92e6a68c"
+DOWNLOAD="https://github.com/TokTok/c-toxcore/archive/v0.2.12/c-toxcore-0.2.12.tar.gz"
+MD5SUM="16033d63c6520cd023acddaabe84fb95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% libsodium opus"
diff --git a/network/connman/connman.info b/network/connman/connman.info
index ae7d3d5b18..035424a3b3 100644
--- a/network/connman/connman.info
+++ b/network/connman/connman.info
@@ -6,5 +6,5 @@ MD5SUM="d0c3071c1d8dec9cd17b760f862de2ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="<nobody@nowhere>"
diff --git a/network/coturn/README b/network/coturn/README
index 8f61c3a219..b9e0253193 100644
--- a/network/coturn/README
+++ b/network/coturn/README
@@ -3,3 +3,14 @@ coturn (Free open source implementation of TURN and STUN Server)
 The TURN Server is a VoIP media traffic NAT traversal server
 and gateway. It can be used as a general-purpose network
 traffic TURN server and gateway, too.
+
+You need the 'turnserver' group and user to run this script,
+for example:
+
+  groupadd -g 366 turnserver
+  useradd -u 366 -g turnserver -d /var/lib/turn -s /bin/bash turnserver
+
+If you wish another group and username, you can set TURN_GROUP and
+TURN_USER, for example:
+
+  TURN_GROUP=mygroup TURN_USER=myuser ./coturn.SlackBuild
diff --git a/network/coturn/coturn.SlackBuild b/network/coturn/coturn.SlackBuild
index a89ab20ea1..5998ee5fc2 100644
--- a/network/coturn/coturn.SlackBuild
+++ b/network/coturn/coturn.SlackBuild
@@ -26,7 +26,7 @@
 # Modified by slackbuilds.org 2020-04-17 16:08:20 +0100
 
 PRGNAM=coturn
-VERSION=${VERSION:-4.5.1.2}
+VERSION=${VERSION:-4.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/coturn/coturn.info b/network/coturn/coturn.info
index 89a40151e6..28ecb38663 100644
--- a/network/coturn/coturn.info
+++ b/network/coturn/coturn.info
@@ -1,8 +1,8 @@
 PRGNAM="coturn"
-VERSION="4.5.1.2"
+VERSION="4.5.2"
 HOMEPAGE="https://github.com/coturn/coturn"
-DOWNLOAD="https://github.com/coturn/coturn/archive/4.5.1.2/coturn-4.5.1.2.tar.gz"
-MD5SUM="96e50a0a34eebd8dd42663e73c484c00"
+DOWNLOAD="https://github.com/coturn/coturn/archive/4.5.2/coturn-4.5.2.tar.gz"
+MD5SUM="e58d9e14e0607f763945ff98585cb218"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/courier-unicode/courier-unicode.SlackBuild b/network/courier-unicode/courier-unicode.SlackBuild
index 4137328358..f4bcf685f8 100644
--- a/network/courier-unicode/courier-unicode.SlackBuild
+++ b/network/courier-unicode/courier-unicode.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for courier unicode
 #
 # Copyright 2015 - 2019 Derek Noonburg (derekn@foolabs.com)
-# Copyright 2019 Andrew Strong, Blue Mountains, Australia.
+# Copyright 2019 - 2021 Andrew Strong, Blue Mountains, Australia.
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -25,13 +25,13 @@
 # ----------------------------------------------------------------------
 
 PRGNAM=courier-unicode
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +42,8 @@ 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"
@@ -79,11 +79,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 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
 
@@ -91,7 +95,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 INSTALL COPYING AUTHORS README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/courier-unicode/courier-unicode.info b/network/courier-unicode/courier-unicode.info
index 1840918e89..79b4f414de 100644
--- a/network/courier-unicode/courier-unicode.info
+++ b/network/courier-unicode/courier-unicode.info
@@ -1,8 +1,8 @@
 PRGNAM="courier-unicode"
-VERSION="2.1"
+VERSION="2.1.2"
 HOMEPAGE="http://www.courier-mta.org/unicode/"
-DOWNLOAD="https://download.sourceforge.net/courier/courier-unicode-2.1.tar.bz2"
-MD5SUM="e2b4e8f16c51b2bc03ab16a5ff49832b"
+DOWNLOAD="https://download.sourceforge.net/courier/courier-unicode-2.1.2.tar.bz2"
+MD5SUM="f35eb33593aa81a8a15c7d40cf5fb9b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/cyrus-imapd/README b/network/cyrus-imapd/README
index fbb307120b..e3eb218a72 100644
--- a/network/cyrus-imapd/README
+++ b/network/cyrus-imapd/README
@@ -1,15 +1,16 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol.
-The Cyrus IMAP server is a scalable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers. It differs from other IMAP
-server implementations in that it is run on "sealed" servers, where users
-are not normally permitted to log in. The mailbox database is stored in parts
-of the filesystem that are private to the Cyrus IMAP system. All user access
-to mail is through software using the IMAP, POP3, or KPOP protocols.
+The Cyrus IMAP (Internet Message Access Protocol) server provides access
+to personal mail and system-wide bulletin boards through the IMAP
+protocol.  The Cyrus IMAP server is a scalable enterprise mail system
+designed for use from small to large enterprise environments using
+standards-based technologies.
+
+A full Cyrus IMAP implementation allows a seamless mail and bulletin
+board environment to be set up across multiple servers. It differs from
+other IMAP server implementations in that it is run on "sealed" servers,
+where users are not normally permitted to log in. The mailbox database
+is stored in parts of the filesystem that are private to the Cyrus IMAP
+system. All user access to mail is through software using the IMAP,
+POP3, or KPOP protocols.
 
 The private mailbox database design gives the server large advantages in
 efficiency, scalability, and administratability. Multiple concurrent
@@ -18,15 +19,16 @@ supports access control lists on mailboxes and storage quotas on mailbox
 hierarchies.
 
 Cyrus is a highly scalable enterprise mail system designed for use in
-enterprise environments of various sizes using standards based technologies.
-Cyrus technologies scale from independent use in email departments to a system
-centrally managed in a large enterprise.
+enterprise environments of various sizes using standards based
+technologies.  Cyrus technologies scale from independent use in email
+departments to a system centrally managed in a large enterprise.
 
 For more information on how to install and run cyrus-imapd, see
-README.SLACKWARE that came with this package (which is also installed 
+README.SLACKWARE that came with this package (which is also installed
 with the documentation).
 
-Patches for autocreate and autosieve are no longer needed so they were removed.
+Patches for autocreate and autosieve are no longer needed so they were
+removed.
 
 Make sure to read the Upgrading to Cyrus IMAP 2.5.0 notes:
   https://cyrusimap.org/imap/release-notes/2.5/x/2.5.0.html
@@ -36,4 +38,3 @@ Something like this will create them:
   # groupadd -g 238 cyrus
   # useradd -d /var/imap -s /bin/sh -u 238 -g 238 cyrus
 See http://slackbuilds.org/uid_gid.txt for uid/gid suggestions.
-
diff --git a/network/cyrus-imapd/cyrus-imapd.SlackBuild b/network/cyrus-imapd/cyrus-imapd.SlackBuild
index 48e2c54e55..7a8a13e7ba 100644
--- a/network/cyrus-imapd/cyrus-imapd.SlackBuild
+++ b/network/cyrus-imapd/cyrus-imapd.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cyrus-imapd
-VERSION=${VERSION:-2.5.11}
+VERSION=${VERSION:-3.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ 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"
@@ -124,7 +124,8 @@ rm -rf $PKG/usr/share
 install -D -m0755 -oroot -groot $CWD/rc.cyrus-imapd $PKG/etc/rc.d/rc.cyrus-imapd.new
 
 # Install sample configuration
-install -D -m0640 -ocyrus -gcyrus master/conf/normal.conf $PKG/etc/cyrus.conf.new
+install -D -m0640 -ocyrus -gcyrus doc/examples/cyrus_conf/normal.conf \
+  $PKG/etc/cyrus.conf.new
 install -D -m0640 -ocyrus -gcyrus $CWD/imapd.conf $PKG/etc/imapd.conf.new
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -139,7 +140,9 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README doc/* master/conf tools/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING README.md doc/* tools/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
diff --git a/network/cyrus-imapd/cyrus-imapd.info b/network/cyrus-imapd/cyrus-imapd.info
index 99b2c68075..1443c6b041 100644
--- a/network/cyrus-imapd/cyrus-imapd.info
+++ b/network/cyrus-imapd/cyrus-imapd.info
@@ -1,10 +1,10 @@
 PRGNAM="cyrus-imapd"
-VERSION="2.5.11"
+VERSION="3.2.4"
 HOMEPAGE="https://www.cyrusimap.org/"
-DOWNLOAD="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.11.tar.gz"
-MD5SUM="674083444c36a786d9431b6612969224"
+DOWNLOAD="https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.2.4/cyrus-imapd-3.2.4.tar.gz"
+MD5SUM="e4a745ce615d6712e1b65bb13903807f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="jansson"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/darkhttpd/darkhttpd.SlackBuild b/network/darkhttpd/darkhttpd.SlackBuild
index dd8716e14f..5e62b79500 100644
--- a/network/darkhttpd/darkhttpd.SlackBuild
+++ b/network/darkhttpd/darkhttpd.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=darkhttpd
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,7 +80,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Install license (from Arch Linux' PKGBUILD)
diff --git a/network/darkhttpd/darkhttpd.info b/network/darkhttpd/darkhttpd.info
index 40bb58a94f..bd984ea34c 100644
--- a/network/darkhttpd/darkhttpd.info
+++ b/network/darkhttpd/darkhttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="darkhttpd"
-VERSION="1.12"
+VERSION="1.13"
 HOMEPAGE="https://unix4lyfe.org/darkhttpd/"
-DOWNLOAD="https://unix4lyfe.org/darkhttpd/darkhttpd-1.12.tar.bz2"
-MD5SUM="d0d483a92f7af8f1c667d9e23e754280"
+DOWNLOAD="https://github.com/emikulic/darkhttpd/archive/v1.13/darkhttpd-1.13.tar.gz"
+MD5SUM="365fea0d3eac7d51094dfed746ed8ed8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/davmail/davmail.SlackBuild b/network/davmail/davmail.SlackBuild
index 8166e5c38d..1d4deb3c53 100644
--- a/network/davmail/davmail.SlackBuild
+++ b/network/davmail/davmail.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for DavMail
 
-# Copyright (c) 2015-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright (c) 2015-2022 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 # Updated by Alfredo Tomasini <alto.tom@gmail.com> to support .zip releases
 
 PRGNAM=davmail
-VERSION=${VERSION:-4.9.0}
+VERSION=${VERSION:-5.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
diff --git a/network/davmail/davmail.info b/network/davmail/davmail.info
index 5961fd4929..e21dc8593a 100644
--- a/network/davmail/davmail.info
+++ b/network/davmail/davmail.info
@@ -1,8 +1,8 @@
 PRGNAM="davmail"
-VERSION="4.9.0"
+VERSION="5.5.1"
 HOMEPAGE="http://davmail.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/4.9.0/davmail-4.9.0-2652.zip"
-MD5SUM="0d907e0dac83cfe834d2260f6624a2f2"
+DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/5.5.1/davmail-5.5.1-3299.zip"
+MD5SUM="ae194c3571e107081164913a001d6f27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/network/davmail/davmail.sh b/network/davmail/davmail.sh
index 117fb8188a..4a2f245f6f 100644
--- a/network/davmail/davmail.sh
+++ b/network/davmail/davmail.sh
@@ -1,4 +1,15 @@
 #!/bin/sh
+
 BASE=/usr/share/davmail
-for i in $BASE/lib/*; do export CLASSPATH=$CLASSPATH:$i; done
-exec java -Xmx512M -Dsun.net.inetaddr.ttl=60 -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1
+
+if [ -n "$JAVA_HOME" ]; then
+  JAVA_CMD="$JAVA_HOME/bin/java"
+else
+  JAVA_CMD="$(which java)"
+fi
+
+for i in $BASE/lib/*; do
+  export CLASSPATH=$CLASSPATH:$i;
+done
+
+exec $JAVA_CMD -Xmx512M -Dsun.net.inetaddr.ttl=60 -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1
diff --git a/network/ddclient/ddclient.SlackBuild b/network/ddclient/ddclient.SlackBuild
index 5847c0f6ab..ac6d3a1692 100644
--- a/network/ddclient/ddclient.SlackBuild
+++ b/network/ddclient/ddclient.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=ddclient
 VERSION=${VERSION:-3.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch	# it's only a perl script
diff --git a/network/ddclient/rc.ddclient b/network/ddclient/rc.ddclient
index 1601cc6b5a..daac891d53 100644
--- a/network/ddclient/rc.ddclient
+++ b/network/ddclient/rc.ddclient
@@ -21,8 +21,8 @@ case "$1" in
 	echo
 	;;
   restart)
-	$0 stop
-	$0 start
+	sh $0 stop
+	sh $0 start
 	;;
   status)
 	pids=$(pgrep ddclient)
diff --git a/network/discord/discord.SlackBuild b/network/discord/discord.SlackBuild
index 9053985b69..4796f2f539 100644
--- a/network/discord/discord.SlackBuild
+++ b/network/discord/discord.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for discord
 #
-# Copyright 2016-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2016-2021  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=discord
-VERSION=${VERSION:-0.0.12}
+VERSION=${VERSION:-0.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/discord/discord.info b/network/discord/discord.info
index 89e6684cf9..1dbd59a296 100644
--- a/network/discord/discord.info
+++ b/network/discord/discord.info
@@ -1,10 +1,10 @@
 PRGNAM="discord"
-VERSION="0.0.12"
+VERSION="0.0.14"
 HOMEPAGE="https://discordapp.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.12/discord-0.0.12.deb"
-MD5SUM_x86_64="171c95cfa94e261704f95770177adf7f"
+DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.14/discord-0.0.14.deb"
+MD5SUM_x86_64="e1122775041faf5a06b75ee0ccc40ae2"
 REQUIRES="libc++"
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/network/dissenter-browser/README b/network/dissenter-browser/README
deleted file mode 100644
index e475ecd0fc..0000000000
--- a/network/dissenter-browser/README
+++ /dev/null
@@ -1,9 +0,0 @@
-The free speech web browser.
-
-Browse faster by blocking ads and trackers that violate your privacy
-and cost you time and money.
-
-Dissenter is 64-bit software.
-
-This SlackBuild does not build Dissenter from source, it simply repackages
-the binary.
diff --git a/network/dissenter-browser/dissenter-browser.info b/network/dissenter-browser/dissenter-browser.info
deleted file mode 100644
index d5ed39bc37..0000000000
--- a/network/dissenter-browser/dissenter-browser.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dissenter-browser"
-VERSION="1.5.114"
-HOMEPAGE="https://dissenter.com"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/gab-ai-inc/defiant-browser/releases/download/v1.5.114/dissenter-browser-1.5.114-1.x86_64.rpm"
-MD5SUM_x86_64="1e79f69736bc849a08d3f4399c49aca1"
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/network/dissenter-browser/doinst.sh b/network/dissenter-browser/doinst.sh
deleted file mode 100644
index f1e78d65ce..0000000000
--- a/network/dissenter-browser/doinst.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-          /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-    /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/network/dokuwiki/README b/network/dokuwiki/README
index 135a3e9234..08789293b8 100644
--- a/network/dokuwiki/README
+++ b/network/dokuwiki/README
@@ -9,3 +9,6 @@ cases beyond a traditional wiki.
 
 If your default directory is not /var/www/htdocs please
 edit to your default directory.
+
+TEST Dokuwiki, Run in your favorite browser:
+http://127.0.0.1/dokuwiki/
diff --git a/network/dokuwiki/doinst.sh b/network/dokuwiki/doinst.sh
index 14d06020bc..57a1536f08 100644
--- a/network/dokuwiki/doinst.sh
+++ b/network/dokuwiki/doinst.sh
@@ -1,5 +1,7 @@
+# Remove comment
 sed -i "s:#Include /etc/httpd/mod_php.conf:Include /etc/httpd/mod_php.conf:g" etc/httpd/httpd.conf
+
+# If not exist line, send...
 grep -q -e 'Dokuwiki' etc/httpd/httpd.conf || cat >> etc/httpd/httpd.conf <<'EOF'
-# Dokuwiki
 Include /etc/httpd/extra/httpd-dokuwiki.conf
 EOF
diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild
index 2ea3576282..9f7823b228 100644
--- a/network/dokuwiki/dokuwiki.SlackBuild
+++ b/network/dokuwiki/dokuwiki.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for dokuwiki
 #
 # Copyright 2016-2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
-# Copyright 2019-2020 Jefferson Rocha <root@slackjeff.com.br>, Curitiba, Brazil
+# Copyright 2019-2021 Jefferson Rocha <root@slackjeff.com.br>, Curitiba, Brazil
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -50,6 +50,7 @@ mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/htdocs/$PRGNAM/
 chown -R apache:apache $PKG/var/www/htdocs/$PRGNAM/
 mkdir -p $PKG/etc/httpd/extra
 
+# Create in extra dokuwiki.conf
 cat > $PKG/etc/httpd/extra/httpd-dokuwiki.conf <<'EOF'
 Alias /dokuwiki /var/www/htdocs/dokuwiki
 <Directory /var/www/htdocs/dokuwiki/>
diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild
index 070470e519..309fcbb935 100644
--- a/network/dropbear/dropbear.SlackBuild
+++ b/network/dropbear/dropbear.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dropbear
-VERSION=${VERSION:-2020.80}
+VERSION=${VERSION:-2020.81}
 SRCVERSION="DROPBEAR_$VERSION"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/dropbear/dropbear.info b/network/dropbear/dropbear.info
index 3742e73f5d..95c96f952b 100644
--- a/network/dropbear/dropbear.info
+++ b/network/dropbear/dropbear.info
@@ -1,8 +1,8 @@
 PRGNAM="dropbear"
-VERSION="2020.80"
+VERSION="2020.81"
 HOMEPAGE="https://github.com/mkj/dropbear"
-DOWNLOAD="https://github.com/mkj/dropbear/archive/DROPBEAR_2020.80/dropbear-DROPBEAR_2020.80.tar.gz"
-MD5SUM="877bbd75833c8cdd1d2642fd995c5a9e"
+DOWNLOAD="https://github.com/mkj/dropbear/archive/DROPBEAR_2020.81/dropbear-DROPBEAR_2020.81.tar.gz"
+MD5SUM="31761dde389e765b5f77deda4a0fd027"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild
index d47d49bd49..3451428e14 100644
--- a/network/dropbox/dropbox.SlackBuild
+++ b/network/dropbox/dropbox.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for dropbox
 
 # Copyright 2017 cmyster amit.ugol@gmail.com
-# Copyright 2019-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2019-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@
 # Source for x86_64: https://www.dropbox.com/download?plat=lnx.x86_64
 
 PRGNAM=dropbox
-VERSION=${VERSION:-104.4.175}
+VERSION=${VERSION:-118.4.460}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info
index 008f096e88..84974b4983 100644
--- a/network/dropbox/dropbox.info
+++ b/network/dropbox/dropbox.info
@@ -1,10 +1,10 @@
 PRGNAM="dropbox"
-VERSION="104.4.175"
+VERSION="118.4.460"
 HOMEPAGE="https://www.dropbox.com"
-DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-104.4.175.tar.gz"
-MD5SUM="531ccc2230204278bc48e715e62a7525"
-DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-104.4.175.tar.gz"
-MD5SUM_x86_64="1ae3f2447d0ef991eb08546989c812e2"
+DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-118.4.460.tar.gz"
+MD5SUM="1075e8b7ac5f97e205105eca615ac05f"
+DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-118.4.460.tar.gz"
+MD5SUM_x86_64="e2d2423fe1c52bde5ee85a20930a9dc2"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/efax/README b/network/efax/README
new file mode 100644
index 0000000000..ee8fe6c3ef
--- /dev/null
+++ b/network/efax/README
@@ -0,0 +1,25 @@
+efax is a small ANSI C/POSIX program that sends and receives faxes
+using any fax modem (Class 1, 2 or 2.0).*
+
+efax is smaller and easier to install than HylaFAX or mgetty+sendfax.
+As one user put it "EFAX is a nice simple program for single user systems."
+
+The "fax" command, a shell script, lets you send, receive, view and print faxes.
+In larger systems, faxes can be sent by printing to a "fax" printer and received
+faxes can be e-mailed as MIME attachments to an administrator for distribution.
+efax can also pass incoming data calls to a getty program.
+
+The efax package includes "efix," a program to convert between various image file formats.
+To fax Postscript files you will need Ghostscript.
+To view faxes you can use any program tha displays PGM files.
+efix can also convert received files to Postscript or HP Laserjet formats for printing.
+
+This program has only a command-line interface.
+If you need a GUI-based fax solution, install efax-gtk instead.
+
+*Any hardware-based fax modem, that is.  If you have a "software modem," a so-called "Linmodem,"
+then you'll instead need to download the alpha version of efax and modify this SlackBuild script
+accordingly.
+
+The alpha release can be found here:
+https://www.cce.com/efax/download/efax-0.9a-001114.tar.gz
diff --git a/network/efax/efax.SlackBuild b/network/efax/efax.SlackBuild
new file mode 100644
index 0000000000..3b7fe8a8f2
--- /dev/null
+++ b/network/efax/efax.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# Slackware build script for efax.
+#
+# Copyright 2020 by Jay, Seattle, WA.
+# 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=efax
+SRCNAM=efax-0.9
+VERSION=${VERSION:-0.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+#    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# Caveat emptor
+case "$ARCH" in
+    i?86) ;;
+  x86_64) ;;
+       *) echo -e "\nBuild for $ARCH is untested!!"
+          echo -e "Press Ctrl-C within ten seconds to abort,"
+          echo -e "or press ENTER to continue at your own risk.\n"
+          read -t 10 PLACEHOLDER ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM
+tar xvf $CWD/$SRCNAM.tar.gz
+cd $SRCNAM
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+
+sed -i "11s/CFLAGS=/CFLAGS=$SLKCFLAGS/" Makefile
+sed -i "20i\
+BINDIR=$PKG\/usr\/bin" Makefile
+sed -i "21i\
+MANDIR=$PKG\/usr\/man" Makefile
+
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+make all
+make install
+
+# Compress man pages
+gzip -9 $PKG/usr/man/*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $TMP/$SRCNAM/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $TMP/$SRCNAM/COPYING > $PKG/usr/doc/$PRGNAM-$VERSION/COPYING
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/efax/efax.info b/network/efax/efax.info
new file mode 100644
index 0000000000..2d0c9717bc
--- /dev/null
+++ b/network/efax/efax.info
@@ -0,0 +1,10 @@
+PRGNAM="efax"
+VERSION="0.9"
+HOMEPAGE="https://www.cce.com/efax/"
+DOWNLOAD="ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/efax-0.9.tar.gz"
+MD5SUM="23bd3767f87c455c58ccae7f88bce725"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay"
+EMAIL="ld.jay@protonmail.com"
\ No newline at end of file
diff --git a/network/efax/slack-desc b/network/efax/slack-desc
new file mode 100644
index 0000000000..46f3d01791
--- /dev/null
+++ b/network/efax/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+efax: efax (send/receive fax)
+efax:
+efax: It can be used to send and receive faxes with a fax modem and to
+efax: view, print, and manage faxes received. It can automatically e-mail
+efax: a received fax to a designated user and automatically print a
+efax: received fax.
+efax:
+efax: This is the command-line version.
+efax: For a GUI version, install efax-gtk instead.
+efax:
+efax:
diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild
index e14f23f274..93cee7bfac 100644
--- a/network/elinks/elinks.SlackBuild
+++ b/network/elinks/elinks.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=elinks
 VERSION=${VERSION:-git20131231}
-BUILD=${BUILD:-12}
+BUILD=${BUILD:-13}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,20 +41,20 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-g0 -O0 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-g0 -O0 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-g0 -O0 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-g0 -O0 -fPIC -fno-strict-aliasing -Wno-pointer-sign"
+  SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing -Wno-pointer-sign"
   SLKLDFLAGS="-m64"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-go -O0"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
diff --git a/network/emailrelay/emailrelay.SlackBuild b/network/emailrelay/emailrelay.SlackBuild
index b0cc841be3..5c577864bc 100644
--- a/network/emailrelay/emailrelay.SlackBuild
+++ b/network/emailrelay/emailrelay.SlackBuild
@@ -2,8 +2,7 @@
 
 # Slackware build script for emailrelay
 
-# Copyright 2011,2013 Andrew Clemons, Wellington, New Zealand
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2011,2013,2016-2021 Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=emailrelay
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/emailrelay/emailrelay.info b/network/emailrelay/emailrelay.info
index 5a65182816..597b1b8132 100644
--- a/network/emailrelay/emailrelay.info
+++ b/network/emailrelay/emailrelay.info
@@ -1,8 +1,8 @@
 PRGNAM="emailrelay"
-VERSION="2.0.1"
+VERSION="2.2"
 HOMEPAGE="http://emailrelay.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.0.1/emailrelay-2.0.1-src.tar.gz"
-MD5SUM="eb9d59ad77f3b98184fa4efd76e37c47"
+DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.2/emailrelay-2.2-src.tar.gz"
+MD5SUM="0cc919a5e688244e78ac0dabd11d60b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/emailrelay/slack-desc b/network/emailrelay/slack-desc
index 8f22802191..79b64ebefe 100644
--- a/network/emailrelay/slack-desc
+++ b/network/emailrelay/slack-desc
@@ -16,4 +16,4 @@ emailrelay: through. When running as a store-and-forward MTA incoming messages
 emailrelay: are stored in a local spool directory, and then forwarded to the
 emailrelay: next SMTP server on request.
 emailrelay:
-emailrelay:
+emailrelay: http://emailrelay.sourceforge.net/
diff --git a/network/enet/enet.SlackBuild b/network/enet/enet.SlackBuild
index 2a933a0a9c..fb36c673b5 100644
--- a/network/enet/enet.SlackBuild
+++ b/network/enet/enet.SlackBuild
@@ -2,16 +2,37 @@
 
 # Slackware build script for enet
 
-# Written by otzy_007 (oz@oprod.net)
+# Copyright 2021 S. S. Bolokanar, Bulgaria <sbolokanov@abv.bg>
+#                С. С. Болоканаръ, Българи�
+# 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.
+
+# Originally written by: otzy_007 (oz@oprod.net) 2010
 
 PRGNAM=enet
-VERSION=${VERSION:-1.3.12}
+VERSION=${VERSION:-1.3.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +43,8 @@ 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"
diff --git a/network/enet/enet.info b/network/enet/enet.info
index d6aa8ddcb6..1eba7183ea 100644
--- a/network/enet/enet.info
+++ b/network/enet/enet.info
@@ -1,10 +1,10 @@
 PRGNAM="enet"
-VERSION="1.3.12"
-HOMEPAGE="http://enet.bespin.org/index.html"
-DOWNLOAD="http://enet.bespin.org/download/enet-1.3.12.tar.gz"
-MD5SUM="2b581600a589553c1e7684ad663f27a8"
+VERSION="1.3.17"
+HOMEPAGE="http://enet.bespin.org"
+DOWNLOAD="http://enet.bespin.org/download/enet-1.3.17.tar.gz"
+MD5SUM="c8e96051c5a60afa9f3052d02b2cbe19"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="otzy_007"
-EMAIL="oz@oprod.net"
+MAINTAINER="S. S. Bolokanar"
+EMAIL="sbolokanov@abv.bg"
diff --git a/network/enet/slack-desc b/network/enet/slack-desc
index 8e9c473393..b3adcd3730 100644
--- a/network/enet/slack-desc
+++ b/network/enet/slack-desc
@@ -13,7 +13,7 @@ enet: simple and robust network communication layer on top of UDP
 enet: (User Datagram Protocol). The primary feature it provides
 enet: is optional reliable, in-order delivery of packets.
 enet:
-enet: Homepage: http://enet.bespin.org/index.html
+enet: Homepage: http://enet.bespin.org
 enet:
 enet:
 enet:
diff --git a/network/fdns/README b/network/fdns/README
new file mode 100644
index 0000000000..7fd34b88c5
--- /dev/null
+++ b/network/fdns/README
@@ -0,0 +1,12 @@
+FDNS
+
+FDNS was designed to run as a local DoH proxy on a Linux desktop, 
+or as a server for a small network. Lean and mean, it protects the 
+computers against some of the most common cyber threats, all while 
+improving the privacy and the system performance.
+
+FDNS is written in C and licensed under GPLv3. The number one job 
+is privacy. We use only DoH services from non-logging providers, 
+while preferring small operators such as open-source enthusiasts 
+and privacy-oriented non-profit organizations.
+
diff --git a/development/dwarf/dwarf.SlackBuild b/network/fdns/fdns.SlackBuild
index 97bd5c4aa5..e15d2deab2 100644
--- a/development/dwarf/dwarf.SlackBuild
+++ b/network/fdns/fdns.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for dwarf
+# Slackware build script for fdns
 
-# Copyright 2015-2019 Eugene Wissner Dachau, Germany
+#
+# Copyright 2020 Andreo F. Rissardo <andreotec@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=dwarf
-VERSION=${VERSION:-20190529}
+PRGNAM=fdns
+VERSION=${VERSION:-0.9.62}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,8 +61,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/libdwarf-$VERSION.tar.gz
-cd libdwarf-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,26 +71,24 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="-I/usr/include/libelf $SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-shared \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-cd libdwarf
+sed -i "s|lib/fdns|lib${LIBDIRSUFFIX}/fdns|" Makefile
 make
 make install DESTDIR=$PKG
 
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libdwarf.{a,la}
-
 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
-mv $PKG/usr/share/libdwarf/libdwarf-devel/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share
+cp $TMP/$PRGNAM-$VERSION/{COPYING,README,RELNOTES} $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/fdns/fdns.info b/network/fdns/fdns.info
new file mode 100644
index 0000000000..648a2f4700
--- /dev/null
+++ b/network/fdns/fdns.info
@@ -0,0 +1,10 @@
+PRGNAM="fdns"
+VERSION="0.9.62"
+HOMEPAGE="https://firejaildns.wordpress.com/"
+DOWNLOAD="https://github.com/netblue30/fdns/releases/download/v0.9.62/fdns-0.9.62.tar.xz"
+MD5SUM="54024101181e84174c164853ca086b48"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libseccomp"
+MAINTAINER="Andreo F. Rissardo"
+EMAIL="andreotec@gmail.com"
diff --git a/network/fdns/slack-desc b/network/fdns/slack-desc
new file mode 100644
index 0000000000..8b7421c005
--- /dev/null
+++ b/network/fdns/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+fdns: fdns (Firejail DNS-over-HTTPS Proxy Server)
+fdns:
+fdns: FDNS was designed to run as a local DoH proxy on a Linux desktop,
+fdns: or as a server for a small network. Lean and mean, it protects the
+fdns: computers against some of the most common cyber threats, all while
+fdns: improving the privacy and the system performance. FDNS is written in
+fdns: C and licensed under GPLv3. The number one job is privacy. The number
+fdns: one job is privacy.
+fdns:
+fdns: https://firejaildns.wordpress.com
+fdns:
diff --git a/network/felinks/felinks.SlackBuild b/network/felinks/felinks.SlackBuild
index b503d6ed01..b03f8422b8 100644
--- a/network/felinks/felinks.SlackBuild
+++ b/network/felinks/felinks.SlackBuild
@@ -22,7 +22,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=felinks
-VERSION=${VERSION:-0.13.5}
+VERSION=${VERSION:-08da1d8}
+COMMIT=${COMMIT:-08da1d87eb74e082ca7aae8c81d2518a4415f3a7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,9 +65,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -189,6 +190,9 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Remove any .git remnants
+find $PKG -name ".git*" -exec rm -vrf {} \;
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/network/felinks/felinks.info b/network/felinks/felinks.info
index fd41cb6e6a..4d5bf48d14 100644
--- a/network/felinks/felinks.info
+++ b/network/felinks/felinks.info
@@ -1,8 +1,8 @@
 PRGNAM="felinks"
-VERSION="0.13.5"
+VERSION="08da1d8"
 HOMEPAGE="https://github.com/rkd77/felinks"
-DOWNLOAD="https://github.com/rkd77/felinks/archive/v0.13.5/felinks-0.13.5.tar.gz"
-MD5SUM="ac27ad36cadcd705506290fcb5ab6031"
+DOWNLOAD="https://github.com/rkd77/felinks/archive/08da1d87eb74e082ca7aae8c81d2518a4415f3a7/felinks-08da1d8.tar.gz"
+MD5SUM="bc6b107e131dbfc0d17566b4f3d6429d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ferm/README b/network/ferm/README
index bd52bca78e..33d44d4a48 100644
--- a/network/ferm/README
+++ b/network/ferm/README
@@ -1,4 +1,5 @@
-ferm is a tool to maintain complex firewalls, without having the trouble to
-rewrite the complex rules over and over again.
-ferm allows the entire firewall rule set to be stored in a separate file, and
-to be loaded with one command.
+ferm is a tool to maintain complex firewalls, without having the trouble
+to rewrite the complex rules over and over again.
+
+ferm allows the entire firewall rule set to be stored in a separate
+file, and to be loaded with one command.
diff --git a/network/ferm/README.SLACKWARE b/network/ferm/README.SLACKWARE
new file mode 100644
index 0000000000..611596f48c
--- /dev/null
+++ b/network/ferm/README.SLACKWARE
@@ -0,0 +1,22 @@
+Ferm comes with a systemd unit file that can be used to run ferm on a predefined
+configuration file (/etc/ferm.conf) at boot to automatically setup the firewall.
+
+A simple rc.d script is being provided with this package that mimics what the
+unit file does. If you want to automatically run ferm at boot and stop it at
+shutdown, make sure you create the /etc/ferm.conf file and:
+
+chmod 0755 /etc/rc.d/rc.ferm
+cat >> /etc/rc.d/rc.local <<EOF
+if [ -x /etc/rc.d/rc.ferm ]
+then
+	/etc/rc.d/rc.ferm start
+fi
+
+EOF
+cat >> /etc/rc.d/rc.local_shutdown <<EOF
+if [ -x /etc/rc.d/rc.ferm ]
+then
+	/etc/rc.d/rc.ferm stop
+fi
+
+EOF
diff --git a/network/ferm/doinst.sh b/network/ferm/doinst.sh
new file mode 100644
index 0000000000..fe5a0c79e3
--- /dev/null
+++ b/network/ferm/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.ferm.new
diff --git a/network/ferm/ferm.SlackBuild b/network/ferm/ferm.SlackBuild
index f2d4479129..813ffa4513 100644
--- a/network/ferm/ferm.SlackBuild
+++ b/network/ferm/ferm.SlackBuild
@@ -2,34 +2,29 @@
 
 # Slackware build script for ferm
 
-# Copyright (c) 2011 Alan Alberghini <414N@slacky.it>
+# Copyright (c) 2021 Alan Alberghini <414N@slacky.it>
 # All rights reserved.
 #
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-#   THIS SOFTWARE IS PROVIDED AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS 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.
-# -----------------------------------------------------------------------------
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# Build history:
-#
-# 1 - Initial release.
+#  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=ferm
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,13 +45,18 @@ tar xvf "$CWD/$PRGNAM-$VERSION.tar.xz"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
 make install PREFIX=$PKG/usr MANDIR=$PKG/usr/man/man1 DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
 
+# Remove systemd specifics
+rm -r $PKG/usr/lib/systemd
+
+install -Dm0644 $CWD/rc.ferm $PKG/etc/rc.d/rc.ferm.new
+
 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
 
@@ -64,6 +64,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/network/ferm/ferm.info b/network/ferm/ferm.info
index ae1e0e8c6e..877d205f36 100644
--- a/network/ferm/ferm.info
+++ b/network/ferm/ferm.info
@@ -1,10 +1,10 @@
 PRGNAM="ferm"
-VERSION="2.4.1"
+VERSION="2.5.1"
 HOMEPAGE="http://ferm.foo-projects.org/"
-DOWNLOAD="http://ferm.foo-projects.org/download/2.4/ferm-2.4.1.tar.xz"
-MD5SUM="4d359bc809887bcf401eef7e76012e5c"
+DOWNLOAD="http://ferm.foo-projects.org/download/2.5/ferm-2.5.1.tar.xz"
+MD5SUM="6d14d9e5e672885bc6f2fceafbf2942f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-net-dns"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
diff --git a/network/ferm/rc.ferm b/network/ferm/rc.ferm
new file mode 100644
index 0000000000..838a775ca5
--- /dev/null
+++ b/network/ferm/rc.ferm
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.ferm
+#
+# To make ferm automatically apply rules at boot, make this
+# file executable:  chmod 755 /etc/rc.d/rc.ferm
+
+CONFIG_FILE=/etc/ferm.conf
+RUN_FILE=/var/run/ferm.run
+FERM=/usr/sbin/ferm
+
+set -eE
+
+log_err()
+{
+	>&2 echo "$1" 
+}
+
+check_cfg()
+{
+	if [ ! -e "$CONFIG_FILE" ]
+	then
+		log_err "required config file $CONFIG_FILE missing!"
+		return 1
+	fi
+}
+service_start()
+{
+	if [ ! -e "$RUN_FILE" ]
+	then
+		"$FERM" "$CONFIG_FILE"
+	else
+		log_err "ferm rules seem to have been already been applied ($RUN_FILE present). Aborting"
+		return 1
+	fi
+
+}
+
+service_stop()
+{
+	if [ -e "$RUN_FILE" ]
+	then
+		"$FERM" -F "$CONFIG_FILE"
+	else
+		log_err "Could not find $RUN_FILE to assess if ferm was service_started. Aborting"
+		return 1
+	fi
+}
+
+
+case "$1" in
+	'start')
+		if service_start
+		then
+			touch "$RUN_FILE"
+		else
+			log_err "Error starting service"
+			exit 1
+		fi
+		;;
+	'stop')
+		if service_stop
+		then
+			rm -f "$RUN_FILE"
+		else
+			log_err "Error stopping service"
+			exit 1
+		fi
+		;;
+	'restart')
+		service_stop && service_start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		;;
+esac
+
diff --git a/network/ferm/slack-desc b/network/ferm/slack-desc
index 355186a152..b7c2e0210d 100644
--- a/network/ferm/slack-desc
+++ b/network/ferm/slack-desc
@@ -1,12 +1,12 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-ferm: ferm (for Easy Rule Making)
+ferm: ferm (For Easy Rule Making)
 ferm:
 ferm: ferm is a tool to maintain complex firewalls, without having the
 ferm: trouble to rewrite the complex rules over and over again. ferm allows
diff --git a/network/fping3/README b/network/fping/README
index 8370986017..1fa2dc57cb 100644
--- a/network/fping3/README
+++ b/network/fping/README
@@ -1,4 +1,4 @@
-fping3 (send ICMP ECHO_REQUEST packets to network hosts)
+fping (send ICMP ECHO_REQUEST packets to network hosts)
 
 fping is a program to send ICMP echo probes to network hosts, similar to ping,
 but much better performing when pinging multiple hosts.
diff --git a/network/fping3/fping3.SlackBuild b/network/fping/fping.SlackBuild
index 06fe8076bc..070a4beda9 100644
--- a/network/fping3/fping3.SlackBuild
+++ b/network/fping/fping.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for fping3
+# Slackware build script for fping
 
-# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=fping3
-SRCNAM=fping
-VERSION=${VERSION:-3.13}
+PRGNAM=fping
+VERSION=${VERSION:-5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,8 +60,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -93,7 +92,8 @@ 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 ChangeLog INSTALL README doc/README.1992 $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md COPYING INSTALL README.md doc/README.1992 \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/fping3/fping3.info b/network/fping/fping.info
index 6f597a3c17..883aa40729 100644
--- a/network/fping3/fping3.info
+++ b/network/fping/fping.info
@@ -1,8 +1,8 @@
-PRGNAM="fping3"
-VERSION="3.13"
+PRGNAM="fping"
+VERSION="5.0"
 HOMEPAGE="http://fping.org/"
-DOWNLOAD="http://fping.org/dist/fping-3.13.tar.gz"
-MD5SUM="a39134baca6bc6ced56191cb51fb0dc2"
+DOWNLOAD="http://fping.org/dist/fping-5.0.tar.gz"
+MD5SUM="6af4c39bf012af75f93983d0efa242b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/fping/slack-desc b/network/fping/slack-desc
new file mode 100644
index 0000000000..4fb3962c17
--- /dev/null
+++ b/network/fping/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+fping: fping (send ICMP ECHO_REQUEST packets to network hosts)
+fping:
+fping: fping is a program to send ICMP echo probes to network hosts, similar
+fping: to ping, but much better performing when pinging multiple hosts.
+fping:
+fping: Homepage: http://fping.org/
+fping:
+fping:
+fping:
+fping:
+fping:
diff --git a/network/franz/franz.SlackBuild b/network/franz/franz.SlackBuild
index 4640785dc5..87bd08bc6a 100644
--- a/network/franz/franz.SlackBuild
+++ b/network/franz/franz.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=franz
-VERSION=${VERSION:-5.5.0}
+VERSION=${VERSION:-5.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/franz/franz.info b/network/franz/franz.info
index c8c021b324..584c56006f 100644
--- a/network/franz/franz.info
+++ b/network/franz/franz.info
@@ -1,10 +1,10 @@
 PRGNAM="franz"
-VERSION="5.5.0"
+VERSION="5.6.1"
 HOMEPAGE="https://meetfranz.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/meetfranz/franz/releases/download/v5.5.0/franz_5.5.0_amd64.deb"
-MD5SUM_x86_64="ccc06c72710832fe702b3b8cc0b6874d"
+DOWNLOAD_x86_64="https://github.com/meetfranz/franz/releases/download/v5.6.1/franz_5.6.1_amd64.deb"
+MD5SUM_x86_64="53ce256b971f169f7c593c67ee54ed68"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/freedownloadmanager/README b/network/freedownloadmanager/README
new file mode 100644
index 0000000000..65baf561f3
--- /dev/null
+++ b/network/freedownloadmanager/README
@@ -0,0 +1,4 @@
+It's a cross-platform powerful modern download accelerator and
+organizer for Windows, macOS, Android, and Linux. Compatible with
+the most popular browsers Google Chrome, Mozilla Firefox,
+Microsoft Edge, Internet Explorer and Safari.
diff --git a/network/freedownloadmanager/doinst.sh b/network/freedownloadmanager/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/network/freedownloadmanager/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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/freedownloadmanager/freedownloadmanager.SlackBuild b/network/freedownloadmanager/freedownloadmanager.SlackBuild
new file mode 100644
index 0000000000..fda006fa50
--- /dev/null
+++ b/network/freedownloadmanager/freedownloadmanager.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for freedownloadmanager
+
+# Copyright 2020 Andre Fernando, Indonesia
+# 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=freedownloadmanager
+VERSION=${VERSION:-6.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+cd $PRGNAM
+ar -x $CWD/${PRGNAM}.deb
+tar xvf data.tar.xz -C $PKG
+cd $PKG
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/network/freedownloadmanager/freedownloadmanager.info b/network/freedownloadmanager/freedownloadmanager.info
new file mode 100644
index 0000000000..7ae13cb7bc
--- /dev/null
+++ b/network/freedownloadmanager/freedownloadmanager.info
@@ -0,0 +1,10 @@
+PRGNAM="freedownloadmanager"
+VERSION="6.9"
+HOMEPAGE="https://www.freedownloadmanager.org"
+DOWNLOAD="https://dn3.freedownloadmanager.org/6/latest/freedownloadmanager.deb"
+MD5SUM="8d2696f79480eb70770171921c2c4ab5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andre Fernando"
+EMAIL="ando344@gmail.com"
diff --git a/network/freedownloadmanager/slack-desc b/network/freedownloadmanager/slack-desc
new file mode 100644
index 0000000000..e38cb2fecb
--- /dev/null
+++ b/network/freedownloadmanager/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+freedownloadmanager: Free Download Manager (Powerful Download Accelerator and Organizer)
+freedownloadmanager:
+freedownloadmanager: It's a cross-platform powerful modern download accelerator and
+freedownloadmanager: organizer for Windows, macOS, Android, and Linux. Compatible with
+freedownloadmanager: the most popular browsers Google Chrome, Mozilla Firefox,
+freedownloadmanager: Microsoft Edge, Internet Explorer and Safari.
+freedownloadmanager:
+freedownloadmanager: Homepage: https://www.freedownloadmanager.org
+freedownloadmanager:
+freedownloadmanager:
+freedownloadmanager:
diff --git a/network/fwknop/fwknop.info b/network/fwknop/fwknop.info
index 0446408d1f..e745237ec8 100644
--- a/network/fwknop/fwknop.info
+++ b/network/fwknop/fwknop.info
@@ -6,5 +6,5 @@ MD5SUM="f195bd31e7dc7df2e9b0c35cd80655b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Eric B. Pratt"
-EMAIL="eric.b.pratt@gmail.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/network/gajim/gajim.info b/network/gajim/gajim.info
index 5cbd0123c2..1a8146f1d7 100644
--- a/network/gajim/gajim.info
+++ b/network/gajim/gajim.info
@@ -1,7 +1,7 @@
 PRGNAM="gajim"
 VERSION="0.16.9"
 HOMEPAGE="http://www.gajim.org"
-DOWNLOAD="https://gajim.org/downloads/0.16/gajim-0.16.9.tar.bz2"
+DOWNLOAD="https://gajim.org/downloads/0.x/0.16/gajim-0.16.9.tar.bz2"
 MD5SUM="87684533b7d6a9611fe28a9b7fca296d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/glewlwyd/glewlwyd.SlackBuild b/network/glewlwyd/glewlwyd.SlackBuild
index fe80137039..9977a3c7d0 100644
--- a/network/glewlwyd/glewlwyd.SlackBuild
+++ b/network/glewlwyd/glewlwyd.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glewlwyd
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-2.5.2}
 SRCVER=$(tr _ - <<< ${VERSION})
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/glewlwyd/glewlwyd.info b/network/glewlwyd/glewlwyd.info
index ace8016f5a..06c12b5965 100644
--- a/network/glewlwyd/glewlwyd.info
+++ b/network/glewlwyd/glewlwyd.info
@@ -1,8 +1,8 @@
 PRGNAM="glewlwyd"
-VERSION="2.3.3"
+VERSION="2.5.2"
 HOMEPAGE="https://github.com/babelouest/glewlwyd"
-DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.3.3/glewlwyd-2.3.3.tar.gz"
-MD5SUM="0ecc1349c0a74bca90587578f3b07024"
+DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.5.2/glewlwyd-2.5.2.tar.gz"
+MD5SUM="fa6d6f99894aae2b0e16a36e9322f4a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig oath-toolkit libcbor hoel iddawc"
diff --git a/network/glusterfs/glusterfs.info b/network/glusterfs/glusterfs.info
index cb4905c8b1..ccd7764471 100644
--- a/network/glusterfs/glusterfs.info
+++ b/network/glusterfs/glusterfs.info
@@ -1,7 +1,7 @@
 PRGNAM="glusterfs"
 VERSION="4.1.0"
 HOMEPAGE="https://www.gluster.org/"
-DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/4.1/4.1.0/glusterfs-4.1.0.tar.gz"
+DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/01.old-releases/4.1/4.1.0/glusterfs-4.1.0.tar.gz"
 MD5SUM="2b9cd00fb6a1eff2f84489b7883303b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/gnirehtet-bin/README b/network/gnirehtet-bin/README
new file mode 100644
index 0000000000..5d0faab424
--- /dev/null
+++ b/network/gnirehtet-bin/README
@@ -0,0 +1,44 @@
+gnirehtet is a tool that provides reverse tethering for Android
+
+This is a repackage of the 64 bit binary supplied by upstream,
+the version written in Rust.
+
+gnirehtet requires adb as runtime dependency. adb is part of the
+package android-tools on slackbuilds.org . adb must be in PATH,
+so if it's not installed through the aforementioned package,
+either alter PATH or drop it into the current working directory,
+so gnirehtet finds it.
+
+gnirehtet requires the Android device to be switched to
+Developer Mode and have the following options switched on
+(tested on a Redmi 9C NFC phone):
+
+- USB debugging
+- Install via USB
+- USB debugging (Security settings)
+
+`gnirehtet install` requires gnirehtet.apk in current directory
+(I am not sure about it?)
+gnirehtet.apk is packaged into /usr/share/gnirehtet/. Copy or symlink it
+from there into current directory
+When running `gnirehtet install`, despite having the "Install via USB"
+option enabled, if adb fails, just copy `gnirehtet.apk` to the phone
+and install it directly from the phone
+
+gnirehtet-2.5 has two problems:
+
+1. Sometimes the client (the phone) randomly disconnects. gnirehtet
+prints a log message to stdout, but keeps working. The simplest
+(but sometimes inconvenient) fix is to restart gnirehtet on the
+desktop. This is true for both `gnirehtet run` and `gnirehtet autorun`
+commands. A workaround that automates the restart of gnirehtet in
+such situations is described in comments here:
+
+https://github.com/Genymobile/gnirehtet/issues/352
+
+2. When hitting the square soft key in Android to kill all apps that
+run in background, gnirehtet gets killed too, the phone disconnects
+from the server running the desktop and the problem is reduced to 1.
+the workaround described there fixes 2. as well
+
+This binary was compiled on Aug 16, 2020.
diff --git a/network/gnirehtet-bin/gnirehtet-bin.SlackBuild b/network/gnirehtet-bin/gnirehtet-bin.SlackBuild
new file mode 100644
index 0000000000..d64b778c50
--- /dev/null
+++ b/network/gnirehtet-bin/gnirehtet-bin.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for gnirehtet-bin
+# Copyright 2021 toolonely <lonely_@tutanota.com>
+# 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=gnirehtet-bin
+BINNAM=gnirehtet
+VERSION=${VERSION:-2.5}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $BINNAM-rust-linux64
+unzip $CWD/$BINNAM-rust-linux64-v$VERSION.zip
+cd $BINNAM-rust-linux64
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+install -D -m 0755 $BINNAM $PKG/usr/bin/$BINNAM
+
+install -D -m 0644 $BINNAM.apk $PKG/usr/share/$BINNAM/$BINNAM.apk
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/gnirehtet-bin/gnirehtet-bin.info b/network/gnirehtet-bin/gnirehtet-bin.info
new file mode 100644
index 0000000000..4f36f3d041
--- /dev/null
+++ b/network/gnirehtet-bin/gnirehtet-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="gnirehtet-bin"
+VERSION="2.5"
+HOMEPAGE="https://github.com/Genymobile/gnirehtet"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Genymobile/gnirehtet/releases/download/v2.5/gnirehtet-rust-linux64-v2.5.zip"
+MD5SUM_x86_64="48d29d23691d6a1daebca68573684d4a"
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/network/gnirehtet-bin/slack-desc b/network/gnirehtet-bin/slack-desc
new file mode 100644
index 0000000000..14df637cb7
--- /dev/null
+++ b/network/gnirehtet-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+gnirehtet-bin: gnirehtet-bin (reverse tethering for Android)
+gnirehtet-bin:
+gnirehtet-bin: gnirehtet is a tool that provides reverse tethering for Android
+gnirehtet-bin:
+gnirehtet-bin:
+gnirehtet-bin: This is a repackage of the 64 bit binary supplied by upstream,
+gnirehtet-bin: the version written in Rust.
+gnirehtet-bin:
+gnirehtet-bin: https://github.com/Genymobile/gnirehtet
+gnirehtet-bin:
+gnirehtet-bin:
diff --git a/network/hostapd/README b/network/hostapd/README
index 24cfefe967..258a947ed8 100644
--- a/network/hostapd/README
+++ b/network/hostapd/README
@@ -1,7 +1,7 @@
 hostapd - IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 
-hostapd is a user space daemon for access point and authentication servers.
-It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP
-Authenticators, RADIUS client, EAP server, and RADIUS authentication server.
-The current version supports Linux (Host AP, madwifi, Prism54 drivers) and
-FreeBSD (net80211).
+hostapd is a user space daemon for access point and authentication
+servers.  It implements IEEE 802.11 access point management, IEEE
+802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and
+RADIUS authentication server.  The current version supports Linux (Host
+AP, madwifi, Prism54 drivers) and FreeBSD (net80211).
diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild
index ae7e86ca5c..d9d8e6401a 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -28,7 +28,7 @@
 
 PRGNAM=hostapd
 VERSION=${VERSION:-2.9}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
new file mode 100644
index 0000000000..1942bb3d55
--- /dev/null
+++ b/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
@@ -0,0 +1,50 @@
+From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Tue, 8 Dec 2020 23:52:50 +0200
+Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request
+
+p2p_add_device() may remove the oldest entry if there is no room in the
+peer table for a new peer. This would result in any pointer to that
+removed entry becoming stale. A corner case with an invalid PD Request
+frame could result in such a case ending up using (read+write) freed
+memory. This could only by triggered when the peer table has reached its
+maximum size and the PD Request frame is received from the P2P Device
+Address of the oldest remaining entry and the frame has incorrect P2P
+Device Address in the payload.
+
+Fix this by fetching the dev pointer again after having called
+p2p_add_device() so that the stale pointer cannot be used.
+
+Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request")
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/p2p/p2p_pd.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
+index 3994ec03f86b..05fd593494ef 100644
+--- a/src/p2p/p2p_pd.c
++++ b/src/p2p/p2p_pd.c
+@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,
+ 			goto out;
+ 		}
+ 
++		dev = p2p_get_device(p2p, sa);
+ 		if (!dev) {
+-			dev = p2p_get_device(p2p, sa);
+-			if (!dev) {
+-				p2p_dbg(p2p,
+-					"Provision Discovery device not found "
+-					MACSTR, MAC2STR(sa));
+-				goto out;
+-			}
++			p2p_dbg(p2p,
++				"Provision Discovery device not found "
++				MACSTR, MAC2STR(sa));
++			goto out;
+ 		}
+ 	} else if (msg.wfd_subelems) {
+ 		wpabuf_free(dev->info.wfd_subelems);
+-- 
+2.25.1
+
diff --git a/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
new file mode 100644
index 0000000000..4657b55d85
--- /dev/null
+++ b/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
@@ -0,0 +1,38 @@
+From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Mon, 9 Nov 2020 11:43:12 +0200
+Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group
+ client
+
+Parsing and copying of WPS secondary device types list was verifying
+that the contents is not too long for the internal maximum in the case
+of WPS messages, but similar validation was missing from the case of P2P
+group information which encodes this information in a different
+attribute. This could result in writing beyond the memory area assigned
+for these entries and corrupting memory within an instance of struct
+p2p_device. This could result in invalid operations and unexpected
+behavior when trying to free pointers from that corrupted memory.
+
+Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269
+Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers")
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/p2p/p2p.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index 74b7b52ae05c..5cbfc217fc1f 100644
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev,
+ 	dev->info.config_methods = cli->config_methods;
+ 	os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
+ 	dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
++	if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
++		dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
+ 	os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
+ 		  dev->info.wps_sec_dev_type_list_len);
+ }
+-- 
+2.25.1
+
diff --git a/network/i2pd/README b/network/i2pd/README
index 1bf6549857..512eb79c93 100644
--- a/network/i2pd/README
+++ b/network/i2pd/README
@@ -1,13 +1,13 @@
 i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client.
 
-I2P (Invisible Internet Protocol) is a universal anonymous network layer.
-All communications over I2P are anonymous and end-to-end encrypted,
-participants don't reveal their real IP addresses.
+I2P (Invisible Internet Protocol) is a universal anonymous network
+layer.  All communications over I2P are anonymous and end-to-end
+encrypted, participants don't reveal their real IP addresses.
 
-I2P client is a software used for building and using anonymous I2P networks.
-Such networks are commonly used for anonymous peer-to-peer applications
-(filesharing, cryptocurrencies) and anonymous client-server applications
-(websites, instant messengers, chat-servers).
+I2P client is a software used for building and using anonymous I2P
+networks.  Such networks are commonly used for anonymous peer-to-peer
+applications (filesharing, cryptocurrencies) and anonymous client-server
+applications (websites, instant messengers, chat-servers).
 
 I2P allows people from all around the world to communicate and share
 information without restrictions.
diff --git a/network/i2pd/i2pd.SlackBuild b/network/i2pd/i2pd.SlackBuild
index 33e858f193..88d3563f2e 100644
--- a/network/i2pd/i2pd.SlackBuild
+++ b/network/i2pd/i2pd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=i2pd
-VERSION=${VERSION:-2.33.0}
+VERSION=${VERSION:-2.36.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/i2pd/i2pd.info b/network/i2pd/i2pd.info
index 5b81cbf080..4aa9e18f1d 100644
--- a/network/i2pd/i2pd.info
+++ b/network/i2pd/i2pd.info
@@ -1,8 +1,8 @@
 PRGNAM="i2pd"
-VERSION="2.33.0"
+VERSION="2.36.0"
 HOMEPAGE="http://i2pd.website/"
-DOWNLOAD="https://github.com/PurpleI2P/i2pd/archive/2.33.0/i2pd-2.33.0.tar.gz"
-MD5SUM="30d39aa158f94f1fc3e678447d063ea7"
+DOWNLOAD="https://github.com/PurpleI2P/i2pd/archive/2.36.0/i2pd-2.36.0.tar.gz"
+MD5SUM="2117f8da160be6fe332184a4fb58aa20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/icyque/README b/network/icyque/README
new file mode 100644
index 0000000000..1bbf8c250b
--- /dev/null
+++ b/network/icyque/README
@@ -0,0 +1,12 @@
+icyque
+
+ICQ WIM protocol for libpurple
+
+Setup
+
+If you're switching to IcyQue from the built-in ICQ plugin, you'll
+need to restart Pidgin and then edit your existing account (or create a
+new account) with the "ICQ (WIM)" protocol.
+
+If you only have a phone number, then enter that with a + at the
+beginning and leave the password field blank.
diff --git a/network/icyque/icyque.SlackBuild b/network/icyque/icyque.SlackBuild
new file mode 100644
index 0000000000..84350557a0
--- /dev/null
+++ b/network/icyque/icyque.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for icyque
+
+# Copyright 2020, SlackBuilds.org, David Melik, Spokane, WA, USA
+# 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=icyque
+VERSION=${VERSION:-20200618_4fc08a0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+GITVER="$( echo $VERSION | cut -d_ -f2 )"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$GITVER*
+tar xvf $CWD/$PRGNAM-$GITVER*.tar.gz
+cd $PRGNAM-$GITVER*
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+make
+make install DESTDIR=$PKG
+
+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 README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/icyque/icyque.info b/network/icyque/icyque.info
new file mode 100644
index 0000000000..30e1ba8a43
--- /dev/null
+++ b/network/icyque/icyque.info
@@ -0,0 +1,10 @@
+PRGNAM="icyque"
+VERSION="20200618_4fc08a0"
+HOMEPAGE="https://github.com/EionRobb/icyque/"
+DOWNLOAD="https://github.com/EionRobb/icyque/archive/4fc08a09f2824bd039089fa54cbabf6be2221707/icyque-4fc08a09f2824bd039089fa54cbabf6be2221707.tar.gz"
+MD5SUM="8d1cd5cc28b78d5f44615791f3994600"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="json-glib"
+MAINTAINER="David Melik"
+EMAIL="dchmelik@gmail.com"
diff --git a/network/icyque/slack-desc b/network/icyque/slack-desc
new file mode 100644
index 0000000000..d0937aee71
--- /dev/null
+++ b/network/icyque/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+icyque: icyque (ICQ WIM protocol for libpurple)
+icyque:
+icyque: If you're switching to IcyQue from the built-in ICQ plugin, you'll
+icyque: need to restart Pidgin and then edit your existing account (or create
+icyque: a new account) with the "ICQ (WIM)" protocol.
+icyque:
+icyque: If you only have a phone number, then enter that with a + at the
+icyque: beginning and leave the password field blank.
+icyque:
+icyque: https://github.com/EionRobb/icyque/
+icyque:
diff --git a/network/ircII/README b/network/ircII/README
new file mode 100644
index 0000000000..330bfe39e2
--- /dev/null
+++ b/network/ircII/README
@@ -0,0 +1,14 @@
+ircII (IRC Client, Second Edition)
+
+ircII is a full screen, curses-based interface to Internet Relay
+Chat. It gives full access to all of the normal IRC functions, plus a
+variety of additional options.
+
+ircII is the oldest IRC client still maintained.
+
+By default, this SlackBuild sets the default IRC server to
+"SSLIRC/chat.freenode.org:6697". This only applies with ircII is
+run without a server argument on the command line. You can change
+the default server by setting the DEFSRV environment variable to the
+host:port (with optional SSLIRC/ prefix for a secure connection), or
+compile without a default server with DEFSRV=none.
diff --git a/network/ircII/ircII.SlackBuild b/network/ircII/ircII.SlackBuild
new file mode 100644
index 0000000000..917a708aff
--- /dev/null
+++ b/network/ircII/ircII.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+# Slackware build script for ircII
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# I don't know why nobody's already done a SlackBuild for this.
+# Normally I prefer all-lowercase package names, but this just looks
+# *wrong* as "ircii".
+
+PRGNAM=ircII
+VERSION=${VERSION:-20190117_1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=${PRGNAM,,}
+SRCVER=${VERSION%_*}
+DEBVER=${VERSION#*_}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+DEFSRV="${DEFSRV:-SSLIRC/chat.freenode.org:6697}"
+case "$DEFSRV" in
+  none|NONE) ;;
+  *:*) srvopt="--with-default-server=$DEFSRV" ;;
+  *) echo "$0: invalid DEFSRV, use host:port, SSLIRC/host:port, or 'none'" 1>&2
+     exit 1 ;;
+esac
+
+echo "=== DEFSRV='$DEFSRV', srvopt='$srvopt'"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+cd $SRCNAM-$SRCVER
+tar xvf $CWD/${SRCNAM}_$SRCVER-$DEBVER.debian.tar.xz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# apply most of Debian's patches.
+rm -f debian/patches/0004-absolute-path*
+for i in $( cat debian/patches/series ); do
+  [ -e debian/patches/$i ] && patch -p1 < debian/patches/$i
+done
+
+# fix warnings caused by missing includes.
+sed -i -e '1i#include <curses.h>' \
+       -e '1i#include <term.h>' \
+       source/term.c
+
+# do not compile with termcap. there's no --disable-termcap or similar,
+# have to do surgery.
+sed -i -e '/AC_CHECK_LIB(termcap/s,termcap,ncurses,g' \
+       -e 's,termcap\.h ,,' \
+       configure.in
+autoreconf -ifv
+
+# is there a disadvantage to enabling emacs meta keys?
+CFLAGS="$SLKCFLAGS -Wl,-s" \
+CXXFLAGS="$SLKCFLAGS -Wl,-s" \
+./configure \
+  $srvopt \
+  --with-emacs-meta-keys \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+
+# make install doesn't create this dir, and doesn't respect DESTDIR
+# for the man dir.
+mkdir -p $PKG/usr/man/man1
+make install DESTDIR=$PKG mandir=$PKG/usr/man/man1
+
+# package called ircII, so let's have an ircII executable.
+ln -s irc-$VERSION $PKG/usr/bin/$PRGNAM
+
+rm -f $PKG/usr/man/man1/irc.1
+gzip -9 $PKG/usr/man/man1/*.1
+ln -s ircII.1.gz $PKG/usr/man/man1/irc.1.gz
+
+# Debian includes some extra man pages
+for i in debian/*.1; do
+  gzip -9c < $i > $PKG/usr/man/man1/$( basename $i ).gz
+done
+
+rm -f doc/*.1 doc/*.spec*
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog NEWS README doc/* contrib $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ircII/ircII.info b/network/ircII/ircII.info
new file mode 100644
index 0000000000..241b6c6e91
--- /dev/null
+++ b/network/ircII/ircII.info
@@ -0,0 +1,12 @@
+PRGNAM="ircII"
+VERSION="20190117_1"
+HOMEPAGE="http://www.eterna.com.au/ircii/"
+DOWNLOAD="http://ircii.warped.com/ircii-20190117.tar.gz \
+          http://deb.debian.org/debian/pool/main/i/ircii/ircii_20190117-1.debian.tar.xz"
+MD5SUM="f0ca9ade8aa068acddbe15b215c0b22a \
+        6d077f10fb7133141d9e6bcba4ad0314"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/ircII/slack-desc b/network/ircII/slack-desc
new file mode 100644
index 0000000000..7086e8cd94
--- /dev/null
+++ b/network/ircII/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ircII: ircII (IRC Client, Second Edition)
+ircII:
+ircII: ircII is a full screen, curses-based interface to Internet Relay
+ircII: Chat. It gives full access to all of the normal IRC functions, plus a
+ircII: variety of additional options.
+ircII:
+ircII: ircII is the oldest IRC client still maintained.
+ircII:
+ircII:
+ircII:
+ircII:
diff --git a/network/ircd-hybrid/ircd-hybrid.SlackBuild b/network/ircd-hybrid/ircd-hybrid.SlackBuild
index 0ef5eb3aec..0c2a6bb871 100644
--- a/network/ircd-hybrid/ircd-hybrid.SlackBuild
+++ b/network/ircd-hybrid/ircd-hybrid.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ircd-hybrid
 
-# Copyright 2018-2020  Ebben Aries <e@dscp.org>
+# Copyright 2018-2020  Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=ircd-hybrid
 BINNAM=ircd
-VERSION=${VERSION:-8.2.28}
+VERSION=${VERSION:-8.2.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/ircd-hybrid/ircd-hybrid.info b/network/ircd-hybrid/ircd-hybrid.info
index 1a641a0935..adbe79db3d 100644
--- a/network/ircd-hybrid/ircd-hybrid.info
+++ b/network/ircd-hybrid/ircd-hybrid.info
@@ -1,10 +1,10 @@
 PRGNAM="ircd-hybrid"
-VERSION="8.2.28"
+VERSION="8.2.36"
 HOMEPAGE="http://www.ircd-hybrid.org/"
-DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.28/ircd-hybrid-8.2.28.tar.gz"
-MD5SUM="42e6d49af64b11b82586b3b07ef626e0"
+DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.36/ircd-hybrid-8.2.36.tar.gz"
+MD5SUM="38e4448f05a66468b3fa96a6c682cf79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/isync/isync.SlackBuild b/network/isync/isync.SlackBuild
index e287ce9498..3b7657ddfe 100644
--- a/network/isync/isync.SlackBuild
+++ b/network/isync/isync.SlackBuild
@@ -29,7 +29,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=isync
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/isync/isync.info b/network/isync/isync.info
index 88343019af..22a2f558bb 100644
--- a/network/isync/isync.info
+++ b/network/isync/isync.info
@@ -1,8 +1,8 @@
 PRGNAM="isync"
-VERSION="1.3.1"
+VERSION="1.3.3"
 HOMEPAGE="http://isync.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.1.tar.gz"
-MD5SUM="58bc3507ebe930f8fec5997430be85d5"
+DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.3.tar.gz"
+MD5SUM="5e29a2da627492fe4311c4b9630ba643"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/keepalived/README b/network/keepalived/README
index 5e28a766a0..bf9df21cd2 100644
--- a/network/keepalived/README
+++ b/network/keepalived/README
@@ -13,3 +13,5 @@ this server entrie from the LVS topology. In addition keepalived
 implements an independent VRRPv2 stack to handle director failover.
 So in short keepalived is a userspace daemon for LVS cluster nodes
 healthchecks and LVS directors failover.
+
+WARNING: nftables and libipset support are disabled for Slackware 14.2
diff --git a/network/keepalived/keepalived.SlackBuild b/network/keepalived/keepalived.SlackBuild
index 2719b1d65f..c23734e1aa 100644
--- a/network/keepalived/keepalived.SlackBuild
+++ b/network/keepalived/keepalived.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keepalived
-VERSION=${VERSION:-2.1.5}
+VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,6 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-kernel-dir=/usr \
   --disable-nftables \
+  --disable-libipset \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/network/keepalived/keepalived.info b/network/keepalived/keepalived.info
index 96be269396..3677d84db9 100644
--- a/network/keepalived/keepalived.info
+++ b/network/keepalived/keepalived.info
@@ -1,8 +1,8 @@
 PRGNAM="keepalived"
-VERSION="2.1.5"
+VERSION="2.2.2"
 HOMEPAGE="https://www.keepalived.org/"
-DOWNLOAD="https://www.keepalived.org/software/keepalived-2.1.5.tar.gz"
-MD5SUM="27e1cfff5b8dd95062ad415957e663e5"
+DOWNLOAD="https://www.keepalived.org/software/keepalived-2.2.2.tar.gz"
+MD5SUM="2e86bade4a7a48cfac7d35a6c9643d46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild
index cce13e060f..4f1fb3c106 100644
--- a/network/krb5/krb5.SlackBuild
+++ b/network/krb5/krb5.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for krb5
 
 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=krb5
-VERSION=${VERSION:-1.18.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.19.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/krb5/krb5.info b/network/krb5/krb5.info
index 4b1ee9202e..ec91e88bd1 100644
--- a/network/krb5/krb5.info
+++ b/network/krb5/krb5.info
@@ -1,8 +1,8 @@
 PRGNAM="krb5"
-VERSION="1.18.2"
+VERSION="1.19.1"
 HOMEPAGE="http://web.mit.edu/kerberos/"
-DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.2.tar.gz"
-MD5SUM="fd9087eaa43589a2480c2e22da91a17e"
+DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.1.tar.gz"
+MD5SUM="81257292f8243f735654d4fd5d1fef6a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/libiscsi/libiscsi.SlackBuild b/network/libiscsi/libiscsi.SlackBuild
index 6eeebf5a36..1ed646dbd6 100644
--- a/network/libiscsi/libiscsi.SlackBuild
+++ b/network/libiscsi/libiscsi.SlackBuild
@@ -23,12 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
+# 2021-02-19:
+#   updated to 1.19.0
+#
 # 2019-04-07:
 #   initial release
 #
 
 PRGNAM=libiscsi
-VERSION=${VERSION:-1.18.0}
+VERSION=${VERSION:-1.19.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +77,8 @@ 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 {} \;
 
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/libiscsi/libiscsi.info b/network/libiscsi/libiscsi.info
index 870e32c21c..201ebd21f7 100644
--- a/network/libiscsi/libiscsi.info
+++ b/network/libiscsi/libiscsi.info
@@ -1,8 +1,8 @@
 PRGNAM="libiscsi"
-VERSION="1.18.0"
+VERSION="1.19.0"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
-DOWNLOAD="https://sites.google.com/site/libiscsitarballs/libiscsitarballs/libiscsi-1.18.0.tar.gz"
-MD5SUM="eff8b0a9a116624d41edc4104054f77d"
+DOWNLOAD="https://github.com/sahlberg/libiscsi/archive/1.19.0/libiscsi-1.19.0.tar.gz"
+MD5SUM="fe0c0c7b677f3b6fbe535e758838ccf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/libteam/README b/network/libteam/README
new file mode 100644
index 0000000000..a577a1e415
--- /dev/null
+++ b/network/libteam/README
@@ -0,0 +1,7 @@
+libteam - Library for controlling team network device
+
+The purpose of the Team softdev Linux driver is to provide a mechanism
+to team multiple NICs (ports) into one logical one (teamdev) at L2
+layer. The process is called "channel bonding", "Ethernet bonding",
+"channel teaming", "link aggregation", etc. This is already implemented
+in the Linux kernel by the bonding driver.
diff --git a/network/libteam/libteam.SlackBuild b/network/libteam/libteam.SlackBuild
new file mode 100644
index 0000000000..cabaa3be15
--- /dev/null
+++ b/network/libteam/libteam.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for libteam
+
+# Copyright 2021 Ebben Aries <slackbuilds@dscp.org>
+# 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=libteam
+VERSION=${VERSION:-1.31}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh
+
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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
+
+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 HOWTO.BASICS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/libteam/libteam.info b/network/libteam/libteam.info
new file mode 100644
index 0000000000..446c311776
--- /dev/null
+++ b/network/libteam/libteam.info
@@ -0,0 +1,10 @@
+PRGNAM="libteam"
+VERSION="1.31"
+HOMEPAGE="http://libteam.org/"
+DOWNLOAD="https://github.com/jpirko/libteam/archive/v1.31/libteam-1.31.tar.gz"
+MD5SUM="3290ee003707684d84d1ff2bdaeda059"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libdaemon jansson"
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/libteam/slack-desc b/network/libteam/slack-desc
new file mode 100644
index 0000000000..b199f7944b
--- /dev/null
+++ b/network/libteam/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+libteam: libteam (Library for controlling team network device)
+libteam:
+libteam: The purpose of the Team softdev Linux driver is to provide a
+libteam: mechanism to team multiple NICs (ports) into one logical one (teamdev)
+libteam: at L2 layer. The process is called "channel bonding", "Ethernet
+libteam: bonding", "channel teaming", "link aggregation", etc. This is already
+libteam: implemented in the Linux kernel by the bonding driver.
+libteam:
+libteam:
+libteam: Homepage: http://libteam.org/
+libteam:
diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild
index 8294be9ad2..7c48640ad5 100644
--- a/network/lighttpd/lighttpd.SlackBuild
+++ b/network/lighttpd/lighttpd.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for lighttpd
 
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
-# Copyright 2016-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lighttpd
-VERSION=${VERSION:-1.4.55}
+VERSION=${VERSION:-1.4.58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index c59424aece..49924d8729 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="lighttpd"
-VERSION="1.4.55"
+VERSION="1.4.58"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz"
-MD5SUM="be4bda2c28bcbdac6eb941528f6edf03"
+DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz"
+MD5SUM="8d12a31bd3fdd7eab85cf9a6d2cfa92e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/lldpd/lldpd.SlackBuild b/network/lldpd/lldpd.SlackBuild
index 54b8d80ec8..25306b6af0 100644
--- a/network/lldpd/lldpd.SlackBuild
+++ b/network/lldpd/lldpd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lldpd
 
-# Copyright 2017-2020 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2017-2021 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lldpd
-VERSION=${VERSION:-1.0.5}
+VERSION=${VERSION:-1.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/lldpd/lldpd.info b/network/lldpd/lldpd.info
index 011e7fbfb2..0999957e77 100644
--- a/network/lldpd/lldpd.info
+++ b/network/lldpd/lldpd.info
@@ -1,8 +1,8 @@
 PRGNAM="lldpd"
-VERSION="1.0.5"
+VERSION="1.0.7"
 HOMEPAGE="https://vincentbernat.github.io/lldpd/"
-DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.5.tar.gz"
-MD5SUM="6949ddf3634423ce3caaaf8a09fc0fa8"
+DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz"
+MD5SUM="509aa1675dafff5017bbcc22850e35a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/lldpd/rc.lldpd b/network/lldpd/rc.lldpd
index 023173b6c1..40d75680da 100644
--- a/network/lldpd/rc.lldpd
+++ b/network/lldpd/rc.lldpd
@@ -10,7 +10,7 @@ lldpd_stop() {
   killall lldpd
 }
 
-restart() {
+lldpd_restart() {
   lldpd_stop
   sleep 1
   lldpd_start
diff --git a/network/luakit/luakit.SlackBuild b/network/luakit/luakit.SlackBuild
index 7a0981a59b..20fea6d96d 100644
--- a/network/luakit/luakit.SlackBuild
+++ b/network/luakit/luakit.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for luakit
 
 # Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
-# Update 2018-06-30 by Marek Srejma <sam_web@yahoo.de>
+# Update 2018-06-30 and 2020-10-26 by Marek Srejma <sam_web@yahoo.de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luakit
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 LUAJIT=${LUAJIT:-0} # 0 or 1
@@ -45,10 +45,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if egrep -qo "^i[2-6]86$" <<<"$ARCH"; then
   SLKCFLAGS="-O2 -march=$ARCH -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -56,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-debian-$VERSION
-tar xvf $CWD/$PRGNAM-debian-$VERSION.tar.gz
-cd $PRGNAM-debian-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -66,25 +69,22 @@ 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 {} \;
 
+sed -e 's#(PREFIX)/lib/luakit#(LIBDIR)#g' -i Makefile
+
 _CFLAGS=`grep CFLAGS config.mk | sed -e "s/CFLAGS\s*+=//g" | tr "\n" " "`
-make \
+make install \
+  CFLAGS="$_CFLAGS $SLKCFLAGS" \
   PREFIX=/usr \
+  LIBDIR=/usr/lib$LIBDIRSUFFIX/$PRGNAM \
   MANPREFIX=/usr/man \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION \
   DEVELOPMENT_PATHS=0 \
-  CFLAGS="$_CFLAGS $SLKCFLAGS" \
   LUA_BIN_NAME=lua \
   LUA_PKG_NAME=lua \
   USE_LUAJIT=$LUAJIT \
-  CC=$CC
-
-make install \
-  DESTDIR=$PKG \
-  PREFIX=/usr \
-  MANPREFIX=$PKG/usr/man \
-  DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION \
-  LUA_BIN_NAME=lua \
-  LUA_PKG_NAME=lua
+  CC=$CC \
+  VERSION=$VERSION \
+  DESTDIR=$PKG
 
 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
diff --git a/network/luakit/luakit.info b/network/luakit/luakit.info
index 2b0eabac90..2f3150278d 100644
--- a/network/luakit/luakit.info
+++ b/network/luakit/luakit.info
@@ -1,8 +1,8 @@
 PRGNAM="luakit"
-VERSION="2.0"
+VERSION="2.2.1"
 HOMEPAGE="https://github.com/luakit/luakit"
-DOWNLOAD="https://github.com/luakit/luakit/archive/debian/2.0/luakit-debian-2.0.tar.gz"
-MD5SUM="2f5ab83a7835db482220b2279351e23c"
+DOWNLOAD="https://github.com/luakit/luakit/archive/2.2.1/luakit-2.2.1.tar.gz"
+MD5SUM="c9f32f06b54fae18e567fb330250bb36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk lua-filesystem"
diff --git a/network/maildrop/maildrop.SlackBuild b/network/maildrop/maildrop.SlackBuild
index 641d9ba7c1..7f4d08ce48 100644
--- a/network/maildrop/maildrop.SlackBuild
+++ b/network/maildrop/maildrop.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for maildrop
 #
 # Copyright 2010 - 2019 Å ime Ramov <s@ramov.com>
-# Copyright 2019 Andrew Strong, Blue Mountains, Australia.
+# Copyright 2019 - 2021 Andrew Strong, Blue Mountains, Australia.
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -25,13 +25,13 @@
 # ----------------------------------------------------------------------
 
 PRGNAM=maildrop
-VERSION=${VERSION:-3.0.0}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +42,8 @@ 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"
@@ -67,21 +67,28 @@ cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --datadir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-dovecotauth \
+  --with-devel \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 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
@@ -94,7 +101,7 @@ mv $PKG/usr/share/doc/$PRGNAM/html $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share
 
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README UPGRADE \
+  AUTHORS COPYING* ChangeLog INSTALL README README.dovecotauth UPGRADE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/maildrop/maildrop.info b/network/maildrop/maildrop.info
index 94693cdd1d..5becdd4664 100644
--- a/network/maildrop/maildrop.info
+++ b/network/maildrop/maildrop.info
@@ -1,8 +1,8 @@
 PRGNAM="maildrop"
-VERSION="3.0.0"
+VERSION="3.0.1"
 HOMEPAGE="http://www.courier-mta.org/maildrop/"
-DOWNLOAD="https://download.sourceforge.net/courier/maildrop-3.0.0.tar.bz2"
-MD5SUM="410569d4829549429a99df7511ea3a46"
+DOWNLOAD="https://download.sourceforge.net/courier/maildrop-3.0.1.tar.bz2"
+MD5SUM="28f6a5dfa6da4110719240696d528299"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="courier-unicode"
diff --git a/network/mattermost-desktop/mattermost-desktop.SlackBuild b/network/mattermost-desktop/mattermost-desktop.SlackBuild
index 3cdb367e02..c43c06f88f 100644
--- a/network/mattermost-desktop/mattermost-desktop.SlackBuild
+++ b/network/mattermost-desktop/mattermost-desktop.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mattermost-desktop
-VERSION=${VERSION:-4.5.0}
+VERSION=${VERSION:-4.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/mattermost-desktop/mattermost-desktop.info b/network/mattermost-desktop/mattermost-desktop.info
index 5cfda17f94..c22f9dac1c 100644
--- a/network/mattermost-desktop/mattermost-desktop.info
+++ b/network/mattermost-desktop/mattermost-desktop.info
@@ -1,10 +1,10 @@
 PRGNAM="mattermost-desktop"
-VERSION="4.5.0"
+VERSION="4.6.1"
 HOMEPAGE="https://mattermost.com"
-DOWNLOAD="https://releases.mattermost.com/desktop/4.5.0/mattermost-desktop-4.5.0-linux-ia32.tar.gz"
-MD5SUM="a4aac5ca29c2c09d7d4cc2444198a743"
-DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.5.0/mattermost-desktop-4.5.0-linux-x64.tar.gz"
-MD5SUM_x86_64="72512a8f046b340cd90c5bdf1d49cc22"
+DOWNLOAD="https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-ia32.tar.gz"
+MD5SUM="5f6541178b31eb4eb337e0d60ece1072"
+DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-x64.tar.gz"
+MD5SUM_x86_64="48b6cae957745ee92ab5d90b6c21c12c"
 REQUIRES=""
 MAINTAINER="Dominik Drobek"
 EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/megatools/megatools.SlackBuild b/network/megatools/megatools.SlackBuild
index a8ecc2bac3..5145d414d3 100644
--- a/network/megatools/megatools.SlackBuild
+++ b/network/megatools/megatools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for megatools
 
-# Copyright 2014-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=megatools
-VERSION=${VERSION:-1.10.2}
+VERSION=${VERSION:-1.10.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/megatools/megatools.info b/network/megatools/megatools.info
index 9482d6a966..29028d7511 100644
--- a/network/megatools/megatools.info
+++ b/network/megatools/megatools.info
@@ -1,8 +1,8 @@
 PRGNAM="megatools"
-VERSION="1.10.2"
+VERSION="1.10.3"
 HOMEPAGE="https://megatools.megous.com/"
-DOWNLOAD="https://megatools.megous.com/builds/megatools-1.10.2.tar.gz"
-MD5SUM="b9c7e18b4daf48867d7c669a674744b0"
+DOWNLOAD="https://megatools.megous.com/builds/megatools-1.10.3.tar.gz"
+MD5SUM="e5f85f5f5d4fe844a6090a2816eabcae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
index d039faca4a..95cdb40b57 100644
--- a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
+++ b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
@@ -22,9 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by slackbuilds.org
+
 PRGNAM=mkvserver_mk2
-SRCNAM=a6f18126bd5a35b77f47e2fc32ffc221d0937aeb
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-20201203_c62abc3}
+COMMIT=${COMMIT:-c62abc30f4cca6147ddc732570b30fcb4bee30ec}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,16 +44,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -std=c++11"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2 -std=c++11"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -60,10 +62,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz
-mv $PRGNAM-$SRCNAM $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+#mv $PRGNAM-$COMMIT $PRGNAM-$VERSION
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,20 +73,19 @@ 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 {} \;
 
-  make VERBOSE=1
-  mkdir -p $PKG/usr/bin/
-  install -m755 server $PKG/usr/bin/mkvserver_mk2
+# Use slackware CFLAGS
+sed -i "s,\$(LAV_CFLAGS),$SLKCFLAGS &,g" Makefile
 
-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
+export PKG_CONFIG_PATH="/usr/lib$LIBDIRSUFFIX/ffmpeg4/pkgconfig:$PKG_CONFIG_PATH"
+make VERBOSE=1
+install --strip -D -m0755 server $PKG/usr/bin/mkvserver
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Readme.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp Readme.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/network/mkvserver_mk2/mkvserver_mk2.info b/network/mkvserver_mk2/mkvserver_mk2.info
index 7b90539939..17d266d7d0 100644
--- a/network/mkvserver_mk2/mkvserver_mk2.info
+++ b/network/mkvserver_mk2/mkvserver_mk2.info
@@ -1,10 +1,10 @@
 PRGNAM="mkvserver_mk2"
-VERSION="1.0"
+VERSION="20201203_c62abc3"
 HOMEPAGE="https://github.com/klaxa/mkvserver_mk2"
-DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/a6f18126bd5a35b77f47e2fc32ffc221d0937aeb/mkvserver_mk2-a6f18126bd5a35b77f47e2fc32ffc221d0937aeb.tar.gz"
-MD5SUM="87e513b3b0e85a18471bdffaf972661b"
+DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/c62abc30f4cca6147ddc732570b30fcb4bee30ec/mkvserver_mk2-c62abc30f4cca6147ddc732570b30fcb4bee30ec.tar.gz"
+MD5SUM="f49feb40138a9c47bb4ccea3a695499d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="ffmpeg4"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"
diff --git a/network/mkvserver_mk2/slack-desc b/network/mkvserver_mk2/slack-desc
index acd2597737..471c6200ff 100644
--- a/network/mkvserver_mk2/slack-desc
+++ b/network/mkvserver_mk2/slack-desc
@@ -8,12 +8,12 @@
              |-----handy-ruler------------------------------------------------------|
 mkvserver_mk2: mkvserver_mk2 (Matroska Server Mk2)
 mkvserver_mk2:
-mkvserver_mk2: Matroska Server Mk2 project is the result of years of thinking, try-
-mkvserver_mk2: ing and finally succeeding.
+mkvserver_mk2: Stream (almost) anything remuxed as matroska live in real-time over
+mkvserver_mk2: http to multiple clients.
+mkvserver_mk2:
+mkvserver_mk2: https://github.com/klaxa/mkvserver_mk2
+mkvserver_mk2:
+mkvserver_mk2:
 mkvserver_mk2:
-mkvserver_mk2: This software makes it possible to stream (almost) anything remuxed
-mkvserver_mk2: as matroska live in real-time over http to multiple clients.
 mkvserver_mk2:
-mkvserver_mk2: This is probably also one of the first real world usages of FFmpeg's
-mkvserver_mk2: http server component (which I wrote as part of GSoC 2015).
 mkvserver_mk2:
diff --git a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
index b02fd22e1b..a2bc3001ea 100644
--- a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
+++ b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mod_auth_gssapi
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/mod_auth_gssapi/mod_auth_gssapi.info b/network/mod_auth_gssapi/mod_auth_gssapi.info
index 80217dfdcf..95d27049f9 100644
--- a/network/mod_auth_gssapi/mod_auth_gssapi.info
+++ b/network/mod_auth_gssapi/mod_auth_gssapi.info
@@ -1,8 +1,8 @@
 PRGNAM="mod_auth_gssapi"
-VERSION="1.6.2"
+VERSION="1.6.3"
 HOMEPAGE="https://github.com/modauthgssapi/mod_auth_gssapi"
-DOWNLOAD="https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v1.6.2/mod_auth_gssapi-1.6.2.tar.gz"
-MD5SUM="ccb9a81b2f9fc610e1f5ac4c619b21fc"
+DOWNLOAD="https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v1.6.3/mod_auth_gssapi-1.6.3.tar.gz"
+MD5SUM="6656e33db1ce457515c9c6a5b819830e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="krb5"
diff --git a/network/mumble/bump_overlay_version.patch b/network/mumble/bump_overlay_version.patch
new file mode 100644
index 0000000000..87bc372c42
--- /dev/null
+++ b/network/mumble/bump_overlay_version.patch
@@ -0,0 +1,23 @@
+From d9a2a0d9b8005e2e01729195b95f20e434ffdfe6 Mon Sep 17 00:00:00 2001
+From: Robert Adam <dev@robert-adam.de>
+Date: Mon, 15 Mar 2021 08:22:10 +0100
+Subject: [PATCH] BUILD: Bumped overlay version to 1.3.4 as well
+
+Fixes #4857
+---
+ overlay_gl/overlay_gl.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro
+index 05ca8df082..0ea691b162 100644
+--- a/overlay_gl/overlay_gl.pro
++++ b/overlay_gl/overlay_gl.pro
+@@ -10,7 +10,7 @@ include(../qmake/compiler.pri)
+ TEMPLATE = lib
+ CONFIG -= qt gui
+ CONFIG *= debug_and_release
+-VERSION = 1.3.3
++VERSION = 1.3.4
+ SOURCES = overlay.c
+ 
+ CONFIG(static) {
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 1d6c1e1b6b..7b98f57838 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Mumble
 
 # Copyright 2011-2013 James Geboski <jgeboski@gmail.com>
-# Copyright 2014-2015 Edward W. Koenig <kingbeowulf@gmail.com>
+# Copyright 2014-2021 Edward W. Koenig <kingbeowulf@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
 
 PRGNAM=mumble
-VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 G15=${G15:-no}
 OVERLAY=${OVERLAY:-no}
 COMPAT32=${COMPAT32:-no}
+NUMJOBS=${NUMJOBS:-1}
 SPEECHD=${SPEECHD:-no}
 CELT070=${CELT070:-no}
 
@@ -63,20 +63,24 @@ else
   LIBDIRSUFFIX=""
 fi
 
-BUILD_G15=""
-BUILD_OVERLAY=""
-
 if [ "$G15" = "no" ]; then
   BUILD_G15="CONFIG+=no-g15"
+else
+  BUILD_G15=""
 fi
 
 if [ "$OVERLAY" = "no" ]; then
   BUILD_OVERLAY="CONFIG+=no-overlay"
+else
+  BUILD_OVERLAY=""
 fi
 
 if [ "$SPEECHD" = "no" ]; then
   BUILD_SPEECHD="CONFIG+=no-speechd"
+else
+  BUILD_SPEECHD=""
 fi
+
 # Celt is no longer maintained, and dropped in
 # favor of opus.  Celt-0.7.0 is bundled for optional
 # backware compatibility. SBo's celt is incompatible.
@@ -101,6 +105,9 @@ 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 {} \;
 
+# Bumped overlay version to 1.3.4 as well Fixes #4857
+patch -p1 < $CWD/bump_overlay_version.patch
+
 qmake-qt5 -recursive main.pro \
   QMAKE_CFLAGS+="$SLKCFLAGS" \
   QMAKE_CXXFLAGS+="$SLKCFLAGS" \
@@ -114,9 +121,9 @@ qmake-qt5 -recursive main.pro \
   CONFIG+=no-bonjour \
   CONFIG+=no-qt4-legacy-compat \
   $BUILD_CELT \
+  $BUILD_SPEECHD \
   $BUILD_G15 \
-  $BUILD_OVERLAY \
-  $BUILD_SPEECHD
+  $BUILD_OVERLAY
 
 make release
 
@@ -125,31 +132,27 @@ mkdir -p \
   $PKG/usr/lib${LIBDIRSUFFIX}/mumble \
   $PKG/usr/man/man1 \
   $PKG/usr/share/{applications,pixmaps}
+  
+install -m 644 man/mumble-overlay.1 $PKG/usr/man/man1
+install -m 644 man/mumble.1 $PKG/usr/man/man1
+install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
+install -m 644 icons/mumble.svg       $PKG/usr/share/pixmaps
 
 install -m 755 release/mumble $PKG/usr/bin
-
 if [ "$CELT070" = "yes" ]; then
-   cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
+  install -m 755 release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
 fi
 
-install -m 644 \
-  man/mumble-overlay.1 \
-  man/mumble.1 \
- $PKG/usr/man/man1
-
-install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
-install -m 644 icons/mumble.svg       $PKG/usr/share/pixmaps
-
-find release/plugins -type f -name *.so \
+find release/plugins -type f -name "*.so" \
   -exec install -m 755 {} $PKG/usr/lib${LIBDIRSUFFIX}/mumble \;
 
 # If the overlay was built, let's install the library for it
-if [ -e release/libmumble.so.$VERSION ]; then
+if [ "$OVERLAY" = "yes" ]; then
   install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
   install -m 755 scripts/mumble-overlay        $PKG/usr/bin
 
   cd $PKG/usr/lib${LIBDIRSUFFIX}
-    ln -sf libmumble.so.$VERSION libmumble.so.1.2
+    ln -sf libmumble.so.$VERSION libmumble.so.1.3
     ln -sf libmumble.so.$VERSION libmumble.so.1
     ln -sf libmumble.so.$VERSION libmumble.so
   cd -
@@ -165,8 +168,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
     qmake-qt5 \
       QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
       QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
-      QMAKE_LFLAGS="-m32" \
-      overlay_gl.pro
+      QMAKE_LFLAGS="-m32" overlay_gl.pro
 
     make release DESTDIR_ADD=-32
   cd -
@@ -175,7 +177,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
   install -m 755 release-32/libmumble.so.$VERSION $PKG/usr/lib
 
   cd $PKG/usr/lib
-    ln -sf libmumble.so.$VERSION libmumble.so.1.2
+    ln -sf libmumble.so.$VERSION libmumble.so.1.3
     ln -sf libmumble.so.$VERSION libmumble.so.1
     ln -sf libmumble.so.$VERSION libmumble.so
   cd -
@@ -188,7 +190,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 CHANGES LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL CHANGES LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index aa0256d62b..ce3a2cddea 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,10 +1,10 @@
 PRGNAM="mumble"
-VERSION="1.3.0"
+VERSION="1.3.4"
 HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz"
-MD5SUM="65fd57177879f5d1830c13a63d9f50ab"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.4/mumble-1.3.4.tar.gz"
+MD5SUM="d41ece1a4cefadfc1d04a16863514f98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf opus speex qt5"
+REQUIRES="opus speex protobuf3 qt5"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/network/munge/README b/network/munge/README
index 3d3792de7a..7a6632501a 100644
--- a/network/munge/README
+++ b/network/munge/README
@@ -11,14 +11,14 @@ by a shared cryptographic key. Clients within this security realm can
 create and validate credentials without the use of root privileges,
 reserved ports, or platform-specific methods.
 
-On most platforms, the munged daemon does not require root privileges to run.
-If possible, you should run the daemon as a non-privileged user.
+On most platforms, the munged daemon does not require root privileges to
+run.  If possible, you should run the daemon as a non-privileged user.
 This can be specified in the init script /etc/rc.d/rc.munge.
 
 # groupadd -g 310 munge
 # useradd -u 310 -d /var/lib/munge -s /bin/false -g munge munge
 
-After installation a secret key file needs to be created. Follow instructions
-from:
+After installation a secret key file needs to be created. Follow
+instructions from:
 
 https://github.com/dun/munge/wiki/Installation-Guide#creating-a-secret-key
diff --git a/network/munge/munge.SlackBuild b/network/munge/munge.SlackBuild
index 714c768926..e4cfeb6dc3 100644
--- a/network/munge/munge.SlackBuild
+++ b/network/munge/munge.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Munge
 
-# Copyright 2015 Emmanuel N. Millan, Mendoza, Argentina.
+# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=munge
-VERSION=${VERSION:-0.5.13}
+VERSION=${VERSION:-0.5.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DOCS="AUTHORS COPYING COPYING.LESSER DISCLAIMER.LLNS DISCLAIMER.UC \
-      HISTORY INSTALL JARGON META NEWS PLATFORMS QUICKSTART README README.MULTILIB"
+      HISTORY INSTALL JARGON KEYS NEWS PLATFORMS QUICKSTART README README.MULTILIB THANKS"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/network/munge/munge.info b/network/munge/munge.info
index acebdf893e..58e3aba957 100644
--- a/network/munge/munge.info
+++ b/network/munge/munge.info
@@ -1,8 +1,8 @@
 PRGNAM="munge"
-VERSION="0.5.13"
+VERSION="0.5.14"
 HOMEPAGE="https://dun.github.io/munge/"
-DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz"
-MD5SUM="9204f34aac7f0cc50880196f4a8f5f33"
+DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.14/munge-0.5.14.tar.xz"
+MD5SUM="e81db7faf729611e23d0552334dfc212"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/murmur/murmur.SlackBuild b/network/murmur/murmur.SlackBuild
index 7879d5882a..7e90984094 100644
--- a/network/murmur/murmur.SlackBuild
+++ b/network/murmur/murmur.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=murmur
 SRCNAM=mumble
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -106,6 +106,7 @@ mkdir -p \
   $PKG/usr/man/man1 \
   $PKG/var/{lib,log,run}/$PRGNAM
 
+
 install -m 644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 install -m 755 release/murmurd $PKG/usr/bin
 install -m 644 man/murmurd.1   $PKG/usr/man/man1
@@ -141,7 +142,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES INSTALL LICENSE README README.Linux \
+  AUTHORS CHANGES INSTALL LICENSE README README.Linux \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/murmur/murmur.info b/network/murmur/murmur.info
index e5579ce236..e76279a9b3 100644
--- a/network/murmur/murmur.info
+++ b/network/murmur/murmur.info
@@ -1,10 +1,10 @@
 PRGNAM="murmur"
-VERSION="1.3.0"
-HOMEPAGE="https://github.com/mumble-voip/mumble/"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz"
-MD5SUM="65fd57177879f5d1830c13a63d9f50ab"
+VERSION="1.3.4"
+HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.4/mumble-1.3.4.tar.gz"
+MD5SUM="d41ece1a4cefadfc1d04a16863514f98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf qt5"
+REQUIRES="protobuf3 qt5"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/network/nbd/nbd.SlackBuild b/network/nbd/nbd.SlackBuild
index 189d9e3c39..ed344fb1ac 100644
--- a/network/nbd/nbd.SlackBuild
+++ b/network/nbd/nbd.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for NBD (Network Block Device)
 
 # Previously maintained by Stu Miller <slackbuilds@go4it2day.com>
-# Maintained 2013-2019 by Christoph Willing, Brisbane Australia
+# Maintained 2013-2021 by Christoph Willing, Brisbane Australia
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -32,7 +32,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nbd
-VERSION=${VERSION:-3.20}
+VERSION=${VERSION:-3.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/nbd/nbd.info b/network/nbd/nbd.info
index 598c407e01..9d79ae552a 100644
--- a/network/nbd/nbd.info
+++ b/network/nbd/nbd.info
@@ -1,8 +1,8 @@
 PRGNAM="nbd"
-VERSION="3.20"
+VERSION="3.21"
 HOMEPAGE="https://nbd.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/nbd/nbd-3.20.tar.xz"
-MD5SUM="910fe6c152f8c30ad8608388e6a4ce89"
+DOWNLOAD="https://downloads.sourceforge.net/nbd/nbd-3.21.tar.xz"
+MD5SUM="c51c4c500fe1ed84c3d5d5dd2ca71d23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ncp/README b/network/ncp/README
new file mode 100644
index 0000000000..21f741ce7d
--- /dev/null
+++ b/network/ncp/README
@@ -0,0 +1,16 @@
+ncp (fast file copy tool for LANs)
+
+"ncp" is a utility for copying files in a LAN. It has absolutely no
+security or integrity checking, no throttling, no features, except
+one: you don't have to type the coordinates of your peer.
+
+Basically it works like this:
+
+ 1. You and your buddy want to play Quake.
+ 2. Your buddy has a level that you don't have.
+ 3. He types "npush filename" and waits. npush sends out UDP
+    announcement packets proclaiming that someone wants to send
+    something.
+ 4. You type "npoll". npoll waits until it sees one of these packets.
+ 5. The files are copied with tar over a TCP socket, so permissions and
+    file dates (and if you are root, owners) are preserved.
diff --git a/network/ncp/README.upstream b/network/ncp/README.upstream
new file mode 100644
index 0000000000..d25d9b1c2d
--- /dev/null
+++ b/network/ncp/README.upstream
@@ -0,0 +1,54 @@
+                      ncp - a fast file copy tool for LANs
+
+(Note: This is from 2000 and has not been touched since. I still use it on a
+daily basis)
+
+Download it from http://dl.fefe.de/ncp-1.2.4.tar.bz2 [pgp sig]! The current
+version is 1.2.4. Recent changes: switch to libowfat
+
+Good news: I got an email from Ripclaw from Rock Linux who told me that they are
+going to integrate ncp.
+
+Please note that on recent IPv6 implementations, link-local addresses are not
+valid without specifying an interface, so you can't npoll with a link-local
+address on the command line. Standard npush/npoll now works with link-local
+addresses, though. Due to Linux 2.4.0test brokenness, you currently can't npoll
+from the same machine that runs npush.
+
+Since ncp is based on libdjb, it features full IPv6 support and the DNS resolver
+is built in, i.e. no more security problems because of lame libc functions.
+
+I also provide a statically linked x86 Linux binary [sig] compressed with upx
+which only weighs in at ~20k. I shrunk the binary with diet libc.
+
+npush will now use IPv6 and IPv4 multicast on the multicast groups
+ff02::6e63:7030 (6e63:7030 == 'ncp0') and 224.110.99.112 (110.99.112 == 'ncp').
+If both methods fail, npush will resort to the broadcast packets used by
+previous versions. You can force the broadcast method by passing "-b" to npush
+so that previous npoll versions can see the announcements.
+
+"ncp" is a utility for copying files in a LAN. It has absolutely no security or
+integrity checking, no throttling, no features, except one: you don't have to
+type the coordinates of your peer.
+
+Please note that the DNS resolver does not use /etc/hosts (as that would not
+work with IPv6 anyway), so you should have a properly configured DNS server.
+
+Basically it works like this:
+ 1. You and your buddy want to play Quake
+ 2. Your buddy has a level that you don't have
+ 3. He types npush filename and waits. npush sends out UDP announcement packets
+    proclaiming that someone wants to send something
+ 4. You type npoll. npoll waits until it sees one of these packets
+ 5. The files are copied with tar over a TCP socket, so permissions and file
+    dates (and if you are root, owners) are preserved.
+
+There are other usage modes. You can also use it like this:
+
+  peer1$ ncp
+                           peer2$ ncp peer1 file1 file2 file3
+
+or like this:
+
+  peer1$ npush file1
+                           peer2$ npoll peer1
diff --git a/network/ncp/ncp.SlackBuild b/network/ncp/ncp.SlackBuild
new file mode 100644
index 0000000000..3163631086
--- /dev/null
+++ b/network/ncp/ncp.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Slackware build script for ncp
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=ncp
+VERSION=${VERSION:-1.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 644 *
+
+# We want symlinks, not hardlinks.
+sed -i 's,ln -f,ln -s,' GNUmakefile
+
+# The libowfat detection stuff needs a little help...
+make PREFIX=/usr CFLAGS="$SLKCFLAGS -Wl,-s -I/opt/diet/include/libowfat"
+make install PREFIX=$PKG/usr
+gzip $PKG/usr/man/man1/*.1
+ln -s npush.1.gz $PKG/usr/man/man1/npoll.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Upstream doesn't include a README with the source, so here's the web page
+# rendered as text (with links).
+cat $CWD/README.upstream > $PKG/usr/doc/$PRGNAM-$VERSION/README
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ncp/ncp.info b/network/ncp/ncp.info
new file mode 100644
index 0000000000..8da636b238
--- /dev/null
+++ b/network/ncp/ncp.info
@@ -0,0 +1,10 @@
+PRGNAM="ncp"
+VERSION="1.2.4"
+HOMEPAGE="http://www.fefe.de/ncp/"
+DOWNLOAD="http://dl.fefe.de/ncp-1.2.4.tar.bz2"
+MD5SUM="421c4855bd3148b7d0a4342942b4bf13"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libowfat"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/ncp/slack-desc b/network/ncp/slack-desc
new file mode 100644
index 0000000000..4895444571
--- /dev/null
+++ b/network/ncp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+ncp: ncp (fast file copy tool for LANs)
+ncp:
+ncp: "ncp" is a utility for copying files in a LAN. It has absolutely no
+ncp: security or integrity checking, no throttling, no features, except
+ncp: one: you don't have to type the coordinates of your peer.
+ncp:
+ncp:
+ncp:
+ncp:
+ncp:
+ncp:
diff --git a/network/neomutt/README b/network/neomutt/README
index 8bdc28441f..44dbb59cb1 100644
--- a/network/neomutt/README
+++ b/network/neomutt/README
@@ -6,14 +6,14 @@ for selecting groups of messages.
 
 Optional dependencies:
 
-* lua53 or lua52 - Powerful, fast, light-weight, embeddable scripting
-  language
 * notmuch - fast mail indexer for maildir
 * kyotocabinet - straightforward implementation of DBM
 * libidn2 - GNU IDN Library version 2
+* lua53 - Powerful, fast, light-weight, embeddable scripting language
+  NOTE: this won't work if you have multiple versions of lua installed.
 
 This script builds neomutt without optional support
 for idn2, notmuch, lua and kyotocabinet.
 You can be enabled with:
 
-USENOTMUCH=yes USELUA=yes USEKYOTO=yes USEIDN2:-yes ./neomutt.SlackBuild
+# USENOTMUCH=yes USEKYOTO=yes USEIDN2=yes USELUA=yes ./neomutt.SlackBuild
diff --git a/network/neomutt/neomutt.SlackBuild b/network/neomutt/neomutt.SlackBuild
index 29cc4400ae..c0fc2c0cf3 100644
--- a/network/neomutt/neomutt.SlackBuild
+++ b/network/neomutt/neomutt.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for neomutt
 #
-# Copyright 2016-2020 Corrado Franco (https://corradofranco.it)
+# Copyright 2016-2021 Corrado Franco (https://corradofranco.it)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
 
 PRGNAM=neomutt
-VERSION=${VERSION:-20200925}
+VERSION=${VERSION:-20210205}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --full-doc \
   --host=$ARCH-slackware-linux \
   --build=$ARCH-slackware-linux \
-  $LUA $NOTMUCH $KYOTO $IDN2
+  $NOTMUCH $KYOTO $IDN2 $LUA
 
 make
 make DESTDIR=$PKG install
diff --git a/network/neomutt/neomutt.info b/network/neomutt/neomutt.info
index f79fd525db..a0c239cdb8 100644
--- a/network/neomutt/neomutt.info
+++ b/network/neomutt/neomutt.info
@@ -1,8 +1,8 @@
 PRGNAM="neomutt"
-VERSION="20200925"
+VERSION="20210205"
 HOMEPAGE="https://github.com/neomutt/neomutt"
-DOWNLOAD="https://github.com/neomutt/neomutt/archive/20200925/neomutt-20200925.tar.gz"
-MD5SUM="9123ea811c8c0b292669d088b3018b9e"
+DOWNLOAD="https://github.com/neomutt/neomutt/archive/20210205/neomutt-20210205.tar.gz"
+MD5SUM="4d890c49634a71550292d128acab7f7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/netsniff-ng/netsniff-ng.SlackBuild b/network/netsniff-ng/netsniff-ng.SlackBuild
index 7361f3b8a5..9690f034ad 100644
--- a/network/netsniff-ng/netsniff-ng.SlackBuild
+++ b/network/netsniff-ng/netsniff-ng.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for netsniff-ng
 
-# Copyright 2013-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netsniff-ng
-VERSION=${VERSION:-0.6.7}
+VERSION=${VERSION:-0.6.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/netsniff-ng/netsniff-ng.info b/network/netsniff-ng/netsniff-ng.info
index f2bacc3358..7db97b295c 100644
--- a/network/netsniff-ng/netsniff-ng.info
+++ b/network/netsniff-ng/netsniff-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="netsniff-ng"
-VERSION="0.6.7"
+VERSION="0.6.8"
 HOMEPAGE="http://netsniff-ng.org"
-DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.7.tar.xz"
-MD5SUM="2aba9835923c30721fa891a9dc59507c"
+DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.8.tar.xz"
+MD5SUM="477580690816dc7eacaaca444a6bdb55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libcli libnet nacl liburcu GeoIP"
diff --git a/network/newsboat/newsboat.SlackBuild b/network/newsboat/newsboat.SlackBuild
index 69bac9db07..496474cb6f 100644
--- a/network/newsboat/newsboat.SlackBuild
+++ b/network/newsboat/newsboat.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for newsboat
 
 # Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=newsboat
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-2.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/newsboat/newsboat.info b/network/newsboat/newsboat.info
index 0fb6a2c401..5898ff4878 100644
--- a/network/newsboat/newsboat.info
+++ b/network/newsboat/newsboat.info
@@ -1,161 +1,213 @@
 PRGNAM="newsboat"
-VERSION="2.21"
+VERSION="2.23"
 HOMEPAGE="https://www.newsboat.org/"
-DOWNLOAD="https://newsboat.org/releases/2.21/newsboat-2.21.tar.xz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/addr2line/addr2line-0.12.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.49.crate \
+DOWNLOAD="https://newsboat.org/releases/2.23/newsboat-2.23.tar.xz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/addr2line/addr2line-0.14.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler/adler-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.55.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.6.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.6.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitvec/bitvec-0.19.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/block/block-0.1.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.57.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.36+curl-7.71.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/codespan-reporting/codespan-reporting-0.9.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.41+curl-7.75.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cxx-build/cxx-build-0.5.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cxx/cxx-0.5.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cxxbridge-flags/cxxbridge-flags-0.5.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cxxbridge-macro/cxxbridge-macro-0.5.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-rs/gettext-rs-0.5.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-sys/gettext-sys-0.19.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gimli/gimli-0.21.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/form_urlencoded/form_urlencoded-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/funty/funty-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-rs/gettext-rs-0.6.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-sys/gettext-sys-0.21.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/gimli/gimli-0.23.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lexical-core/lexical-core-0.7.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.77.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lexical-core/lexical-core-0.7.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.90.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/link-cplusplus/link-cplusplus-1.0.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/locale_config/locale_config-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/malloc_buf/malloc_buf-0.0.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.4.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/natord/natord-1.0.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-5.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-6.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.44.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/objc-foundation/objc-foundation-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/objc/objc-0.2.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/objc_id/objc_id-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/object/object-0.20.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.58.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/object/object-0.22.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.7.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/proptest/proptest-0.10.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/radium/radium-0.5.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.8.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.6.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.16.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.18.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rusty-fork/rusty-fork-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/section_testing/section_testing-0.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/scratch/scratch-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/section_testing/section_testing-0.0.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/static_assertions/static_assertions-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.55.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tap/tap-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-0.3.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.13.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.16.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.11.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wyz/wyz-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.2.0.crate"
-MD5SUM="734997ba9a9e70f0a5e41bb6c195d0d2 \
-        25a74a8231216192a91e873cf05214dc \
-        8a679a0b3b17299c1b4d20781431e071 \
-        837ec91351db79aee59d6c96111460b0 \
-        38a5278571eefda86428a8ebfc1cedc2 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        96762c62b23169ec325ac300fb7d1ee7 \
+MD5SUM="fe5761463f29b71da688ca8a80c77ecf \
+        e1373077f219ed66a14857a718ed79e1 \
+        c9d0c8f38c6686e47c29fe9b409c25c2 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
+        c83252f91435a921e7e4434956010344 \
+        c6443ec8d007c729ba5482008d0c864d \
+        c0a1f5967a1581beff2565ffeee3fb7b \
         8f8acc3c1caff2043085a0cc28a92757 \
-        90ba73709b69e02ca4e8a6fad0fb8c9d \
+        45a867175c81501378699f80724393c0 \
         6799c26a7eacaf8e58d3e45c6c5add89 \
+        f353cf73f811990f1529b637065de949 \
         ea2d23ceb9f98853a7dffc6c02884464 \
         e502e6c6b0dca9c1ae2d99e92b26f645 \
-        11151ad1e1d27453a664c89a0b863d31 \
+        b3ebb5d4433417e998d982d46334a6f4 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        a47dd336c3099e7986f926b48c64ec6a \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
         bc79e0eb364df515a33755ac9a581cfd \
-        bd713a78715a26ad315f0b10bb4a17a2 \
+        7f5a0fb65f15b9a7f4b92ead2005437f \
+        965d3dda0ed58748e6f0a615ebb70840 \
+        4444b73f52b93818d14d68b971b1b1a3 \
+        938ac35135c5cc2c735262d8698a0498 \
+        c71702f6505787cd3b70c77a9cd26d93 \
+        7a992127d3bc3b08965068e628ebd36c \
         8dab3b3ec00dc56cffde0b0c410d47b5 \
-        de1228e571c94ef53ec4c21db57279ab \
-        82531b1bfc764100ef1e65a396ce66c5 \
-        3df461a703a246a44414887232007b7d \
-        3b292e94713350e991d41c30a489634b \
+        e3225eb6ecda0f2c3d1d09c8450f7ef8 \
+        27091b1ee345635aa18fb8bfc51f5b1d \
+        704babd757a22f163230a36fa5474890 \
+        3002f779af7b5eeab4161354dc7c79d8 \
+        c7050135ef75f62fcbd5313898ec7884 \
+        69bddbd44804ae43b7f81cb0403b500c \
+        8dc2849c66f31ecaec6a5ff699deb070 \
         54ac4c56d9ec2800b8428020f24be67c \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        a0d733f112d00b5a385e88f9f3b53e96 \
-        ed2d6dbb4c04586444e1aef9d4b27d90 \
-        98890160c8eba014c65eabbd247b55b6 \
+        a5ca2def8bdf1deda1d2151bfb0f9800 \
+        1775405476046e602fdf8eb892cca057 \
+        e5768043e447a7423f030c1394440502 \
+        7953eda62592968ef716363c206495ba \
         6fa7c4b0da26b511570845e41527bc8f \
         7c81e7a61ec172a229d6fdbc553e883d \
         7916dcd738a8fa6a2798754c20d6e146 \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        db1ea84c5ee1938888b78e4050dd5cfd \
+        fa3630e5867493e09296155763e4f4a0 \
+        c291ac2f4465c030c058a7c1bc595783 \
         5a9b94ba54ea1f52f2a496ba982e3282 \
-        bd9b057de16e5b299bcda0894cfd823e \
-        759816fe5b617674ae5dee83e3c3e6e2 \
-        2daa59d0efd38e9b5fbb2658b080eaa1 \
+        31afb592628dd2c4da5efbc649fd8066 \
+        a8ec1126ef06244ac1e3773981a005f1 \
+        c0e036fd990d0c9cae11b5876a5cb572 \
         aecd889de42c8168e1bc97a6f2720d8f \
         b4dcac855af5df71f3383d86c4a96b78 \
         fd9aa273ad560dedd00ddcf3dbe808ce \
-        22d284a6253f4fd9b34ae40ff88f57f8 \
-        a37a5b604bc2fd746aaa12623bab6154 \
-        48067cc7d8ace5851af5f3ea557fee17 \
+        edb0836579d7124116fbb2d8eabb3e5b \
+        921832a39e8a8aac72dfd9ed02227a87 \
         f490982aceabdbd515348f63e638a782 \
-        d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        d8bd5a8204fe41dc04b344884b55381b \
+        448bc61aee07661464d98da7660e9a1d \
+        a4ff7abd41c57dfd24bbd4b50edb848f \
+        0736e4f76f4f8f0a29563b0608ca3974 \
         400f57adb8d5ab059a2df92c7e3b0268 \
         3181dca31efe33cbed29a45d0ec67848 \
+        ddd3199850a8a6a8db642923ed603a99 \
+        b807d4f7a87f5fbdcc4ef008cca53a4c \
         66d1cb32dce999907409f636f004b884 \
+        e878596904877d1d7933d8f89a63dd49 \
         0a80ed36a125ac3cdfa09f8707055873 \
+        bacea6e63b5b0b7a55a8881b47d80f3a \
         a0f55fda89c0f97784edb18f4c253a49 \
+        b5b168b1af99cbb8c0f5556ffe56f1e5 \
         b269356e8646f3184a0e8d52a58cee69 \
+        69e9436d5c9889a6fdf199dfc5c3d3fe \
         f81b88d1f8f9d0bc18849ad58b2f1b66 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        24118e5657591c6f208dbb1d77fbc482 \
-        eee136546e9f4735577dd20f45727c69 \
+        381ebb79fffdf657a666ee577323039e \
+        13373372c7ce2e894925d846625a7987 \
+        40d1ab8fd9b6e5e376b0839a9132abe1 \
         0538d1da369f3e3f0412aa4d735c1b61 \
-        94136c77f70313d3162e031638fc67ed \
+        b5926b0ac31b2bca1675c6eb1f936d0b \
         13268e6ab4023043e6dd8e993ce8b88a \
         a69721c73263cd2040e1a5f120b03a6f \
-        82d23d1b89a2d4ccb381ba72f0b3f0db \
+        8d2ed9bfda95009d8f61b5f575e91c13 \
+        b13390ad50aa277e39e4d46f7ed3eb14 \
         c9defe80406280bcfce4ecf31c0200b3 \
-        bb3ae104a9fa1b31568cc98c920a4653 \
+        83743b5ff7a15361f45fe0a2eb0b1575 \
+        54346edfb0ec58936fa2af45908969ac \
+        6e328718765f2352dd34f10215488fbb \
+        ebdff467249aa3dca005a441dc824236 \
         a8de006fe0c7e373c560dd51599287a8 \
         a5dd75e77c7324f5c1d2d372c990d0a7 \
-        9d66208e00715217a8c1f2e40efe4a0c \
-        34add515c13318e0c661956f6590387e \
+        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        097e3652f1adda8e7e425a7f5c288e27 \
+        7bfcad253aff26bc26c5e3521f3ba891 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
-        c3be058b692f0e9b25a3219b7b5d940c \
+        62fa1c42f9b351d9c411a4c86eacb707 \
         4272c279b06b88f8b0ffce7109348e27 \
-        81821d39675a1f584546b9920e5d6b5d \
-        bff823ec07c5fbcc3e425c9c9e4b38a6 \
+        a51c43692084979295641a7ffba4b297 \
+        871061b3dab2a322a13effd0a800b05f \
+        e17e2583e10c6947982de78aeae42a5c \
         8b01b016a9b6deebc1b43f296057efb5 \
         6708629acf3d2ecb7404e43255d2df85 \
+        a312b55a428f827a91097d1d8497b02b \
         6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
         0498c4a11448bfc35dc7bb2caa64c753 \
+        c533b4ecdd56b5830c4cc79a6cf6f9b4 \
         1628d3f26e3f952d8c43973ade1f2dad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/ngrok/README b/network/ngrok/README
new file mode 100644
index 0000000000..13f022d63b
--- /dev/null
+++ b/network/ngrok/README
@@ -0,0 +1,4 @@
+ngrok (Tunnel local servers to be reachable via the internet)
+
+ngrok allows you to expose TCP/TLS/HTTP servers running on your local machine
+to the internet. Just tell ngrok what port your server is listening on.
diff --git a/network/ngrok/ngrok.SlackBuild b/network/ngrok/ngrok.SlackBuild
new file mode 100644
index 0000000000..b3f08c9ce0
--- /dev/null
+++ b/network/ngrok/ngrok.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for ngrok
+
+# Copyright 2020-2021 Ebben Aries <slackbuilds@dscp.org>
+# 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=ngrok
+VERSION=${VERSION:-2.3.37}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+case "$ARCH" in
+  x86_64)
+    BINARCH="amd64"
+    ;;
+  i?86)
+    BINARCH="386"
+    ;;
+  *)
+    echo "$ARCH is not supported."
+    exit 1
+    ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/${PRGNAM}-${VERSION}-linux-${BINARCH}.zip
+chown -R root:root .
+find -L . \
+\( -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 {} \;
+
+mkdir -p $PKG/usr/bin
+install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ngrok/ngrok.info b/network/ngrok/ngrok.info
new file mode 100644
index 0000000000..5258614f8c
--- /dev/null
+++ b/network/ngrok/ngrok.info
@@ -0,0 +1,10 @@
+PRGNAM="ngrok"
+VERSION="2.3.37"
+HOMEPAGE="https://ngrok.com"
+DOWNLOAD="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-2.3.37-linux-386.zip"
+MD5SUM="2569c067239b3cd270f7032cd4e812fa"
+DOWNLOAD_x86_64="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-2.3.37-linux-amd64.zip"
+MD5SUM_x86_64="a1ec825b2c854e3e1db7f70d44d46941"
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/network/ngrok/slack-desc b/network/ngrok/slack-desc
new file mode 100644
index 0000000000..b449849acf
--- /dev/null
+++ b/network/ngrok/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler----------------------------------------------------------|
+ngrok: ngrok (Tunnel local servers to be reachable via the internet)
+ngrok:
+ngrok: ngrok allows you to expose TCP/TLS/HTTP servers running on your local
+ngrok: machine to the internet. Just tell ngrok what port your server is
+ngrok: listening on.
+ngrok:
+ngrok: Home-Page: https://ngrok.com
+ngrok:
+ngrok:
+ngrok:
+ngrok:
diff --git a/network/nicotine+/README b/network/nicotine+/README
index 893f99ddb8..b1a132acdd 100644
--- a/network/nicotine+/README
+++ b/network/nicotine+/README
@@ -1,5 +1,6 @@
-Nicotine+ is a client for the SoulSeek filesharing network.  It was
-"forked" from Nicotine, Hyriand's Soulseek client, which in turn was
-forked from the PySoulSeek project by Alexander Kanavin.
+Nicotine+ is a graphical client for the Soulseek peer-to-peer file
+sharing network.
 
-Optional dependencies are GeoIP-Python and miniupnpc.
+Nicotine+ aims to be a pleasant, Free and Open Source (FOSS)
+alternative to the official Soulseek client, providing additional
+functionality while keeping current with the Soulseek protocol.
diff --git a/network/nicotine+/nicotine+.SlackBuild b/network/nicotine+/nicotine+.SlackBuild
index 147a0fe19e..4c00a14561 100644
--- a/network/nicotine+/nicotine+.SlackBuild
+++ b/network/nicotine+/nicotine+.SlackBuild
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nicotine+
-SRCNAM=nicotine
-VERSION=${VERSION:-2.0.1}
+SRCNAM=nicotine-plus
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,15 +59,14 @@ find -L . \
 
 # Fix paths.
 sed -i 's|share/man|man|' setup.py
-sed -i "s|share/doc/nicotine|doc/$PRGNAM-$VERSION|" \
-  setup.py pynicotine/gtkgui/frame.py
+sed -i "s|share/doc/nicotine|doc/$PRGNAM-$VERSION|" setup.py
 
 python3 setup.py install --root=$PKG
 
 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
 
-cp -a AUTHORS.md COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/nicotine+/nicotine+.info b/network/nicotine+/nicotine+.info
index 9918910e10..ee5df51c22 100644
--- a/network/nicotine+/nicotine+.info
+++ b/network/nicotine+/nicotine+.info
@@ -1,10 +1,10 @@
 PRGNAM="nicotine+"
-VERSION="2.0.1"
-HOMEPAGE="http://nicotine-plus.org/"
-DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/releases/download/2.0.1/nicotine-2.0.1.tar.gz"
-MD5SUM="a30d4f251978b9b8cef9e1c352ada57c"
+VERSION="3.0.0"
+HOMEPAGE="https://nicotine-plus.org/"
+DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/archive/3.0.0/nicotine-plus-3.0.0.tar.gz"
+MD5SUM="51bea3cfd9df3fac7fe7631edc3b2f70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mutagen pygobject3-python3"
+REQUIRES="pygobject3-python3"
 MAINTAINER="Sasha Abbott"
 EMAIL="sashaa@disroot.org"
diff --git a/network/nicotine+/slack-desc b/network/nicotine+/slack-desc
index defdaf7da1..cd5c55343a 100644
--- a/network/nicotine+/slack-desc
+++ b/network/nicotine+/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-nicotine+: nicotine+ (SoulSeek client written in Python)
+nicotine+: nicotine+ (graphical client for Soulseek)
 nicotine+:
-nicotine+: Nicotine+ is a SoulSeek client written in Python, based on the
-nicotine+: PySoulSeek project by Alexander Kanavin.  It features, among other
-nicotine+: things, a completely rewritten graphical user interface which
-nicotine+: uses the GTK3 toolkit and a less strict user request policy.
-nicotine+: Nicotine+ is a fork of Hyriand's original Nicotine Soulseek client.
+nicotine+: Nicotine+ is a graphical client for the Soulseek peer-to-peer file
+nicotine+: sharing network.
 nicotine+:
-nicotine+: Homepage: http://nicotine-plus.org/
+nicotine+: Nicotine+ aims to be a pleasant, Free and Open Source (FOSS)
+nicotine+: alternative to the official Soulseek client, providing additional
+nicotine+: functionality while keeping current with the Soulseek protocol.
 nicotine+:
+nicotine+: Homepage: https://nicotine-plus.org/
 nicotine+:
diff --git a/network/nordvpn/nordvpn.SlackBuild b/network/nordvpn/nordvpn.SlackBuild
index a8cc942918..710a1e1935 100644
--- a/network/nordvpn/nordvpn.SlackBuild
+++ b/network/nordvpn/nordvpn.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nordvpn
-VERSION=${VERSION:-3.8.4}
+VERSION=${VERSION:-3.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/nordvpn/nordvpn.info b/network/nordvpn/nordvpn.info
index ce77efd724..1943e15c83 100644
--- a/network/nordvpn/nordvpn.info
+++ b/network/nordvpn/nordvpn.info
@@ -1,10 +1,10 @@
 PRGNAM="nordvpn"
-VERSION="3.8.4"
+VERSION="3.8.6"
 HOMEPAGE="https://www.nordvpn.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://repo.nordvpn.com/yum/nordvpn/centos/x86_64/Packages/n/nordvpn-3.8.4-1.x86_64.rpm"
-MD5SUM_x86_64="1fb07cbca09f1a59c5cd044f41a141e1"
+DOWNLOAD_x86_64="https://repo.nordvpn.com/yum/nordvpn/centos/x86_64/Packages/n/nordvpn-3.8.6-1.x86_64.rpm"
+MD5SUM_x86_64="16b9f8b5ea5224e445427a4b1dbf4093"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/nsd/nsd.SlackBuild b/network/nsd/nsd.SlackBuild
index a613e6f211..6deb8f862c 100644
--- a/network/nsd/nsd.SlackBuild
+++ b/network/nsd/nsd.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=nsd
 USER=$PRGNAM
 GROUP=$PRGNAM
-VERSION=${VERSION:-4.2.4}
+VERSION=${VERSION:-4.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,7 +78,7 @@ cd "$TMP"
 rm -rf "$PRGNAM-$VERSION"
 tar xvf "$CWD/$PRGNAM-$VERSION.tar.gz"
 cd "$PRGNAM-$VERSION"
-chown -R root:root .
+#chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
diff --git a/network/nsd/nsd.info b/network/nsd/nsd.info
index 02c33de553..5d20217e0d 100644
--- a/network/nsd/nsd.info
+++ b/network/nsd/nsd.info
@@ -1,8 +1,8 @@
 PRGNAM="nsd"
-VERSION="4.2.4"
+VERSION="4.3.3"
 HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/about/"
-DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.4.tar.gz"
-MD5SUM="d9e7b2951675af166ebf5003fd6a08b0"
+DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.3.tar.gz"
+MD5SUM="e80bd8845b4f3ba514fd255343c5097c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nsd/slack-desc b/network/nsd/slack-desc
index fce11713a0..dc16e047ac 100644
--- a/network/nsd/slack-desc
+++ b/network/nsd/slack-desc
@@ -11,9 +11,9 @@ nsd:
 nsd: NSD is an authoritative only, high performance, simple and open
 nsd: source name server.
 nsd:
+nsd: Website: https://www.nlnetlabs.nl/projects/nsd/about/
 nsd:
 nsd:
 nsd:
 nsd:
-nsd: Website: https://www.nlnetlabs.nl/projects/nsd/about/
 nsd:
diff --git a/network/nss-mdns/look-in-run-for-avahi-socket.patch b/network/nss-mdns/look-in-run-for-avahi-socket.patch
deleted file mode 100644
index 4190ae87f6..0000000000
--- a/network/nss-mdns/look-in-run-for-avahi-socket.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur nss-mdns-0.10.orig/src/Makefile.am nss-mdns-0.10/src/Makefile.am
---- nss-mdns-0.10.orig/src/Makefile.am	2007-02-08 10:42:23.000000000 -0600
-+++ nss-mdns-0.10/src/Makefile.am	2019-08-28 23:24:49.690739951 -0500
-@@ -22,7 +22,7 @@
- AM_CFLAGS = \
- 	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
- 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
--	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
-+	-DAVAHI_SOCKET=\"/run/avahi-daemon/socket\"
- 
- #AM_CFLAGS += -DNDEBUG=1 -Os
- 
-diff -Nur nss-mdns-0.10.orig/src/Makefile.in nss-mdns-0.10/src/Makefile.in
---- nss-mdns-0.10.orig/src/Makefile.in	2007-05-12 09:55:34.000000000 -0500
-+++ nss-mdns-0.10/src/Makefile.in	2019-08-28 23:24:39.273681707 -0500
-@@ -409,7 +409,7 @@
- # This cool debug trap works on i386/gcc only
- AM_CFLAGS = -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
- 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
--	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" \
-+	-DAVAHI_SOCKET=\"/run/avahi-daemon/socket\" \
- 	'-DDEBUG_TRAP=__asm__("int $$3")'
- AM_LDFLAGS = -avoid-version -module -export-dynamic
- lib_LTLIBRARIES = $(am__append_1) $(am__append_2)
diff --git a/network/nss-mdns/nss-mdns.SlackBuild b/network/nss-mdns/nss-mdns.SlackBuild
index e3984e3cd1..42aeafa5f8 100644
--- a/network/nss-mdns/nss-mdns.SlackBuild
+++ b/network/nss-mdns/nss-mdns.SlackBuild
@@ -2,11 +2,11 @@
 
 # Slackware build script for nss-mdns
 # Written by Menno Duursma <druiloor@zonnet.nl>
-# Maintained by Robby Workman <rw@rlworkman.net>
+# Maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=nss-mdns
-VERSION=${VERSION:-0.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.14.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,8 +51,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/look-in-run-for-avahi-socket.patch
+#patch -p1 < $CWD/look-in-run-for-avahi-socket.patch
 
+AVAHI_SOCKET="/run/avahi-daemon/socket" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -60,8 +61,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --disable-legacy \
-  --enable-avahi \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make
@@ -74,9 +74,8 @@ mkdir -p $PKG/etc
 cat $CWD/mdns.allow > $PKG/etc/mdns.allow.new
 cat $CWD/nsswitch.conf-mdns > $PKG/etc/nsswitch.conf-mdns.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a [A-Z][A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/nss-mdns/nss-mdns.info b/network/nss-mdns/nss-mdns.info
index c4eaec54a6..db0d6deb38 100644
--- a/network/nss-mdns/nss-mdns.info
+++ b/network/nss-mdns/nss-mdns.info
@@ -1,8 +1,8 @@
 PRGNAM="nss-mdns"
-VERSION="0.10"
-HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/"
-DOWNLOAD="http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz"
-MD5SUM="03938f17646efbb50aa70ba5f99f51d7"
+VERSION="0.14.1"
+HOMEPAGE="https://github.com/lathiat/nss-mdns"
+DOWNLOAD="https://github.com/lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz"
+MD5SUM="39b7f6ccfa0605321c7ee6e78478b83b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="avahi"
diff --git a/network/nweb/README b/network/nweb/README
new file mode 100644
index 0000000000..9f882d64d9
--- /dev/null
+++ b/network/nweb/README
@@ -0,0 +1,23 @@
+A tiny web server in C.
+
+nweb is a small and very safe mini web server nweb only servers out
+file/web pages with extensions named below and only from the named
+directory or its sub-directories.
+
+There is no fancy features = safe and secure.
+
+Example: nweb 8181 /home/nwebdir &
+
+Only Supports: gif jpg jpeg png ico zip gz tar htm html
+Not Supported: URLs including "..", Java, Javascript, CGI
+Not Supported: directories / /etc /bin /lib /tmp /usr /dev /sbin
+
+client.c:
+
+Also included is the source for a client.  This client.c program is
+designed to fake being a web browser. It sends the expected requests to
+the web server over a network socket connection and displays the results
+as text rather than graphically displaying the results. In the code you
+will have to change the two lines as below to match your web server or
+nweb server.  See README.client for instructions.  The client.c source
+code can be found in the /usr/doc/nweb-<VERSION> directory.
diff --git a/network/nweb/README.client b/network/nweb/README.client
new file mode 100644
index 0000000000..1fd848e0bd
--- /dev/null
+++ b/network/nweb/README.client
@@ -0,0 +1,64 @@
+                                      client.c
+
+This client.c program is designed to fake being a web browser. It sends the
+expected requests to the web server over a network socket connection and
+displays the results as text rather than graphically displaying the results. In
+the code you will have to change the two lines as below to match your web
+server or nweb server.
+
+/* YOU WILL HAVE TO CHANGE THESE TWO LINES TO MATCH YOUR CONFIG / #define PORT
+ * 8181 /
+Port number as an integer - web server default is 80 / #define IP_ADDRESS
+"192.168.0.8" / IP Address as a string */
+
+The default is to request the /index.html from the web server. If you want to
+request another file then change the GET line as below:
+
+char *command = "GET /index.html HTTP/1.0 \r\n\r\n" ;
+
+To, for example:
+
+char *command = "GET /nigel.jpg HTTP/1.0 \r\n\r\n" ;
+
+Then compile the program with: cc client.c -o client
+
+I save the output in to a file as putting a non-test file like .jpg to the
+terminal screen can cause chaos: client >output
+
+Then edit the output file: vi output
+
+In real life, the interaction of web browser and web server can be much more complex.
+
+ 1. The web browser can tell the web server about its name, version and capabilities.
+
+ 2. The web server can send complex file types line JavaScript or Java programs
+or other active components.
+
+ 3. They can maintain a longer connection over the socket for efficiency.
+
+ 4. Below is an example of my Firefox brower requesting an index.html file. I
+have added newline characters to make it readable - it is 1300 bytes long! I
+have no idea what most of it is about. You will have to read the The World Wide
+Web Consortium (W3C) at http://www.w3.org for all the details.
+
+GET /index.html HTTP/1.1Host: myserver.home.com:80User-Agent: Mozilla/5.0 (W indows;
+U; Windows NT 5.1; en-GB; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28 (.NET CLR
+3.5.30729)Ac cept: image/png,image/;q=0.8,/*;q=0.5Accept-Language:
+en-gb,en;q=0.5Accept-Encoding: gzip,defla teAccept-Charset: ISO-8859-1,utf-8;
+q=0.7,*;q=0.7Keep-Alive: 115Connection: keep-alive**Referer:
+http://myserver.uk.home.com:8181/index.html**Cookie:
+__utma=101107545.1790272076.1316019590.13289002 55.1328908680.164;
+__utmz=101107545.1328566199.157.46.utmcsr=t.co|utmccn=(referral)|utmcmd=referral| u
+tmcct=/iTJx4DO1; UnicaNIODID=ZBr8gm79vIG-XKeoGGb; W3SSO_ACCESS=abc.home.com;
+ISP=70fdfc95
+d93011d783e4de784ea97766-70fdfc95d93011d783e4de784ea97766-f67749a8b899e8ceed7e940b8c4bf189;
+Prof ile=2000121913394303111032836125|EN|866|866.BDF|en-GB;
+_unam=693fb60-1337f162b72-11770d11-5; WLS intra_USERID=nigel@hotmail.com;
+ipcInfo=cc%3Duk%3Blc%3Den%3Bac%3Dall; iwm1p=214617669; bprememberme=nigel@
+hotmail.com; EPSPROFILE=EE2355DFE16AE020BE6C62FCB6BF5602;
+DWPERM=Xa.2/Xb.Xzso3-U35t8RWKvqBreGaQMgsP_RG
+Fl1124oIt-L-OPJIdSautkBN0D4NUp9JLlpUqPqB6CWOo-pgrJwhxNvvSfPAajgetaA2MOYwHfQPXPTRG9zwOMMR57EHQtXhOy5Om
+yzanyZthvVClm6uxvbwh0isEQ2Mm_9g2l7NjcA3RJdjuLaB3qlljOmyVuhDjBkgdNEb3PgYcCpbiu1FUzXrhPalhgsbAj7NBkaY88
+Yyg/Xc./Xd./Xf./Xg.1696801
+
+I hope this has been instructive, thanks, Nigel Griffiths
diff --git a/network/nweb/nweb.SlackBuild b/network/nweb/nweb.SlackBuild
new file mode 100644
index 0000000000..cd2ac1d290
--- /dev/null
+++ b/network/nweb/nweb.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for nweb
+
+# Copyright 2021  Dave Woodfall <dave@slackbuilds.org>
+# 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=nweb
+COMMIT=${COMMIT:-867a6dd46298c882501f5c26d31ee821177542ab}
+VERSION=${VERSION:-23_"$( printf %s $COMMIT | cut -c 1-7 )"}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr/bin $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+${CC:-gcc} $SLKCFLAGS nweb${VERSION:0:2}.c -o $PKG/usr/bin/nweb
+strip --strip-unneeded $PKG/usr/bin/nweb
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{www-example,client}
+
+cp -a client.c $PKG/usr/doc/$PRGNAM-$VERSION/client
+cp -a nigel.jpg favicon.ico nweb.log index.html \
+  $PKG/usr/doc/$PRGNAM-$VERSION/www-example
+
+cp -a README.md $CWD/README.client $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/nweb/nweb.info b/network/nweb/nweb.info
new file mode 100644
index 0000000000..1690b8b5b1
--- /dev/null
+++ b/network/nweb/nweb.info
@@ -0,0 +1,10 @@
+PRGNAM="nweb"
+VERSION="23_867a6dd"
+HOMEPAGE="https://github.com/ankushagarwal/nweb"
+DOWNLOAD="https://github.com/ankushagarwal/nweb/archive/867a6dd46298c882501f5c26d31ee821177542ab/nweb-867a6dd46298c882501f5c26d31ee821177542ab.tar.gz"
+MD5SUM="7570ab89a441f1b11f2ab099660b9daa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/nweb/slack-desc b/network/nweb/slack-desc
new file mode 100644
index 0000000000..a271191935
--- /dev/null
+++ b/network/nweb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+nweb: nweb (A tiny web server in C)
+nweb:
+nweb: nweb is a small and very safe mini web server nweb only servers out
+nweb: file/web pages with certain extensions and only from the named
+nweb: directory or its sub-directories.
+nweb:
+nweb: There is no fancy features = safe and secure.
+nweb:
+nweb: Example: nweb 8181 /home/nwebdir &
+nweb:
+nweb:
diff --git a/network/onedrive/onedrive.SlackBuild b/network/onedrive/onedrive.SlackBuild
index 7992a367a1..42c308379a 100644
--- a/network/onedrive/onedrive.SlackBuild
+++ b/network/onedrive/onedrive.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=onedrive
-VERSION=${VERSION:-2.4.6}
+VERSION=${VERSION:-2.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/onedrive/onedrive.info b/network/onedrive/onedrive.info
index ccae3ce149..06af605f99 100644
--- a/network/onedrive/onedrive.info
+++ b/network/onedrive/onedrive.info
@@ -1,8 +1,8 @@
 PRGNAM="onedrive"
-VERSION="2.4.6"
+VERSION="2.4.7"
 HOMEPAGE="https://github.com/abraunegg/onedrive/releases"
-DOWNLOAD="https://github.com/abraunegg/onedrive/archive/v2.4.6/onedrive-2.4.6.tar.gz"
-MD5SUM="dceb33e1329a5aa89ef3dc28ee541b54"
+DOWNLOAD="https://github.com/abraunegg/onedrive/archive/v2.4.7/onedrive-2.4.7.tar.gz"
+MD5SUM="27c48b19cae2b9f2fe66228feaa9c719"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmd"
diff --git a/network/onioncat/README b/network/onioncat/README
index f45fc75710..8de34eae3d 100644
--- a/network/onioncat/README
+++ b/network/onioncat/README
@@ -1,5 +1,7 @@
-onioncat creates a transparent IP layer on top of Tor's hidden services.
-It trainsmits IP-based data transparently through the Tor network on a
-location hidden basis. You can think of it as a point-to -multipoint VPN
-between hidden services.
+OnionCat creates a transparent IPv6 layer on top of Tor's hidden
+services or I2P's tunnels. It transmits any kind of IP-based data
+transparently through the Tor/I2P network on a location hidden basis.
+You can think of it as a peer-to-peer VPN between hidden services.
 
+Having Tor/I2P installed is not required for building.
+The Tor/I2P installation does not have to be from SBo.
diff --git a/network/onioncat/onioncat.SlackBuild b/network/onioncat/onioncat.SlackBuild
index b9ae0507ea..03a618b06a 100644
--- a/network/onioncat/onioncat.SlackBuild
+++ b/network/onioncat/onioncat.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for onioncat
 
-# Copyright 2013-2019 Markus Reichelt, Aachen, DE
+# Copyright 2013-2021 Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # Now maintained by Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=onioncat
-VERSION=${VERSION:-0.2.8}
+VERSION=${VERSION:-0.3.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,9 +68,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-handle-http \
   --enable-packet-queue \
   --enable-rtt \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/network/onioncat/onioncat.info b/network/onioncat/onioncat.info
index 9887a18521..ea846300c0 100644
--- a/network/onioncat/onioncat.info
+++ b/network/onioncat/onioncat.info
@@ -1,8 +1,8 @@
 PRGNAM="onioncat"
-VERSION="0.2.8"
+VERSION="0.3.8"
 HOMEPAGE="https://www.cypherpunk.at/onioncat/"
-DOWNLOAD="https://www.cypherpunk.at/ocat/download/Source/stable/onioncat-0.2.8.tar.gz"
-MD5SUM="c4cd8a514c55471eee11719e1ff98b7c"
+DOWNLOAD="https://www.cypherpunk.at/ocat/download/Source/0.3/onioncat-0.3.8.tar.gz"
+MD5SUM="928e4bc2d2454d178d3ebddbf5a0436e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/onioncat/slack-desc b/network/onioncat/slack-desc
index f61e2634b1..8d2f9d9fdc 100644
--- a/network/onioncat/slack-desc
+++ b/network/onioncat/slack-desc
@@ -13,7 +13,7 @@ onioncat: services. It trainsmits IP-based data transparently through the Tor
 onioncat: network on a location hidden basis. You can think of it as a point-to
 onioncat: -multipoint VPN between hidden services.
 onioncat:
+onioncat: I2P is also supported.
 onioncat:
 onioncat: Website : https://www.cypherpunk.at/onioncat/
 onioncat:
-onioncat:
diff --git a/network/openfortivpn/openfortivpn.SlackBuild b/network/openfortivpn/openfortivpn.SlackBuild
index 5af085af73..b4b3eb02bb 100644
--- a/network/openfortivpn/openfortivpn.SlackBuild
+++ b/network/openfortivpn/openfortivpn.SlackBuild
@@ -26,7 +26,7 @@
 #
 
 PRGNAM=openfortivpn
-VERSION=${VERSION:-1.14.1}
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openfortivpn/openfortivpn.info b/network/openfortivpn/openfortivpn.info
index 04e2bdd786..f5af3f59fc 100644
--- a/network/openfortivpn/openfortivpn.info
+++ b/network/openfortivpn/openfortivpn.info
@@ -1,8 +1,8 @@
 PRGNAM="openfortivpn"
-VERSION="1.14.1"
+VERSION="1.16.0"
 HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.14.1/openfortivpn-1.14.1.zip"
-MD5SUM="25a24710f6fcaac66d8fa0b1941895eb"
+DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.16.0/openfortivpn-1.16.0.zip"
+MD5SUM="49da457d748059d455dec4c6dbff94fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild
index 0c25880e5d..b21a307c5f 100644
--- a/network/openresolv/openresolv.SlackBuild
+++ b/network/openresolv/openresolv.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for openresolv
 
 # Copyright 2012-2013 synbq Bucharest
-# Copyright 2017-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2021  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openresolv
-VERSION=${VERSION:-3.11.0}
+VERSION=${VERSION:-3.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openresolv/openresolv.info b/network/openresolv/openresolv.info
index dbda0208b4..3a5cdc223e 100644
--- a/network/openresolv/openresolv.info
+++ b/network/openresolv/openresolv.info
@@ -1,8 +1,8 @@
 PRGNAM="openresolv"
-VERSION="3.11.0"
+VERSION="3.12.0"
 HOMEPAGE="https://roy.marples.name/projects/openresolv"
-DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.11.0.tar.xz"
-MD5SUM="0203654e2c930f8d58892d4572237d5c"
+DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.12.0.tar.xz"
+MD5SUM="595f8633c111c150b86825b027e0bbde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openvswitch-utils/openvswitch-utils.SlackBuild b/network/openvswitch-utils/openvswitch-utils.SlackBuild
index 14fe64a5bf..c20275a51a 100644
--- a/network/openvswitch-utils/openvswitch-utils.SlackBuild
+++ b/network/openvswitch-utils/openvswitch-utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openvswitch-utils
 
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2018  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvswitch-utils
-VERSION=${VERSION:-2.5.6}
+VERSION=${VERSION:-2.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -100,7 +100,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 *.md AUTHORS COPYING NEWS NOTICE $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst LICENSE NEWS NOTICE $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/openvswitch-utils/openvswitch-utils.info b/network/openvswitch-utils/openvswitch-utils.info
index b6c74887e9..fc6c13d9b2 100644
--- a/network/openvswitch-utils/openvswitch-utils.info
+++ b/network/openvswitch-utils/openvswitch-utils.info
@@ -1,10 +1,10 @@
 PRGNAM="openvswitch-utils"
-VERSION="2.5.6"
+VERSION="2.14.0"
 HOMEPAGE="http://openvswitch.org/"
-DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.5.6.tar.gz"
-MD5SUM="4b27da13c7f0c76c56bdcfa76deb0e77"
+DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.14.0.tar.gz"
+MD5SUM="92e464f962c5ebbac73c58ad799fa9d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/opera-developer/README b/network/opera-developer/README
index 0615a29f0c..0d822148de 100644
--- a/network/opera-developer/README
+++ b/network/opera-developer/README
@@ -13,4 +13,4 @@ https://blogs.opera.com/desktop/2017/05/opera-developer-46-0-2590-0-update/
 
 This suggests: pepperflash-plugin, ffmpeg, opera-developer-ffmpeg-codecs
 
-Changelog: https://blogs.opera.com/desktop/changelog-for-73/#b3847.0
+Changelog: https://blogs.opera.com/desktop/changelog-for-76/#b3995.0
diff --git a/network/opera-developer/opera-developer.SlackBuild b/network/opera-developer/opera-developer.SlackBuild
index 0eeca89592..8b606f797a 100644
--- a/network/opera-developer/opera-developer.SlackBuild
+++ b/network/opera-developer/opera-developer.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for opera-developer.
 #
-# Copyright 2016-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opera-developer
-VERSION=${VERSION:-73.0.3847.0}
+VERSION=${VERSION:-76.0.3995.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/opera-developer/opera-developer.info b/network/opera-developer/opera-developer.info
index 68087f9d8e..1d56dcadf6 100644
--- a/network/opera-developer/opera-developer.info
+++ b/network/opera-developer/opera-developer.info
@@ -1,10 +1,10 @@
 PRGNAM="opera-developer"
-VERSION="73.0.3847.0"
+VERSION="76.0.3995.0"
 HOMEPAGE="https://www.opera.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download1.operacdn.com/pub/opera-developer/73.0.3847.0/linux/opera-developer_73.0.3847.0_amd64.deb"
-MD5SUM_x86_64="8c08c5e49d318b4a866d7aa293e4b368"
+DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera-developer/76.0.3995.0/linux/opera-developer_76.0.3995.0_amd64.deb"
+MD5SUM_x86_64="a9f66589cb2496129e0146f19173ed93"
 REQUIRES=""
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/opera/README b/network/opera/README
index 9d694e7c20..3c8a842e4a 100644
--- a/network/opera/README
+++ b/network/opera/README
@@ -13,4 +13,4 @@ https://blogs.opera.com/desktop/2017/05/opera-developer-46-0-2590-0-update/
 
 This suggests: pepperflash-plugin, ffmpeg, opera-ffmpeg-codecs.
 
-Changelog: https://blogs.opera.com/desktop/changelog-for-72/#b3815.148
+Changelog: https://blogs.opera.com/desktop/changelog-for-75/#b3969.93
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index 0580ae8dd7..07912428b8 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for opera.
 #
-# Copyright 2016-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opera
-VERSION=${VERSION:-72.0.3815.148}
+VERSION=${VERSION:-75.0.3969.93}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/opera/opera.info b/network/opera/opera.info
index 442333a477..e75e83675f 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,10 +1,10 @@
 PRGNAM="opera"
-VERSION="72.0.3815.148"
+VERSION="75.0.3969.93"
 HOMEPAGE="https://www.opera.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download3.operacdn.com/pub/opera/desktop/72.0.3815.148/linux/opera-stable_72.0.3815.148_amd64.deb"
-MD5SUM_x86_64="3c2f497cc8eac04973a37bef42f8f3ec"
+DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera/desktop/75.0.3969.93/linux/opera-stable_75.0.3969.93_amd64.deb"
+MD5SUM_x86_64="a2fca02d23220fa2d4ffd52603530fc1"
 REQUIRES=""
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/palemoon-bin/README b/network/palemoon-bin/README
index ee331b0de8..3487167d82 100644
--- a/network/palemoon-bin/README
+++ b/network/palemoon-bin/README
@@ -11,3 +11,8 @@ dictionary by passing the USE_SYSTEM_SPELLCHECK=yes variable to the script.
 If you need to change the GUI language, please visit
 https://www.palemoon.org/langpacks.shtml and follow the installation
 instructions.
+
+NOTE:
+32 bit packages have been discontinued; and 64 bit binaries are now released
+in gtk2 and gtk3 variations. If you desire to use a gtk3 variation, pass the
+variable GTK=gtk3 to the script.
diff --git a/network/palemoon-bin/palemoon-bin.SlackBuild b/network/palemoon-bin/palemoon-bin.SlackBuild
index 8044d15638..7a39dbda60 100644
--- a/network/palemoon-bin/palemoon-bin.SlackBuild
+++ b/network/palemoon-bin/palemoon-bin.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=palemoon-bin
 SRCNAM=palemoon
-VERSION=${VERSION:-28.10.0}
+VERSION=${VERSION:-29.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,6 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+GTK=${GTK:-gtk2}
+
 # We don't need cflags since nothing is being compiled here.
 # We do need to check the architecture though and abort when it's not
 # supported.
@@ -63,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH.tar.xz
+tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH-$GTK.tar.xz
 cd $SRCNAM
 chown -R root:root .
 find -L . \
diff --git a/network/palemoon-bin/palemoon-bin.info b/network/palemoon-bin/palemoon-bin.info
index 44cfbf47df..db48f7cb3d 100644
--- a/network/palemoon-bin/palemoon-bin.info
+++ b/network/palemoon-bin/palemoon-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="palemoon-bin"
-VERSION="28.10.0"
+VERSION="29.1.1"
 HOMEPAGE="https://www.palemoon.org/"
-DOWNLOAD="http://linux.palemoon.org/datastore/release/palemoon-28.10.0.linux-i686.tar.xz"
-MD5SUM="66c128fa4ccabc826cdbdaadfb1ef3d4"
-DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-28.10.0.linux-x86_64.tar.xz"
-MD5SUM_x86_64="28f399a683de466e1468243d6fba2291"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-29.1.1.linux-x86_64-gtk2.tar.xz"
+MD5SUM_x86_64="1a39e784adcd7891c391195fabcbb06a"
 REQUIRES=""
 MAINTAINER="khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/network/palemoon/README b/network/palemoon/README
index 9eeeaa2327..61cdab4bc1 100644
--- a/network/palemoon/README
+++ b/network/palemoon/README
@@ -19,29 +19,29 @@ binaries offically released by the Pale Moon devs.
 See http://docs.slackware.com/howtos:software:palemoon for additional
 tips and help resources.
 
-Using the Oxygen theme is known to cause Pale Moon to crash; if you
-are experiencing crashes, and segfaults, make sure you are not using
-this theme; or use Alienbob's patched oxygen-gtk2; which will fix this
-issue.  http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/
-See the help doc link above for other creative tips and workarounds.
+Using the Oxygen theme is known to cause Pale Moon to crash; if you are
+experiencing crashes, and segfaults, make sure you are not using this
+theme; or use Alienbob's patched oxygen-gtk2; which will fix this issue.
+http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/ See the
+help doc link above for other creative tips and workarounds.
 
-A native fork of FireFox's developer tools exists as an external
-add-on or internally. Pale Moon by default ships with the developer
-tools internally; if this is undesirable, dev tools can be disabled by
-passing the script the parameter:
+A native fork of FireFox's developer tools exists as an external add-on
+or internally. Pale Moon by default ships with the developer tools
+internally; if this is undesirable, dev tools can be disabled by passing
+the script the parameter:
 
-    DEVTOOLS=no ./palemoon.SlackBuild
+  DEVTOOLS=no ./palemoon.SlackBuild
 
 Pale Moon's default is to build, ship, and use its own internal
 dictionary; if desired, however, do USE_SYSTEM_HUNSPELL=yes
-./palemoon.SlackBuild, to use the Slackware system Hunspell
-instead. This assumes you have dictionaries such as hunspell-en or
-hunspell-es installed in /usr/share/hunspell -- the location that a
-few SlackBuilds at SBo install them.
+./palemoon.SlackBuild, to use the Slackware system Hunspell instead.
+This assumes you have dictionaries such as hunspell-en or hunspell-es
+installed in /usr/share/hunspell -- the location that a few SlackBuilds
+at SBo install them.
 
 To remove the "AdNauseam" extension from the Pale Moon blocklist, do
 
-    ADNAUSEAM=unblock ./palemoon.SlackBuild
+  ADNAUSEAM=unblock ./palemoon.SlackBuild
 
 If your processor doesn't support sse2 instructions or you get
 segfaults, try looking in the SlackBuild for the OPTIMIZE build option
@@ -55,4 +55,4 @@ passing the variable:
 
 To enable debug information, pass the script the parameter
 
-    ENABLE_DEBUG=yes
+  ENABLE_DEBUG=yes
diff --git a/network/palemoon/adNauseam-unblock.patch b/network/palemoon/adNauseam-unblock.patch
deleted file mode 100644
index b1ff1b8bb4..0000000000
--- a/network/palemoon/adNauseam-unblock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-*** a/application/palemoon/app/blocklist.xml	2018-05-19 19:02:40.285091999 -0700
---- b/application/palemoon/app/blocklist.xml	2018-05-19 19:32:36.468323646 -0700
-***************
-*** 2504,2514 ****
-        </versionRange>
-        <prefs></prefs>
-      </emItem>   
--     <emItem blockID="pm110" id="adnauseam@rednoise.org">
--       <versionRange minVersion="0" maxVersion="*" severity="2">
--       </versionRange>
--       <prefs></prefs>
--     </emItem>   
-      <emItem blockID="pm111" id="customtoolbarsplus@srazzano.com">
-        <versionRange minVersion="0" maxVersion="52.4.2" severity="3">
-        </versionRange>
---- 2504,2509 ----
diff --git a/network/palemoon/glibc-2.30+.patch b/network/palemoon/glibc-2.30+.patch
deleted file mode 100644
index b67945d12a..0000000000
--- a/network/palemoon/glibc-2.30+.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- tools/profiler/tasktracer/GeckoTaskTracer.cpp	2019-08-23 01:47:27.000000000 +0200
-+++ tools/profiler/tasktracer/GeckoTaskTracer.cpp	2019-08-29 18:02:44.541959971 +0200
-@@ -25,20 +25,14 @@
- #if defined(__GLIBC__)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid()
--{
--  return (pid_t) syscall(SYS_gettid);
--}
-+#define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- #elif defined(XP_MACOSX)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid()
--{
--  return (pid_t) syscall(SYS_thread_selfid);
--}
-+#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
- #elif defined(LINUX)
- #include <sys/types.h>
--pid_t gettid();
-+#pid_t gettid();
- #endif
- 
- // NS_ENSURE_TRUE_VOID() without the warning on the debug build.
-
-
---- js/src/jsnativestack.cpp	2019-08-29 17:45:10.000000000 +0200
-+++ js/src/jsnativestack.cpp	2019-08-29 17:53:58.382003265 +0200
-@@ -26,11 +26,7 @@
- #  include <sys/syscall.h>
- #  include <sys/types.h>
- #  include <unistd.h>
--static pid_t
--gettid()
--{
--    return syscall(__NR_gettid);
--}
-+#  define gettid() static_cast<pid_t>(syscall(__NR_gettid))
- # endif
- 
- #else
diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
index 8b3aad8c71..321f5f88d0 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -26,9 +26,10 @@
 # Special thanks to Ponce
 
 PRGNAM=palemoon
-VERSION=${VERSION:-28.10.0}
+VERSION=${VERSION:-29.1.1}
 SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release}
-SRCNAM2=${SRCNAM2:-UXP-RELBASE_20200603}
+SRCNAM2=${SRCNAM2:-pale-moon}
+SRCNAM3=${SRCNAM3:-UXP-RELBASE_20210330}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -142,10 +143,10 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 # Build Pale Moon
 cd $TMP
-rm -rf $SRCNAM1
+rm -rf $SRCNAM2
 tar -xvf $CWD/$SRCNAM1.tar.gz
-cd $SRCNAM1
-tar -xvf $CWD/$SRCNAM2.tar.gz -C platform --strip-components 1
+cd $SRCNAM2
+tar -xvf $CWD/$SRCNAM3.tar.gz -C platform --strip-components 1
 
 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then
 	patch -p1 < $CWD/adNauseam-unblock.patch
@@ -167,7 +168,7 @@ find -L . \
 # "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)"
 export LANG=C
 
-export MOZCONFIG="$TMP/$SRCNAM1/.mozconfig"
+export MOZCONFIG="$TMP/$SRCNAM2/.mozconfig"
 export MOZILLA_OFFICIAL=1
 export MOZ_MAKE_FLAGS=$MAKEFLAGS
 export CFLAGS="$SLKCFLAGS"
@@ -259,7 +260,7 @@ cat $CWD/palemoon.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $TMP/$SRCNAM1/platform/LEGAL $TMP/$SRCNAM1/LICENSE $TMP/$SRCNAM1/README.md $TMP/$SRCNAM1/AUTHORS \
+  $TMP/$SRCNAM2/platform/LEGAL $TMP/$SRCNAM2/LICENSE $TMP/$SRCNAM2/README.md $TMP/$SRCNAM2/AUTHORS \
   $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info
index 8d24f87d8f..614b3b3b55 100644
--- a/network/palemoon/palemoon.info
+++ b/network/palemoon/palemoon.info
@@ -1,11 +1,11 @@
 PRGNAM="palemoon"
-VERSION="28.10.0"
+VERSION="29.1.1"
 HOMEPAGE="http://www.palemoon.org/"
-DOWNLOAD="https://github.com/MoonchildProductions/Pale-Moon/archive/28.10.0_Release/Pale-Moon-28.10.0_Release.tar.gz \
-          https://github.com/MoonchildProductions/UXP/archive/RELBASE_20200603/UXP-RELBASE_20200603.tar.gz \
+DOWNLOAD="http://repo.khronosschoty.org/Slackware/Pale-Moon/source/Pale-Moon-29.1.1_Release.tar.gz
+          http://repo.khronosschoty.org/Slackware/Pale-Moon/source/UXP-RELBASE_20210330.tar.gz \
           http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="602745f4703f835ff617e3ecfc2226e4 \
-        77c52f1bd1b26139bdc11aa6bddee8f8 \
+MD5SUM="f522cab929ec62382dc30391a590b039 \
+        535724b8fbb0d791cdf48f456969df9f \
         f2994d302cf736e7e71974edfa51da3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/pirate-get/pirate-get.SlackBuild b/network/pirate-get/pirate-get.SlackBuild
index 85ce1b0edf..e9f6928035 100644
--- a/network/pirate-get/pirate-get.SlackBuild
+++ b/network/pirate-get/pirate-get.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pirate-get
 
-# Copyright 2017-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2017-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pirate-get
-VERSION=${VERSION:-0.3.4}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/pirate-get/pirate-get.info b/network/pirate-get/pirate-get.info
index 4b9307393b..df31f2a705 100644
--- a/network/pirate-get/pirate-get.info
+++ b/network/pirate-get/pirate-get.info
@@ -1,10 +1,10 @@
 PRGNAM="pirate-get"
-VERSION="0.3.4"
+VERSION="0.4.0"
 HOMEPAGE="https://github.com/vikstrous/pirate-get"
-DOWNLOAD="https://files.pythonhosted.org/packages/24/26/9ed16a4d5c16854b6abe72b2b33c7a5640a8ab9297125912b13408f9a135/pirate-get-0.3.4.tar.gz"
-MD5SUM="eddd23be00bb5dd8b236f9584cdd9b52"
+DOWNLOAD="https://files.pythonhosted.org/packages/c3/e2/735e12e1d0aabcc20dd68cd809e3ed7ccd9e063f03a6edf4406bd520fd21/pirate-get-0.4.0.tar.gz"
+MD5SUM="f1bd3e0d209586d076db3cc01e522158"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 BeautifulSoup4 veryprettytable pyperclip"
+REQUIRES="python3 veryprettytable pyperclip"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/prettyping/README b/network/prettyping/README
new file mode 100644
index 0000000000..c16bdf65fc
--- /dev/null
+++ b/network/prettyping/README
@@ -0,0 +1,7 @@
+Prettyping is a wrapper around the standard ping tool with the
+objective of making the output prettier, more colorful, more compact,
+and easier to read.
+
+Prettyping runs the standard ping in the background and parses its
+output, showing the ping responses in a graphical way at the terminal
+(by using colors and Unicode characters).
diff --git a/network/prettyping/prettyping.SlackBuild b/network/prettyping/prettyping.SlackBuild
new file mode 100644
index 0000000000..4d73201f5b
--- /dev/null
+++ b/network/prettyping/prettyping.SlackBuild
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# Slackware build script for prettyping
+
+# Copyright 2021 Thibaut Notteboom, Paris, FRANCE
+# 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=prettyping
+VERSION=${VERSION:-1.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+install -Dm755 prettyping $PKG/usr/bin/prettyping
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/prettyping/prettyping.info b/network/prettyping/prettyping.info
new file mode 100644
index 0000000000..7aeaf8c18e
--- /dev/null
+++ b/network/prettyping/prettyping.info
@@ -0,0 +1,10 @@
+PRGNAM="prettyping"
+VERSION="1.0.1"
+HOMEPAGE="https://github.com/denilsonsa/prettyping"
+DOWNLOAD="https://github.com/denilsonsa/prettyping/archive/v1.0.1/prettyping-1.0.1.tar.gz"
+MD5SUM="264a496f40b13d81cb0dbb000b06a288"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/network/prettyping/slack-desc b/network/prettyping/slack-desc
new file mode 100644
index 0000000000..935ec3c74e
--- /dev/null
+++ b/network/prettyping/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+prettyping: prettyping (Ping wrapper making the output prettier, more colorful,
+prettyping: more compact, and easier to read)
+prettyping:
+prettyping: Prettyping is a wrapper around the standard ping tool with the
+prettyping: objective of making the output prettier, more colorful, more compact,
+prettyping: and easier to read.
+prettyping: 
+prettyping: Prettyping runs the standard ping in the background and parses its
+prettyping: output, showing the ping responses in a graphical way at the terminal
+prettyping: (by using colors and Unicode characters).
+prettyping:
diff --git a/network/privoxy/README b/network/privoxy/README
index eb6d9f207a..3aed32d9a3 100644
--- a/network/privoxy/README
+++ b/network/privoxy/README
@@ -5,6 +5,8 @@ Privoxy has a flexible configuration and can be customized to suit
 individual needs and tastes.  It has application for both stand-alone
 systems and multi-user networks.
 
+brotli is an optional dependency.
+
 Before executing the script, you will need to create 
 a privoxy user and group.  To do that, run the following commands:
 
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index 576e2a5184..e3f72e6e05 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for privoxy
 
 # Copyright (c) 2007  alkos333 <me@alkos333.net>
-# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=privoxy
-VERSION=${VERSION:-3.0.28}
+VERSION=${VERSION:-3.0.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,17 +89,14 @@ chmod -R u+w,go-w,a+rX-st .
 # Put the docs where we tell them to go.
 sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in
 
-# The Makefile checks if certain config files exist, and if so, adds a
-# .new suffix.  Turn this behavior off.  We will do it below.
-sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in
-
 # rc.privoxy generation doesn't work well with $(DESTDIR).  Help it along.
 sed -i "s/ \/etc\/rc.d\// \$(DESTDIR)\/etc\/rc.d\//g" GNUmakefile.in
 mkdir -p $PKG/etc/rc.d
 
-autoheader
-autoconf
-CFLAGS="$SLKCFLAGS" \
+# Let AC_CHECK_LIB do the brotli autodetection, don't link to it if missing.
+sed -i "/-lbrotlidec/d" configure.in
+
+autoreconf -vif
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -112,9 +109,14 @@ CFLAGS="$SLKCFLAGS" \
   --with-docbook=no \
   --with-user=$PRIVOXY_USER \
   --with-group=$PRIVOXY_GROUP \
+  --with-openssl \
+  --with-brotli \
   --enable-no-gifs \
   --enable-compression \
-  --enable-large-file-support
+  --enable-large-file-support \
+  --enable-extended-statistics \
+  --enable-pcre-host-patterns \
+  CFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info
index 07259d8c44..c8dafc6529 100644
--- a/network/privoxy/privoxy.info
+++ b/network/privoxy/privoxy.info
@@ -1,8 +1,8 @@
 PRGNAM="privoxy"
-VERSION="3.0.28"
+VERSION="3.0.32"
 HOMEPAGE="https://www.privoxy.org/"
-DOWNLOAD="https://sourceforge.net/projects/ijbswa/files/Sources/3.0.28%20%28stable%29/privoxy-3.0.28-stable-src.tar.gz"
-MD5SUM="c7e8900d5aff33d9a5fc37ac28154f21"
+DOWNLOAD="https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/privoxy-3.0.32-stable-src.tar.gz"
+MD5SUM="3a0a8ebdf80e0a29154683e74cbf510b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild
index a329be2ce2..5cf4aaba7f 100644
--- a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild
+++ b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM=prosody-mod-cloud-notify
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg4151}
-REVISION=${REVISION:-fa79d19d0fdd}
+VERSION=${VERSION:-hg4464}
+REVISION=${REVISION:-ea820de69265}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info
index dade4a0d24..4722fce5ec 100644
--- a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info
+++ b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody-mod-cloud-notify"
-VERSION="hg4151"
+VERSION="hg4464"
 HOMEPAGE="https://modules.prosody.im/mod_cloud_notify.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/fa79d19d0fdd.tar.gz"
-MD5SUM="a2d81532f7bba43491d360fc5a5b7c10"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/ea820de69265.tar.gz"
+MD5SUM="5f97aa5a32954a6f4a2a33004b5b0214"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
diff --git a/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild b/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild
index 84d518c9f5..18fccb9ee2 100644
--- a/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild
+++ b/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM=prosody-mod-http-upload
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg4076}
-REVISION=${REVISION:-f1f796e551f1}
+VERSION=${VERSION:-hg4443}
+REVISION=${REVISION:-0a56dc6c61af}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/prosody-mod-http-upload/prosody-mod-http-upload.info b/network/prosody-mod-http-upload/prosody-mod-http-upload.info
index 54accc6691..77fc56625a 100644
--- a/network/prosody-mod-http-upload/prosody-mod-http-upload.info
+++ b/network/prosody-mod-http-upload/prosody-mod-http-upload.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody-mod-http-upload"
-VERSION="hg4076"
+VERSION="hg4443"
 HOMEPAGE="https://modules.prosody.im/mod_http_upload.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/f1f796e551f1.tar.gz"
-MD5SUM="2f91925f6f4c13ac1531c96286083913"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/0a56dc6c61af.tar.gz"
+MD5SUM="3f35ff98e0b902f0585d8f158b7f4d91"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild b/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild
index 65732c7a90..5947657221 100644
--- a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild
+++ b/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for prosody-mod-smacks
 
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2016-2021 Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=prosody-mod-smacks
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg4009}
-REVISION=${REVISION:-362997ededb1}
+VERSION=${VERSION:-hg4463}
+REVISION=${REVISION:-8b8246031a5e}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.info b/network/prosody-mod-smacks/prosody-mod-smacks.info
index ce386d5669..8d91178a15 100644
--- a/network/prosody-mod-smacks/prosody-mod-smacks.info
+++ b/network/prosody-mod-smacks/prosody-mod-smacks.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody-mod-smacks"
-VERSION="hg4009"
+VERSION="hg4463"
 HOMEPAGE="https://modules.prosody.im/mod_smacks.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/362997ededb1.tar.gz"
-MD5SUM="a4e7747161e7a0affdb6c2099b291908"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/8b8246031a5e.tar.gz"
+MD5SUM="7a1ca43b59c414174c807fc114a59b23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
diff --git a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild
index 992cab7c6a..5117c9a7ab 100644
--- a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild
+++ b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM=prosody-mod-vcard-muc
 MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg4043}
-REVISION=${REVISION:-a533abe6ffd0}
+VERSION=${VERSION:-hg4300}
+REVISION=${REVISION:-3f3b672b7616}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info
index 0c94a8f4b6..a290e700b1 100644
--- a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info
+++ b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody-mod-vcard-muc"
-VERSION="hg4043"
+VERSION="hg4300"
 HOMEPAGE="https://modules.prosody.im/mod_vcard_muc.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/a533abe6ffd0.tar.gz"
-MD5SUM="94a7e9f04599440dd3db3017dce537b3"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/3f3b672b7616.tar.gz"
+MD5SUM="43354c6458cb9a6ff73c9574a148ec00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prosody"
diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild
index 1b7c390a29..b06c8d3eef 100644
--- a/network/prosody/prosody.SlackBuild
+++ b/network/prosody/prosody.SlackBuild
@@ -25,7 +25,7 @@
 # Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
 
 PRGNAM=prosody
-VERSION=${VERSION:-0.11.5}
+VERSION=${VERSION:-0.11.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/prosody/prosody.info b/network/prosody/prosody.info
index fea2776b34..fbf571bd7b 100644
--- a/network/prosody/prosody.info
+++ b/network/prosody/prosody.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody"
-VERSION="0.11.5"
+VERSION="0.11.8"
 HOMEPAGE="http://prosody.im/"
-DOWNLOAD="https://prosody.im/downloads/source/prosody-0.11.5.tar.gz"
-MD5SUM="224b9b49bd1a568a9548590ade253dd6"
+DOWNLOAD="https://prosody.im/downloads/source/prosody-0.11.8.tar.gz"
+MD5SUM="24cd3c1f7ab16a6b3726423d2fff802d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="luasec luasocket luaexpat lua-filesystem"
diff --git a/network/protonmail-bridge/protonmail-bridge.SlackBuild b/network/protonmail-bridge/protonmail-bridge.SlackBuild
index 6d7a0fc4ba..74e9b33a6d 100644
--- a/network/protonmail-bridge/protonmail-bridge.SlackBuild
+++ b/network/protonmail-bridge/protonmail-bridge.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for protonmail-bridge
 
-# Copyright 2018-2020 Erich Ritz
+# Copyright 2018-2021 Erich Ritz
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=protonmail-bridge
-VERSION=${VERSION:-1.4.5}
+VERSION=${VERSION:-1.6.9}
 DEBVERSION=${DEBVERSION:--1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -54,7 +54,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.xz | tar xJv
+ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.gz | tar xzv
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -62,8 +62,14 @@ 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 {} \;
 
+mv $PKG/usr/lib $PKG/usr/lib64
+rm $PKG/usr/bin/protonmail-bridge
+ln -s /usr/lib64/protonmail/bridge/proton-bridge-launcher $PKG/usr/bin/protonmail-bridge
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $PKG/usr/lib/protonmail/bridge/{Changelog.md,LICENSE} $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/protonmail/bridge/* $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/doc/protonmail-bridge/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/protonmail-bridge/protonmail-bridge.info b/network/protonmail-bridge/protonmail-bridge.info
index 16488270e6..de81c95d28 100644
--- a/network/protonmail-bridge/protonmail-bridge.info
+++ b/network/protonmail-bridge/protonmail-bridge.info
@@ -1,10 +1,10 @@
 PRGNAM="protonmail-bridge"
-VERSION="1.4.5"
+VERSION="1.6.9"
 HOMEPAGE="https://protonmail.com/bridge/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://protonmail.com/download/protonmail-bridge_1.4.5-1_amd64.deb"
-MD5SUM_x86_64="fa0f2111b4ee178b92240fb4c55a4220"
+DOWNLOAD_x86_64="https://protonmail.com/download/bridge/protonmail-bridge_1.6.9-1_amd64.deb"
+MD5SUM_x86_64="fac0cd06f786df4724076c8068c8961e"
 REQUIRES=""
 MAINTAINER="Erich Ritz"
 EMAIL="erich.public@protonmail.com"
diff --git a/network/protonmail-import-export-app/README b/network/protonmail-import-export-app/README
new file mode 100644
index 0000000000..cbb9a85e09
--- /dev/null
+++ b/network/protonmail-import-export-app/README
@@ -0,0 +1,11 @@
+The ProtonMail Import-Export app is an application for paid users that
+imports emails to your ProtonMail inbox or makes offline backups.
+
+You can import messages from Gmail, Outlook, Yahoo, or any other email
+provider that supports the IMAP protocol. Importing from local EML and
+MBOX files is also supported. You can use the Import-Export app to
+download important messages as MBOX or EML files so that you always have
+a backup on your device.
+
+This script repackages the Debian binary provided by Proton
+Technologies.
diff --git a/network/protonmail-import-export-app/doinst.sh b/network/protonmail-import-export-app/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/network/protonmail-import-export-app/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild b/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild
new file mode 100644
index 0000000000..c41c2d775d
--- /dev/null
+++ b/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackware build script for protonmail-import-export-app
+
+# Copyright 2020-2021 Erich Ritz
+# 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=protonmail-import-export-app
+VERSION=${VERSION:-1.3.1}
+DEBVERSION=${DEBVERSION:--1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# Upstream only has binary support for x86_64 at present.
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+else
+    echo "Sorry, the ProtonMail Import-Export app binary is currently available for x86_64 only."
+    exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.gz | tar xzv
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mv $PKG/usr/lib $PKG/usr/lib64
+rm $PKG/usr/bin/protonmail-import-export-app
+ln -s /usr/lib64/protonmail/import-export/proton-ie-launcher $PKG/usr/bin/protonmail-import-export-app
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/protonmail/import-export/* $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/doc/protonmail-import-export-app/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/doc
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/network/protonmail-import-export-app/protonmail-import-export-app.info b/network/protonmail-import-export-app/protonmail-import-export-app.info
new file mode 100644
index 0000000000..25b972e07f
--- /dev/null
+++ b/network/protonmail-import-export-app/protonmail-import-export-app.info
@@ -0,0 +1,10 @@
+PRGNAM="protonmail-import-export-app"
+VERSION="1.3.1"
+HOMEPAGE="https://protonmail.com/import-export"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://protonmail.com/download/ie/protonmail-import-export-app_1.3.1-1_amd64.deb"
+MD5SUM_x86_64="553affb4cb0ae3b1de25141eb4ff1077"
+REQUIRES=""
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/network/protonmail-import-export-app/slack-desc b/network/protonmail-import-export-app/slack-desc
new file mode 100644
index 0000000000..7c54b8366e
--- /dev/null
+++ b/network/protonmail-import-export-app/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                            |-----handy-ruler------------------------------------------------------|
+protonmail-import-export-app: protonmail-import-export-app (ProtonMail Import-Export app)
+protonmail-import-export-app:
+protonmail-import-export-app: The Import-Export app helps you to migrate your emails from local
+protonmail-import-export-app: files or remote IMAP servers to ProtonMail or simply export emails to
+protonmail-import-export-app: local folder.
+protonmail-import-export-app:
+protonmail-import-export-app: Proton Technologies AG (ProtonMail Bridge developers)
+protonmail-import-export-app: <bridge@protonmail.ch>
+protonmail-import-export-app:
+protonmail-import-export-app:
+protonmail-import-export-app:
diff --git a/network/protonvpn-cli/README b/network/protonvpn-cli/README
new file mode 100644
index 0000000000..fb79f036ca
--- /dev/null
+++ b/network/protonvpn-cli/README
@@ -0,0 +1,26 @@
+protonvpn-cli is the official Linux command line tool for connecting to
+the ProtonVPN.  It is a full rewrite of the original bash protonvpn-cli
+in Python, which adds more features and functionality with the purpose
+of improving readability, speed, and reliability.
+
+Before using protonvpn-cli, it must be initialized. Run (as root)
+
+  protonvpn init
+
+and follow the prompts on the screen. Your OpenVPN username and password
+can be found at https://account.protonvpn.com/account. Note that both
+free and paid accounts are supported.
+
+After protonvpn-cli is configured, run (as root)
+
+  protonvpn connect -f
+
+to connect to ProtonVPN using the fastest available server.
+
+Before uninstalling, run
+
+  protonvpn configure
+
+to purge the configuration files.
+
+All dependencies must be built with Python3 support.
diff --git a/network/protonvpn-cli/protonvpn-cli.SlackBuild b/network/protonvpn-cli/protonvpn-cli.SlackBuild
new file mode 100644
index 0000000000..151a4fbe30
--- /dev/null
+++ b/network/protonvpn-cli/protonvpn-cli.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Slackware build script for protonvpn-cli
+
+# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA
+# 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=protonvpn-cli
+SRCNAM=linux-cli
+VERSION=${VERSION:-2.2.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+# Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS CHANGELOG.md LICENSE README.md USAGE.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/protonvpn-cli/protonvpn-cli.info b/network/protonvpn-cli/protonvpn-cli.info
new file mode 100644
index 0000000000..f9f08743e5
--- /dev/null
+++ b/network/protonvpn-cli/protonvpn-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="protonvpn-cli"
+VERSION="2.2.6"
+HOMEPAGE="https://protonvpn.com/support/linux-vpn-tool/"
+DOWNLOAD="https://github.com/ProtonVPN/linux-cli/archive/v2.2.6/linux-cli-2.2.6.tar.gz"
+MD5SUM="7163ee74df63e85359b62eace7f01bf4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 docopt python-requests python3-pythondialog Jinja2"
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/network/protonvpn-cli/slack-desc b/network/protonvpn-cli/slack-desc
new file mode 100644
index 0000000000..db0231542f
--- /dev/null
+++ b/network/protonvpn-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+protonvpn-cli: protonvpn-cli (ProtonVPN's Linux Command-Line Interface)
+protonvpn-cli:
+protonvpn-cli: Official Linux command line tool for connection to the ProtonVPN. It
+protonvpn-cli: is a full rewrite of the original bash protonvpn-cli in Python, which
+protonvpn-cli: adds more features and functionality with the purpose of improving
+protonvpn-cli: readability, speed, and reliability.
+protonvpn-cli:
+protonvpn-cli: Homepage: https://protonvpn.com/support/linux-vpn-tool/
+protonvpn-cli:
+protonvpn-cli:
+protonvpn-cli:
diff --git a/network/proxychains/proxychains.SlackBuild b/network/proxychains/proxychains.SlackBuild
index 285c032375..c0719a5d2f 100644
--- a/network/proxychains/proxychains.SlackBuild
+++ b/network/proxychains/proxychains.SlackBuild
@@ -28,12 +28,12 @@
 PRGNAM=proxychains
 SRCNAM=proxychains-ng
 VERSION=${VERSION:-4.14}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ 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"
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/proxychains/proxychains.info b/network/proxychains/proxychains.info
index 66afb40a26..2f344a4236 100644
--- a/network/proxychains/proxychains.info
+++ b/network/proxychains/proxychains.info
@@ -1,7 +1,7 @@
 PRGNAM="proxychains"
 VERSION="4.14"
 HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
-DOWNLOAD="https://github.com/rofl0r/proxychains-ng/archive/v4.14.tar.gz"
+DOWNLOAD="https://github.com/rofl0r/proxychains-ng/archive/v4.14/proxychains-ng-4.14.tar.gz"
 MD5SUM="3232630140fe39d53796775285bb6652"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/pulse-sms/pulse-sms.SlackBuild b/network/pulse-sms/pulse-sms.SlackBuild
index b37f0e5452..081f3c2731 100644
--- a/network/pulse-sms/pulse-sms.SlackBuild
+++ b/network/pulse-sms/pulse-sms.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pulse-sms
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-4.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/pulse-sms/pulse-sms.info b/network/pulse-sms/pulse-sms.info
index 36cbb5cf2d..0d653dacb1 100644
--- a/network/pulse-sms/pulse-sms.info
+++ b/network/pulse-sms/pulse-sms.info
@@ -1,10 +1,10 @@
 PRGNAM="pulse-sms"
-VERSION="4.1.0"
+VERSION="4.3.0"
 HOMEPAGE="https://messenger.klinkerapps.com/overview/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/klinker-apps/pulse-sms-desktop/releases/download/v4.1.0/pulse-sms-4.1.0-amd64.deb"
-MD5SUM_x86_64="f4ade293f6b1724dac6278313173c7a7"
+DOWNLOAD_x86_64="https://github.com/klinker-apps/pulse-sms-desktop/releases/download/v4.3.0/pulse-sms-4.3.0-amd64.deb"
+MD5SUM_x86_64="5e73a41b6cde0dbc0ebbebb199e5db31"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
 EMAIL="e@dscp.org"
diff --git a/network/purple-gowhatsapp/README b/network/purple-gowhatsapp/README
new file mode 100644
index 0000000000..6a06bda984
--- /dev/null
+++ b/network/purple-gowhatsapp/README
@@ -0,0 +1,2 @@
+This package implements the WhatsApp Web API to provide a
+clean interface for developers.
diff --git a/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild b/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild
new file mode 100644
index 0000000000..eaa0e2516c
--- /dev/null
+++ b/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Slackware build script for purple-gowhatsapp
+
+# Copyright 2020 Alan Aversa U.S.A
+# 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=purple-gowhatsapp
+VERSION=${VERSION:-0.4.1}
+LIBGOGIT=${LIBGOGIT:-gitb84fdd7}
+GOWHATSGIT=${GOWHATSGIT:-git64cc8cf}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    x86_64) ARCH=x86_64 ;;
+       *) echo "Only x86_64 supported"; exit 1 ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p $PKG/usr/lib64/pidgin
+mv -v $CWD/'libgowhatsapp_'$VERSION'~'$LIBGOGIT'+gowhatsapp~'$GOWHATSGIT'_amd64_ubuntu18.04.so' $PKG/usr/lib64/pidgin/libgowhatsapp.so
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/purple-gowhatsapp/purple-gowhatsapp.info b/network/purple-gowhatsapp/purple-gowhatsapp.info
new file mode 100644
index 0000000000..32fc12d904
--- /dev/null
+++ b/network/purple-gowhatsapp/purple-gowhatsapp.info
@@ -0,0 +1,10 @@
+PRGNAM="purple-gowhatsapp"
+VERSION="0.4.1"
+HOMEPAGE="https://github.com/hoehermann/purple-gowhatsapp"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://buildbot.hehoe.de/purple-gowhatsapp/builds/libgowhatsapp_0.4.1~gitb84fdd7+gowhatsapp~git64cc8cf_amd64_ubuntu18.04.so"
+MD5SUM_x86_64="a6072fffe693d1599573c9abd451b2cb"
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan.NOaversa@coSPAM.net (remove NO and SPAM)"
diff --git a/network/purple-gowhatsapp/slack-desc b/network/purple-gowhatsapp/slack-desc
new file mode 100644
index 0000000000..b027c2e789
--- /dev/null
+++ b/network/purple-gowhatsapp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+purple-gowhatsapp: purple-gowhatsapp (libpurple/Pidgin plugin for WhatsApp Web)
+purple-gowhatsapp:
+purple-gowhatsapp: * Receive text messages.
+purple-gowhatsapp: * Sending text messages.
+purple-gowhatsapp: * Download files from image, audio, media, and document messages.
+purple-gowhatsapp: * Library installed in global plugins directory: /usr/lib64/pidgin/
+purple-gowhatsapp: * Under the hood: Reasonable callback mechanism thanks to Eiron Robb.
+purple-gowhatsapp: * Fetch contacts from phone, keep track of time last seen, download of
+purple-gowhatsapp:   user profile pictures courtesy of Markus Gothe.
+purple-gowhatsapp:
+purple-gowhatsapp: purple-gowhatsapp is actively-maintained analogue of whatsapp-purple.
diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild
index 1fff74fa2d..aca498cc4f 100644
--- a/network/qTox/qTox.SlackBuild
+++ b/network/qTox/qTox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qTox
 
-# Copyright 2015, 2016, 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qTox
-VERSION=${VERSION:-20190928_85361393}
+VERSION=${VERSION:-1.17.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/qTox/qTox.info b/network/qTox/qTox.info
index c44ac3638b..fbff231bdc 100644
--- a/network/qTox/qTox.info
+++ b/network/qTox/qTox.info
@@ -1,8 +1,8 @@
 PRGNAM="qTox"
-VERSION="20190928_85361393"
+VERSION="1.17.3"
 HOMEPAGE="https://github.com/qTox/qTox"
-DOWNLOAD="http://mirror.slackware.hr/sources/qTox/qTox-20190928_85361393.tar.bz2"
-MD5SUM="42563f12227ba9c5db289fb4043d3b6d"
+DOWNLOAD="https://github.com/qTox/qTox/archive/v1.17.3/qTox-1.17.3.tar.gz"
+MD5SUM="90a3a03d146ea9656909a4d8dd360c47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="c-toxcore libfilteraudio qt5 ffmpeg qrencode libxkbcommon sqlcipher"
diff --git a/network/qbittorrent-qt5/README b/network/qbittorrent-qt5/README
deleted file mode 100644
index d95396d99f..0000000000
--- a/network/qbittorrent-qt5/README
+++ /dev/null
@@ -1,14 +0,0 @@
-qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
-libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
-
-It aims to be a good alternative to all other bittorrent clients out
-there. qBittorrent is fast, stable, and provides unicode supports as
-well as many features.
-
-Note that from version 3.3.15 you will get a warning on startup that
-qbittorrent has a new way of saving things. If you want to backup your
-old config directory first, you will find it here:
-
-~/.config/qBittorrent
-
-You can return to an older version by swapping directories around.
diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.info b/network/qbittorrent-qt5/qbittorrent-qt5.info
deleted file mode 100644
index ef79532482..0000000000
--- a/network/qbittorrent-qt5/qbittorrent-qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qbittorrent-qt5"
-VERSION="4.2.5"
-HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.2.5/qBittorrent-release-4.2.5.tar.gz"
-MD5SUM="92f41e82f6931a8887412de65cf65ef8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libtorrent-rasterbar qt5"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/network/qbittorrent-qt5/rc.qbittorrent-nox.new b/network/qbittorrent-qt5/rc.qbittorrent-nox.new
deleted file mode 100644
index aa916d8096..0000000000
--- a/network/qbittorrent-qt5/rc.qbittorrent-nox.new
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# /etc/rc.d/rc.qbittorrent-nox
-# Runs qbittorrent webui under user who started the script.
-# Usage: /etc/rc.d/rc.qbittorrent-nox start <PORT>|stop|restart <PORT>|status
-# Port defaults to 8080 if not provided.
-#
-# To run this script from rc.local you must run it as a non-root user.
-#
-# Example:
-# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
-# Program output is sent to /tmp/qbittorrent-nox-$USER
-
-# First some checks to see what's what.
-
-if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then
-    echo "Do not start the daemon as root." >/dev/stderr
-    exit 1
-fi
-
-
-if [ -n "$2" ]; then
-    UIPORT="$2"
-else
-    UIPORT="8080"
-fi
-
-LOG="/tmp/qbittorrent-nox-$USER"
-APP="/usr/bin/qbittorrent-nox"
-
-do_start()
-{
-    if [ -n "$(/bin/netstat -nta | awk '{print $4}' \
-         | cut -d: -f2 | grep $UIPORT | grep 0.0.0.0)" ]; then
-
-        echo "Port $UIPORT is already in use." >/dev/stderr
-        exit 1
-    fi
-
-    $APP --webui-port=$UIPORT 1>$LOG 2>&1 &
-}
-
-do_stop()
-{
-    PID="$(pgrep -u $USER qbittorrent-nox)"
-
-    if [ -n "$PID" ]; then
-        echo "Killing PID $PID"
-        kill $PID
-    else
-        echo "No process found." >/dev/stderr
-    fi
-}
-
-do_status()
-{
-    echo "Local Address	Foreign Address	State	PID/Program name"
-    /bin/netstat -pntl 2>&1 | grep qbittorrent-n \
-    | awk '{print $4 "	" $5 "	" $6 "	" $7}'
-}
-
-case "$1" in
-    'start')
-        do_start
-    ;;
-
-    'stop')
-        do_stop
-    ;;
-    'restart')
-        do_stop
-        sleep 1
-        do_start
-    ;;
-    'status')
-        do_status
-    ;;
-    *)
-        echo "Usage: $0 {start <PORT>|stop|restart <PORT>|status}"
-        exit 1
-    ;;
-esac
diff --git a/network/qbittorrent-qt5/slack-desc b/network/qbittorrent-qt5/slack-desc
deleted file mode 100644
index 9cc8fd0fd8..0000000000
--- a/network/qbittorrent-qt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-               |-----handy-ruler------------------------------------------------------|
-qbittorrent-qt5: qbittorrent-qt5 (a C++ / Qt5 Bittorrent Client)
-qbittorrent-qt5:
-qbittorrent-qt5: qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
-qbittorrent-qt5: libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
-qbittorrent-qt5:
-qbittorrent-qt5: It aims to be a good alternative to all other bittorrent clients out
-qbittorrent-qt5: there. qBittorrent is fast, stable, and provides unicode support as
-qbittorrent-qt5: well as many features.
-qbittorrent-qt5:
-qbittorrent-qt5:
-qbittorrent-qt5: Homepage: https://qbittorrent.sourceforge.net
diff --git a/network/qbittorrent/README b/network/qbittorrent/README
index 01571412e3..d95396d99f 100644
--- a/network/qbittorrent/README
+++ b/network/qbittorrent/README
@@ -1,5 +1,9 @@
-qBittorrent is an easy to use, good looking, and featureful but
-lightweight C++ / Qt4 Bittorrent Client.
+qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
+libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
+
+It aims to be a good alternative to all other bittorrent clients out
+there. qBittorrent is fast, stable, and provides unicode supports as
+well as many features.
 
 Note that from version 3.3.15 you will get a warning on startup that
 qbittorrent has a new way of saving things. If you want to backup your
@@ -7,10 +11,4 @@ old config directory first, you will find it here:
 
 ~/.config/qBittorrent
 
-That way you can return to an older version by swapping directories
-around.
-
-This is the last version of qBittorrent that will build with Qt4
-libraries.  You might want to embrace the future with Qt5 and newer
-versions of qBittorrent. See the qbittorrent-qt5 SlackBuild for more
-information.
+You can return to an older version by swapping directories around.
diff --git a/network/qbittorrent-qt5/README.SBo b/network/qbittorrent/README.SBo
index 56683cfced..56683cfced 100644
--- a/network/qbittorrent-qt5/README.SBo
+++ b/network/qbittorrent/README.SBo
diff --git a/network/qbittorrent/README.nox b/network/qbittorrent/README.nox
deleted file mode 100644
index 15193a85ab..0000000000
--- a/network/qbittorrent/README.nox
+++ /dev/null
@@ -1,17 +0,0 @@
-An rc init script is provided and has the following features:
-
-Runs qbittorrent-nox webui under user who started the script.
-
-Usage:
-/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status
-Port defaults to 8080 if not provided.
-
-To run this script from rc.local you must run it as a non-root user.
-
-Example:
-/bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
-
-Program output is sent to /tmp/qbittorrent-nox-$USER
-
-The status command can be run as root, in which case you should see
-all process of qbittorrent-nox, otherwise you will just see $USER's.
diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild
index e4490f4a59..b3107b945f 100644
--- a/network/qbittorrent/qbittorrent.SlackBuild
+++ b/network/qbittorrent/qbittorrent.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for qbittorrent
 
+# Copyright 2019-2021 Donald Cooley South Haven, Indiana USA
 # Copyright 2009-2010 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
@@ -23,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qbittorrent
-SRCNAM=qBittorrent-release
-VERSION=${VERSION:-3.3.16}
+SRCNAM=qBittorrent
+VERSION=${VERSION:-4.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,21 +61,27 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/release-$VERSION.tar.?z*
-cd $SRCNAM-$VERSION
+rm -rf $SRCNAM-release-$VERSION
+tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z*
+cd $SRCNAM-release-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++14" \
 ./configure \
   --prefix=/usr \
-  --with-qt4
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 make
 make install INSTALL_ROOT=$PKG
@@ -84,17 +91,21 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --with-qt4 \
-  --disable-gui
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-gui \
+  --build=$ARCH-slackware-linux
 
 make
 mv src/qbittorrent-nox $PKG/usr/bin
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-
-mv $PKG/usr/share/man $PKG/usr
 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
 
@@ -103,8 +114,7 @@ cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
-    $CWD/README.nox \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+    $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/qbittorrent/qbittorrent.info b/network/qbittorrent/qbittorrent.info
index 061d931f26..2640449e50 100644
--- a/network/qbittorrent/qbittorrent.info
+++ b/network/qbittorrent/qbittorrent.info
@@ -1,10 +1,10 @@
 PRGNAM="qbittorrent"
-VERSION="3.3.16"
+VERSION="4.3.1"
 HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-3.3.16.tar.gz"
-MD5SUM="28852012dbd3f3bbec400279935b88d1"
+DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.3.1/qBittorrent-release-4.3.1.tar.gz"
+MD5SUM="4e72cfa5dc637b53ab86fdc0ebf97c9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libtorrent-rasterbar-legacy"
+REQUIRES="libtorrent-rasterbar qt5"
 MAINTAINER="Donald Cooley"
 EMAIL="chytraeu@sdf.org"
diff --git a/network/qbittorrent/rc.qbittorrent-nox.new b/network/qbittorrent/rc.qbittorrent-nox.new
index 9b78744ba4..aa916d8096 100644
--- a/network/qbittorrent/rc.qbittorrent-nox.new
+++ b/network/qbittorrent/rc.qbittorrent-nox.new
@@ -8,12 +8,12 @@
 # To run this script from rc.local you must run it as a non-root user.
 #
 # Example:
-# /bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
+# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
 # Program output is sent to /tmp/qbittorrent-nox-$USER
 
 # First some checks to see what's what.
 
-if [ "$USER" = "root" ] && [ "$1" = "start" ]; then
+if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then
     echo "Do not start the daemon as root." >/dev/stderr
     exit 1
 fi
diff --git a/network/qbittorrent/slack-desc b/network/qbittorrent/slack-desc
index 2a54c14312..1a83a98147 100644
--- a/network/qbittorrent/slack-desc
+++ b/network/qbittorrent/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-qbittorrent: qbittorrent (a C++ / Qt4 Bittorrent Client)
+qbittorrent: qbittorrent (a C++ / Qt5 Bittorrent Client)
 qbittorrent:
-qbittorrent: The qBittorrent project was created in March 2006 with the idea
-qbittorrent: of developing a new Bittorrent client for Linux (and possibly
-qbittorrent: other systems) that would be easy to use, good looking, and
-qbittorrent: featureful but lightweight.
-qbittorrent: qBittorrent is a Free Software released under the GNU GPL license.
-qbittorrent: The author is Christophe Dumez, a French student in an engineer
-qbittorrent: school (UTBM), in IT departement.
+qbittorrent: qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
+qbittorrent: libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 qbittorrent:
-qbittorrent: Homepage: http://qbittorrent.sourceforge.net
+qbittorrent: It aims to be a good alternative to all other bittorrent clients out
+qbittorrent: there. qBittorrent is fast, stable, and provides unicode support as
+qbittorrent: well as many features.
+qbittorrent:
+qbittorrent:
+qbittorrent: Homepage: https://qbittorrent.sourceforge.net
diff --git a/network/qutebrowser-tox/8232d38.patch b/network/qutebrowser-tox/8232d38.patch
new file mode 100644
index 0000000000..952170b1bd
--- /dev/null
+++ b/network/qutebrowser-tox/8232d38.patch
@@ -0,0 +1,42 @@
+From 8232d384929641be7409e026d20843a2edd73e48 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <me@the-compiler.org>
+Date: Tue, 13 Apr 2021 16:33:13 +0200
+Subject: [PATCH] notifications: Handle MaxNotificationsExceeded error from
+ GNOME Flashback
+
+(cherry picked from commit 2cfc64579a22e7dd933c9591e6bb141b877b58e0)
+---
+ qutebrowser/browser/webengine/notification.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py
+index 36493f4f72..5e32b63276 100644
+--- a/qutebrowser/browser/webengine/notification.py
++++ b/qutebrowser/browser/webengine/notification.py
+@@ -693,6 +693,15 @@ class DBusNotificationAdapter(AbstractNotificationAdapter):
+     SPEC_VERSION = "1.2"  # Released in January 2011, still current in March 2021.
+     NAME = "libnotify"
+ 
++    _NON_FATAL_ERRORS = {
++        # notification daemon is gone
++        "org.freedesktop.DBus.Error.NoReply",
++
++        # https://gitlab.gnome.org/GNOME/gnome-flashback/-/blob/3.40.0/gnome-flashback/libnotifications/nd-daemon.c#L178-187
++        # Exceeded maximum number of notifications
++        "org.freedesktop.Notifications.MaxNotificationsExceeded",
++    }
++
+     def __init__(self, parent: QObject = None) -> None:
+         super().__init__(bridge)
+         if not qtutils.version_check('5.14'):
+@@ -878,8 +887,8 @@ def _verify_message(
+ 
+         if msg.type() == QDBusMessage.ErrorMessage:
+             err = msg.errorName()
+-            if err == "org.freedesktop.DBus.Error.NoReply":
+-                self.error.emit(msg.errorMessage())  # notification daemon is gone
++            if err in self._NON_FATAL_ERRORS:
++                self.error.emit(msg.errorMessage())
+                 return
+ 
+             raise Error(f"Got DBus error: {err} - {msg.errorMessage()}")
diff --git a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
index 3c57094fc0..40794c7ea8 100644
--- a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
+++ b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qutebrowser-tox
 
-# Copyright 2019-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qutebrowser-tox
-VERSION=${VERSION:-1.14.0}
-SSLVERSION=${SSLVERSION:-1.1.1h}
+VERSION=${VERSION:-2.2.0}
+SSLVERSION=${SSLVERSION:-1.1.1k}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,9 @@ 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 {} \;
 
-python3 scripts/mkvenv.py
+patch -p1 < $CWD/8232d38.patch
+
+python3 scripts/mkvenv.py --skip-smoke-test
 
 mv scripts/mkvenv.py.bak scripts/mkvenv.py
 
diff --git a/network/qutebrowser-tox/qutebrowser-tox.info b/network/qutebrowser-tox/qutebrowser-tox.info
index a9617e2c95..7e33863895 100644
--- a/network/qutebrowser-tox/qutebrowser-tox.info
+++ b/network/qutebrowser-tox/qutebrowser-tox.info
@@ -1,42 +1,50 @@
 PRGNAM="qutebrowser-tox"
-VERSION="1.14.0"
+VERSION="2.2.0"
 HOMEPAGE="https://qutebrowser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v1.14.0/qutebrowser-1.14.0.tar.gz \
-                 https://files.pythonhosted.org/packages/4e/5f/528232275f6509b1fff703c9280e58951a81abe24640905de621c9f81839/pip-20.2.3-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/37/80/f13112921d93c656edaafeb344ff2969515e349351485274bca7d129d8ef/setuptools-50.3.1-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/a7/00/3df031b3ecd5444d572141321537080b40c1c25e1caa3d86cdd12e5e919c/wheel-0.35.1-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/4c/bb/7fce18fbe0275d7a3e069a306d8f4662c77eda30ec6780634fd4a7ee50ce/PyQt5-5.15.1-5.15.1-cp35.cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \
+DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.2.0/qutebrowser-2.2.0.tar.gz \
+                 https://files.pythonhosted.org/packages/fe/ef/60d7ba03b5c442309ef42e7d69959f73aacccd0d86008362a681c4698e83/pip-21.0.1-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/ae/42/2876a3a136f8bfa9bd703518441c8db78ff1eeaddf174baa85c083c1fd15/setuptools-56.0.0-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/65/63/39d04c74222770ed1589c0eaba06c05891801219272420b40311cd60c880/wheel-0.36.2-py2.py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/ed/62/cd9f10702c75b242f82da858668fba0cda04cda92133244d3d1555e530b4/PyQt5-5.15.4-cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/83/d4/241a6a518d0bcf0a9fcdcbad5edfed18d43e884317eab8d5230a2b27e206/PyQt5_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \
                  https://files.pythonhosted.org/packages/31/24/f887203677955ba4d5d4efe9176ac7ed2bf84efce8c243ab91e63183ad9e/PyQt5_sip-12.8.1-cp37-cp37m-manylinux1_x86_64.whl \
-                 https://files.pythonhosted.org/packages/b3/c2/ae5ec98792c6e36c09f5e099cdb3d48a37583030dbe08e3682ce29f65b05/PyQtWebEngine-5.15.0-5.15.0-cp35.cp36.cp37.cp38-abi3-manylinux2014_x86_64.whl \
-                 https://files.pythonhosted.org/packages/14/df/479736ae1ef59842f512548bacefad1abed705e400212acba43f9b0fa556/attrs-20.2.0-py2.py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/8a/4a/570f9544d872c27d4c71f72c81af6890337a952a1b2923828c8f9dd56244/PyQtWebEngine-5.15.4-cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/48/62/117c9c96837287b181fce6da481065ddda68b3a8c0fa5f00ea62cc08b877/PyQtWebEngine_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \
+                 https://files.pythonhosted.org/packages/39/5d/68618c48e0c2f051143d0dfb981dc9098fe3362f77bfe53bb6f970800ac2/adblock-0.4.3-cp37-cp37m-manylinux2010_x86_64.whl \
                  https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/6b/15/a9fb9010f58d1c55dd0b7779db2334feb9a572d407024f39a60f44293861/cssutils-1.0.2-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/30/9e/f663a2aa66a09d838042ae1a2c5659828bb9b41ea3a6efa20a20fd92b121/Jinja2-2.11.2-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/98/7b/ff284bd8c80654e471b769062a9b43cc5d03e7a615048d96f4619df8d420/MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl \
-                 https://files.pythonhosted.org/packages/d7/72/49a7db1b245c13d0e38cfdc96c1adf6e3bd16a7a0dceb7b25faa6612353b/Pygments-2.7.1-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/f9/bd/10398e2c2d2070cc8a9c7153abfbd4ddb2895a2c52a32722ab8689e0cc7d/pyPEG2-2.15.2.tar.gz \
-                 https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c/PyYAML-5.3.1.tar.gz \
-                 https://github.com/mozilla/pdf.js/releases/download/v2.5.207/pdfjs-2.5.207-dist.zip \
-                 https://www.openssl.org/source/openssl-1.1.1h.tar.gz"
-MD5SUM_x86_64="3b6ae2780257d7140e2118d53c20e5e3 \
-               88cdbd5444038d644afc0f6cdfbf66e2 \
-               26b10f084f7953974f0bcc0cc5802874 \
-               ac76c90fdf41c3b5e46d6fdd97b5ec62 \
-               4e3b61a6f91df2abc8a34b1c175eed1c \
+                 https://files.pythonhosted.org/packages/99/8f/b0ac918b2234848ec5bd2a887d2be7d6686355fcb22d7a0efe878d5c1555/importlib_metadata-3.10.0-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/f0/5e/69e6a0602c1f18d390952177de648468c4a380252858b0022affc3ce7811/importlib_resources-5.1.2-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/7e/c2/1eece8c95ddbc9b1aeb64f5783a9e07a286de42191b7204d67b7496ddf35/Jinja2-2.11.3-py2.py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/c2/37/2e4def8ce3739a258998215df907f5815ecd1af71e62147f5eea2d12d4e8/MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl \
+                 https://files.pythonhosted.org/packages/3a/80/a52c0a7c5939737c6dca75a831e89658ecb6f590fb7752ac777d221937b9/Pygments-2.8.1-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/7a/a5/393c087efdc78091afa2af9f1378762f9821c9c1d7a22c5753fb5ac5f97a/PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl \
+                 https://files.pythonhosted.org/packages/60/7a/e881b5abb54db0e6e671ab088d079c57ce54e8a01a3ca443f561ccadb37e/typing_extensions-3.7.4.3-py3-none-any.whl \
+                 https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7de3337d0cd79074dd1bed4dd840f16ae/zipp-3.4.1-py3-none-any.whl \
+                 https://github.com/mozilla/pdf.js/releases/download/v2.7.570/pdfjs-2.7.570-dist.zip \
+                 https://www.openssl.org/source/openssl-1.1.1k.tar.gz"
+MD5SUM_x86_64="c3d6baacef40ee84e0c5b01fd0f3e3a7 \
+               e6e25dc3ecf3bab199b5ba1f14e81474 \
+               23559a79917a14480246c46e797e73c5 \
+               6c222a4df97a3311b4e189a59c47dea0 \
+               2020d0624acda6a6ab1abdb868f146ae \
+               038f56bd7af99133f591c7497b64ea17 \
                15ab5559104be2d1ca4c9c7802ed3e9b \
-               011d43bacfbcba5ff6dab244ddaec6d8 \
-               ec7abef7cca568875b161cd30c320d28 \
+               ff98ca82869ad5e0ecf8208908f3edbe \
+               d9fe06e7758913f32dc09324ff9abfdf \
+               504321e0e009e2fbb194ffde9d9a594a \
                1dcd07acf2b1875ed09428e1ddf7e028 \
-               e5e872b22e870f6834d49c1fb2d8a9fb \
-               e36888c21cb0f6716b9987be2972744d \
-               ce9334cb93c3fb155b6395458935ad61 \
-               ac2ef50fd1ece4c6df9a070e34728c0b \
-               84057d292808553290f0b78f42c64bbe \
-               d3590b85917362e837298e733321962b \
-               f2e0f7eacd8946bd3111a2d10dceaa72 \
-               53840c70434793127a3574433494e8d3"
+               f99fe16a8f0c96a7149bd99a84dbb6f9 \
+               4414bda5a4cd09f2b87cffa1aa10fd33 \
+               8e733c6f4cdef7f6a336299e8e548dfa \
+               c9c9888fa812cc8bc44cf6951b5d84e1 \
+               06d37d76edec4042d9438544df32e30e \
+               11fe109ca339ae11e59a410b85ecd14e \
+               cbf20d17c294eb6a2d5e98669cfe67a6 \
+               483005e4371c4272901908cffc968ac2 \
+               836a95e4a7dd859781673dc5222b4ec6 \
+               c4e7d95f782b08116afa27b30393dd27"
 REQUIRES="libxkbcommon krb5 python3 Pygments"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/network/qutebrowser/README b/network/qutebrowser/README
index f0ba8a760a..f1ca3e6236 100644
--- a/network/qutebrowser/README
+++ b/network/qutebrowser/README
@@ -1,26 +1,59 @@
-qutebrowser (qt5 keyboard driven webbrowser)
+Qutebrowser (qt5 keyboard driven web browser)
 
-qutebrowser is a keyboard-focused browser with a minimal
+Qutebrowser is a keyboard-focused browser with a minimal
 GUI. It's based on Python and PyQt5 and free software,
 licensed under the GPL.  It was inspired by other
 browsers/addons like dwb and Vimperator/Pentadactyl.
 
-Optional dependency:
+OPTIONAL DEPENDENCIES:
 
 qt5-webkit (for the webkit backend)
+Pygments   (for the :view-source command with the QtWebKit backend.
+            and with QtWebEngine for ":view-source --pygments")
 
-NOTE:
+ADBLOCK NOTE:
 
-pyPEG2 needs building for python3:
+If the Python `adblock' library is available, it is now used to
+integrate Brave's Rust adblocker library for improved adblocking based
+on ABP-like filter lists (such as EasyList).  If it is unavailable,
+Qutebrowser falls back to host-blocking.
 
-PYTHON3=yes ./pyPEG2.SlackBuild
+There are 36 rust requirements for python-adblock, and they aren't
+available on SBo yet, so the easiest way to install it is with pip3,
+which requires a working network connection.
 
-If you are using sbopkg you can add this as an option on
-their pages before starting the build queue.
+Instructions to install it into ~/.local/lib with pip3:
 
-NOTE 2:
+1. Update llvm to the package in extra/
 
-There is a list of changes and fixes for versions on the
-release page:
+To update with slackpkg:
 
-https://github.com/qutebrowser/qutebrowser/releases
+Edit /etc/slackpkg/slackpkg.conf and change the order of PRIORITY so
+that `extra' is before `%PKGMAIN' in the list:
+
+  PRIORITY=( extra patches %PKGMAIN pasture testing )
+
+Run `slackpkg upgrade llvm'
+
+Reset PRIORITY back to the default order.  The pip3 commands should be
+run as your normal user:
+
+2. Update pip3 to the latest version: pip3 install --user --upgrade pip
+
+3. Install adblock: pip3 install --user adblock
+
+Now start Qutebrowser and check `:version;'.  It should list adblock
+with the version number, e.g.:
+
+adblock: 0.4.2
+
+Next, run the update command:
+
+:adblock-update
+
+To see what options there are:
+
+:set content.blocking<TAB>
+
+llvm can be added to /etc/slackpkg/blacklist to keep this version, or
+run the slackpkg command again to revert back to the stock version.
diff --git a/network/qutebrowser/qutebrowser.SlackBuild b/network/qutebrowser/qutebrowser.SlackBuild
index cc79441afd..ad93cee7ae 100644
--- a/network/qutebrowser/qutebrowser.SlackBuild
+++ b/network/qutebrowser/qutebrowser.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qutebrowser
-VERSION=${VERSION:-1.14.0}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,20 +39,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -68,20 +54,14 @@ 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 {} \;
 
-make -f misc/Makefile install DESTDIR=$PKG PREFIX=/usr
+make -f misc/Makefile install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
 
 find $PKG -name \*\.opt-1.pyc -exec rm -f {} \;
 
-mkdir -p $PKG/usr/share/pixmaps
-cp icons/qutebrowser.xpm $PKG/usr/share/pixmaps/
-
-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
-
-mv $PKG/usr/share/man $PKG/usr
+install -D -m 0644 icons/qutebrowser.xpm \
+   $PKG/usr/share/pixmaps/qutebrowser.xpm
 
-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
+gzip -9 $PKG/usr/man/man1/qutebrowser.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.asciidoc $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/qutebrowser/qutebrowser.info b/network/qutebrowser/qutebrowser.info
index b235bcfa7b..c7fd782303 100644
--- a/network/qutebrowser/qutebrowser.info
+++ b/network/qutebrowser/qutebrowser.info
@@ -1,10 +1,10 @@
 PRGNAM="qutebrowser"
-VERSION="1.14.0"
+VERSION="2.2.0"
 HOMEPAGE="http://qutebrowser.org/"
-DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v1.14.0/qutebrowser-1.14.0.tar.gz"
-MD5SUM="a76d191e84939acad79161ef811db36f"
+DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v2.2.0/qutebrowser-2.2.0.tar.gz"
+MD5SUM="762d7dc0f939ee0ca54701ba233e7175"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-attrs python3-PyYAML Pygments Jinja2 pyPEG2 python3-PyQtWebEngine"
+REQUIRES="python3-PyYAML Jinja2 python3-PyQtWebEngine python-toml importlib-resources python-zipp"
 MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/network/qutebrowser/slack-desc b/network/qutebrowser/slack-desc
index d0989d4c8a..9d4ae8def6 100644
--- a/network/qutebrowser/slack-desc
+++ b/network/qutebrowser/slack-desc
@@ -10,10 +10,10 @@ qutebrowser: qutebrowser (qt5 keyboard driven webbrowser)
 qutebrowser:
 qutebrowser: qutebrowser is a keyboard-focused browser with a minimal GUI. It's
 qutebrowser: based on Python and PyQt5 and free software, licensed under the GPL.
-qutebrowser: It was inspired by other browsers/addons like dwb and
-qutebrowser: Vimperator/Pentadactyl.
+qutebrowser:
+qutebrowser: It was inspired by other browsers/addons like Vimperator/Pentadactyl
+qutebrowser: and dwb.
 qutebrowser:
 qutebrowser: qt5-webkit is an optional dependency for the webkit backend.
 qutebrowser:
 qutebrowser: https://qutebrowser.org
-qutebrowser:
diff --git a/network/rclone/README b/network/rclone/README
index 5eebbe99e5..fe1d6364a1 100644
--- a/network/rclone/README
+++ b/network/rclone/README
@@ -1,5 +1,5 @@
-Rclone ("rsync for cloud storage") is a command line program to sync files
-and directories to and from different cloud storage providers.
+Rclone ("rsync for cloud storage") is a command line program to sync
+files and directories to and from different cloud storage providers.
 
 Features
 
diff --git a/network/rclone/rclone.SlackBuild b/network/rclone/rclone.SlackBuild
index 2c836702d2..5e635a093d 100644
--- a/network/rclone/rclone.SlackBuild
+++ b/network/rclone/rclone.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2019-2020 Andrew Payne, Boston MA <phalange@komputermatrix.com>
+# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2017-2018 Rodrigo Gimenez <estrod[at]zoho[dot]com>
 # All rights reserved.
 #
@@ -21,11 +21,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Version History
-# 4-29-2020 update to version 1.50
-
 PRGNAM=rclone
-VERSION=${VERSION:-1.51.0}
+VERSION=${VERSION:-1.54.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/rclone/rclone.info b/network/rclone/rclone.info
index 70eedb524a..1e296f30ce 100644
--- a/network/rclone/rclone.info
+++ b/network/rclone/rclone.info
@@ -1,10 +1,10 @@
 PRGNAM="rclone"
-VERSION="1.51.0"
+VERSION="1.54.1"
 HOMEPAGE="https://rclone.org"
-DOWNLOAD="https://github.com/rclone/rclone/releases/download/v1.51.0/rclone-v1.51.0-linux-386.zip"
-MD5SUM="19f4942a0d531f86561d32640293c585"
-DOWNLOAD_x86_64="https://github.com/rclone/rclone/releases/download/v1.51.0/rclone-v1.51.0-linux-amd64.zip"
-MD5SUM_x86_64="ce394fa8b020edd5fabd4fbcb18ea60d"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/rclone/rclone/releases/download/v1.54.1/rclone-v1.54.1-linux-amd64.zip"
+MD5SUM_x86_64="93fee2d8ab0ad802e0476cf0c549f15c"
 REQUIRES=""
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 10f6e64f2e..60ff15d91d 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -86,7 +86,8 @@ patch -p0 < $CWD/Toolset.cmake.patch
 
 mkdir -p build
 cd build
-  /opt/cmake-202x/bin/cmake \
+  export "PATH=/opt/cmake-202x/bin:$PATH"
+  cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCONFDIR=/etc/$PRGNAM \
diff --git a/network/scapy/scapy.SlackBuild b/network/scapy/scapy.SlackBuild
index 61888c7449..9b63aebaed 100644
--- a/network/scapy/scapy.SlackBuild
+++ b/network/scapy/scapy.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for scapy (http://www.secdev.org/projects/scapy/)
 #
-# Copyright 2008-2019 Corrado Franco (http://conraid.net)
+# Copyright 2008-2021 Corrado Franco (http://conraid.net)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=scapy
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-2.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/scapy/scapy.info b/network/scapy/scapy.info
index 9c53507ecd..4c873228bc 100644
--- a/network/scapy/scapy.info
+++ b/network/scapy/scapy.info
@@ -1,8 +1,8 @@
 PRGNAM="scapy"
-VERSION="2.4.3"
+VERSION="2.4.4"
 HOMEPAGE="http://www.secdev.org/projects/scapy/"
-DOWNLOAD="https://github.com/secdev/scapy/archive/v2.4.3/scapy-2.4.3.tar.gz"
-MD5SUM="c94f3825391c102ca9740e41f4ed2ec0"
+DOWNLOAD="https://github.com/secdev/scapy/archive/v2.4.4/scapy-2.4.4.tar.gz"
+MD5SUM="e75f869b0d932732f810cae624783226"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/scrcpy/README b/network/scrcpy/README
new file mode 100644
index 0000000000..e921297b10
--- /dev/null
+++ b/network/scrcpy/README
@@ -0,0 +1,22 @@
+scrcpy is a tool that allows to display and control an Android device
+connected on USB (or over TCP/IP). It does not require any root access.
+
+scrcpy requires adb as runtime dependency. adb is part of the package
+android-tools on slackbuilds.org .
+
+scrcpy requires the Android device to be switched to Developer Mode
+and have a few options switched on (tested on a Redmi 9C NFC phone):
+
+- USB debugging
+
+On some devices it also requires:
+
+- USB debugging (Security settings)
+
+See https://github.com/Genymobile/scrcpy#requirements for additional
+details.
+
+This SlackBuild uses the prebuilt server instead of compiling it from
+source, to minimize dependencies.
+
+Note: the SlackBuild was tested on Slackware64-14.2 only
diff --git a/network/scrcpy/scrcpy.SlackBuild b/network/scrcpy/scrcpy.SlackBuild
new file mode 100644
index 0000000000..b7b5d586c8
--- /dev/null
+++ b/network/scrcpy/scrcpy.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for scrcpy
+
+# Copyright 2021 toolonely <lonely_@tutanota.com>
+# 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=scrcpy
+VERSION=${VERSION:-1.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --strip \
+    -Db_lto=true \
+    -Dprebuilt_server=$CWD/scrcpy-server-v$VERSION
+  ninja
+  DESTDIR=$PKG ninja install
+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
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/scrcpy/scrcpy.info b/network/scrcpy/scrcpy.info
new file mode 100644
index 0000000000..f715e06499
--- /dev/null
+++ b/network/scrcpy/scrcpy.info
@@ -0,0 +1,12 @@
+PRGNAM="scrcpy"
+VERSION="1.17"
+HOMEPAGE="https://github.com/Genymobile/scrcpy"
+DOWNLOAD="https://github.com/Genymobile/scrcpy/archive/v1.17/scrcpy-1.17.tar.gz \
+          https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-server-v1.17"
+MD5SUM="6ed058f41b918abe44f0a46b7d187a3f \
+        1de2cadd13e4da6f957aeaed9926adc6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="meson ffmpeg SDL2"
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/network/scrcpy/slack-desc b/network/scrcpy/slack-desc
new file mode 100644
index 0000000000..57efb9463d
--- /dev/null
+++ b/network/scrcpy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+scrcpy: scrcpy (display and control your Android device)
+scrcpy:
+scrcpy: This application provides display and control of Android devices
+scrcpy: connected on USB (or over TCP/IP). It does not require any
+scrcpy: root access.
+scrcpy:
+scrcpy: https://github.com/Genymobile/scrcpy
+scrcpy:
+scrcpy:
+scrcpy:
+scrcpy:
diff --git a/network/sfeed/README b/network/sfeed/README
index 91a54753ca..41378184a0 100644
--- a/network/sfeed/README
+++ b/network/sfeed/README
@@ -1,5 +1,5 @@
 SFeed is a simple RSS and Atom parser.
 
 README.SLACKWARE contains starter tips.
-/usr/doc/sfeed-0.9.18/README contains detailed post-install
+/usr/doc/sfeed-0.9.22/README contains detailed post-install
 instructions.
diff --git a/network/sfeed/README.SLACKWARE b/network/sfeed/README.SLACKWARE
index 177c4dcbe8..22702d68a3 100644
--- a/network/sfeed/README.SLACKWARE
+++ b/network/sfeed/README.SLACKWARE
@@ -1,17 +1,17 @@
-The following instructions are taken from /usr/doc/sfeed-0.9.18/README
-Note that the slackbuild removes /usr/share/doc/sfeed; thus, please
-copy necessary files from /usr/doc/sfeed-0.9.18
+The following instructions are taken from /usr/doc/sfeed-0.9.22/README
+Note that the slackbuild removes /usr/share/doc/sfeed; thus, please 
+copy necessary files from /usr/doc/sfeed-0.9.22
 
-- Initialize sfeed folders:
+- Initialize sfeed folders: 
 mkdir -p "$HOME/.sfeed/feeds"
 
 - Initialize sfeedrc, such as by copying and editing the example file:
-cp /usr/doc/sfeed-0.9.18/sfeedrc.example "$HOME/.sfeed/sfeedrc"
+cp /usr/doc/sfeed-0.9.22/sfeedrc.example "$HOME/.sfeed/sfeedrc"
 $EDITOR "$HOME/.sfeed/sfeedrc"
 
 - Update feeds:
 sfeed_update
 
 - Format feeds. For example, view feeds in HTML (no frames).
-cp /usr/doc/sfeed-0.9.18/style.css "$HOME/.sfeed/style.css"
+cp /usr/doc/sfeed-0.9.22/style.css "$HOME/.sfeed/style.css"
 sfeed_html $HOME/.sfeed/feeds/* > "$HOME/.sfeed/feeds.html"
diff --git a/network/sfeed/sfeed.SlackBuild b/network/sfeed/sfeed.SlackBuild
index 0f5eef63a6..5b9d2a4437 100644
--- a/network/sfeed/sfeed.SlackBuild
+++ b/network/sfeed/sfeed.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sfeed
 
-# Copyright 2019-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sfeed
-VERSION=${VERSION:-0.9.18}
+VERSION=${VERSION:-0.9.22}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+TAG=${TAG:-_SBo}		
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -70,7 +70,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 make
-make install PREFIX=/usr DESTDIR=$PKG
+make install PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$PKG
 
 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
diff --git a/network/sfeed/sfeed.info b/network/sfeed/sfeed.info
index 69faa7d6d2..fbed4d46f6 100644
--- a/network/sfeed/sfeed.info
+++ b/network/sfeed/sfeed.info
@@ -1,8 +1,8 @@
 PRGNAM="sfeed"
-VERSION="0.9.18"
+VERSION="0.9.22"
 HOMEPAGE="https://codemadness.org/releases/sfeed/"
-DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-0.9.18.tar.gz"
-MD5SUM="8c81d1eac38703a3884d294fb6600b00"
+DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-0.9.22.tar.gz"
+MD5SUM="96da8f382f7cc211a9de477a03b93785"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sic/README b/network/sic/README
index e721f1205d..c4a96694d5 100644
--- a/network/sic/README
+++ b/network/sic/README
@@ -1 +1,10 @@
-sic is an extremely simple IRC client.
+sic (simple irc client)
+
+sic is an extremely simple IRC client. It consists of less than 250
+lines of code.
+
+The default host is "irc.oftc.net" and the default port is 6667. You
+can change these by setting IRCHOST and/or IRCPORT in the script's
+environment, e.g.:
+
+# IRCHOST=chat.freenode.org IRCPORT=6668 ./sic.SlackBuild
diff --git a/network/sic/sic.SlackBuild b/network/sic/sic.SlackBuild
index f46aba1f79..fb4c624018 100644
--- a/network/sic/sic.SlackBuild
+++ b/network/sic/sic.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 #
 # Slackware build script for sic
-# Copyright 2011  Haroldo F. Jardim <hfjardim@gmail.com>
+# Copyright 2011  Haroldo F. Jardim <email removed>
+# Now maintained by B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +22,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201113 bkw: The original author of this script hasn't been heard
+# from since 2011, and it needs some attention (still mentions i486)
+# so I'm taking it.
+# - new maintainer
+# - i486 => i586
+# - fix that => than typo in slack-desc
+# - expand README a bit
+# - add env vars for default host and port
+# - simplify script
+
 PRGNAM=sic
 VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
@@ -28,7 +39,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -62,31 +73,28 @@ rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+chmod 644 *
 
 sed -i "s/CFLAGS =/CFLAGS +=/" config.mk
 
-CFLAGS="$SLKCFLAGS" \
+[ -n "$IRCHOST" ] && \
+  sed -i "/host *= *\"/s,\"[^\"]*\",\"$IRCHOST\"," $PRGNAM.c
+
+[ -n "$IRCPORT" ] && \
+  sed -i "/port *= *\"/s,\"[^\"]*\",\"$IRCPORT\"," $PRGNAM.c
+
+CFLAGS="$SLKCFLAGS -Wl,-s" \
 DESTDIR=$PKG \
 make \
   PREFIX=/usr \
   MANPREFIX=/usr/man \
   install
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/sic/sic.info b/network/sic/sic.info
index d3b6e83971..f466828855 100644
--- a/network/sic/sic.info
+++ b/network/sic/sic.info
@@ -6,5 +6,5 @@ MD5SUM="eb099e790c3ce7866df50d3fe1a52c25"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Haroldo F. Jardim"
-EMAIL="hfjardim@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/sic/slack-desc b/network/sic/slack-desc
index a5f706b903..8a2a71b460 100644
--- a/network/sic/slack-desc
+++ b/network/sic/slack-desc
@@ -8,7 +8,7 @@
    |-----handy-ruler------------------------------------------------------|
 sic: sic (simple irc client)
 sic:
-sic: sic is an extremely simple IRC client. It consists of less that 250
+sic: sic is an extremely simple IRC client. It consists of less than 250
 sic: lines of code.
 sic:
 sic: http://tools.suckless.org/sic
diff --git a/network/signal-desktop/signal-desktop.SlackBuild b/network/signal-desktop/signal-desktop.SlackBuild
index e65d029f75..dff9df468f 100644
--- a/network/signal-desktop/signal-desktop.SlackBuild
+++ b/network/signal-desktop/signal-desktop.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=signal-desktop
-VERSION=${VERSION:-1.37.2}
+VERSION=${VERSION:-5.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/signal-desktop/signal-desktop.info b/network/signal-desktop/signal-desktop.info
index 4c24ca0d86..9804287ed4 100644
--- a/network/signal-desktop/signal-desktop.info
+++ b/network/signal-desktop/signal-desktop.info
@@ -1,10 +1,10 @@
 PRGNAM="signal-desktop"
-VERSION="1.37.2"
+VERSION="5.0.0"
 HOMEPAGE="https://signal.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_1.37.2_amd64.deb"
-MD5SUM_x86_64="61b7bd8df88f975b6be35fb7a5bf37f6"
-REQUIRES=""
+DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_5.0.0_amd64.deb"
+MD5SUM_x86_64="08bb40ef176be688cec25957a06fffd8"
+REQUIRES="libxkbcommon"
 MAINTAINER="David O'Shaughnessy"
 EMAIL="dev@osh.id.au"
diff --git a/network/skype4pidgin/skype4pidgin.SlackBuild b/network/skype4pidgin/skype4pidgin.SlackBuild
index cbd3911f97..a66958472a 100644
--- a/network/skype4pidgin/skype4pidgin.SlackBuild
+++ b/network/skype4pidgin/skype4pidgin.SlackBuild
@@ -1,48 +1,47 @@
 #!/bin/sh
 
-# Slackware build script for SkypeWeb Chat for Pidgin
+# Slackware build script for skype4pidgin
 #
-# Copyright 2018 Ekin Akoglu <ekinakoglu@gmail.com>
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2018 Ekin Akoglu <ekinakoglu@gmail.com>
+# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
 # All rights reserved.
 #
-# Based on:
-# SBo's cmake-template
-#
-# Previously used chunks from Erik W. Hanson's FaceBook SlackBuild.
-#
 # 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.
+#  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=skype4pidgin
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586   ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm    ;;
-    *)       export ARCH=$MARCH ;;
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -52,9 +51,6 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -62,11 +58,6 @@ fi
 
 set -e
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -80,13 +71,13 @@ 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 {} \;
 
-# Go to skypeweb folder, since there are two plugins in this archive
 cd skypeweb
-
-# Let's compile!
 make
 make install DESTDIR=$PKG
 
+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 README.md gpl3.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/skype4pidgin/skype4pidgin.info b/network/skype4pidgin/skype4pidgin.info
index 51f94b4ff0..080f646cc6 100644
--- a/network/skype4pidgin/skype4pidgin.info
+++ b/network/skype4pidgin/skype4pidgin.info
@@ -1,10 +1,10 @@
 PRGNAM="skype4pidgin"
-VERSION="1.5"
+VERSION="1.7"
 HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.5/skype4pidgin-1.5.tar.gz"
-MD5SUM="8f524b4090b0d2c2fc4878477c61140f"
+DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.7/skype4pidgin-1.7.tar.gz"
+MD5SUM="6af9359c55f4644fc8848389df582848"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-glib"
-MAINTAINER="Ekin Akoglu"
-EMAIL="ekinakoglu@gmail.com"
+MAINTAINER="Dominik Drobek"
+EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/skype4pidgin/slack-desc b/network/skype4pidgin/slack-desc
index 1c774a97bd..d1d7a51476 100644
--- a/network/skype4pidgin/slack-desc
+++ b/network/skype4pidgin/slack-desc
@@ -11,8 +11,8 @@ skype4pidgin:
 skype4pidgin: Adds Skype client-less chat (text only) to Pidgin using the SkypeWeb
 skype4pidgin: protocol. Has many features already, such as group chat.
 skype4pidgin:
-skype4pidgin: Homepage:
-skype4pidgin: https://github.com/EionRobb/skype4pidgin
+skype4pidgin: Homepage: https://github.com/EionRobb/skype4pidgin
+skype4pidgin:
 skype4pidgin:
 skype4pidgin:
 skype4pidgin:
diff --git a/network/slurm/slurm.SlackBuild b/network/slurm/slurm.SlackBuild
index 0e0a980c4f..dd3bc02382 100644
--- a/network/slurm/slurm.SlackBuild
+++ b/network/slurm/slurm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Slurm
 
-# Copyright 2015-2019 Emmanuel N. Millan, Mendoza, Argentina.
+# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slurm
-VERSION=${VERSION:-19.05.5}
+VERSION=${VERSION:-20.11.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/slurm/slurm.info b/network/slurm/slurm.info
index 243a7e4d4d..ffc533afbe 100644
--- a/network/slurm/slurm.info
+++ b/network/slurm/slurm.info
@@ -1,10 +1,10 @@
 PRGNAM="slurm"
-VERSION="19.05.5"
+VERSION="20.11.4"
 HOMEPAGE="https://slurm.schedmd.com/"
-DOWNLOAD="https://download.schedmd.com/slurm/slurm-19.05.5.tar.bz2"
-MD5SUM="bb0ade8740e2fbc00dca394995269dae"
+DOWNLOAD="https://download.schedmd.com/slurm/slurm-20.11.4.tar.bz2"
+MD5SUM="4b5ff978527f73eff9691d559d19a494"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="munge"
+REQUIRES="munge python3"
 MAINTAINER="Emmanuel N. Millan"
 EMAIL="emmanueln@gmail.com"
diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild
index 135c17f2d7..5b982b084e 100644
--- a/network/spamassassin/spamassassin.SlackBuild
+++ b/network/spamassassin/spamassassin.SlackBuild
@@ -28,7 +28,7 @@
 # spamassassin database, and most of spamassassin dependencies' scripts.
 
 PRGNAM=spamassassin
-VERSION=${VERSION:-3.4.4}
+VERSION=${VERSION:-3.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info
index 6b9778b3ef..bfa522dc00 100644
--- a/network/spamassassin/spamassassin.info
+++ b/network/spamassassin/spamassassin.info
@@ -1,8 +1,8 @@
 PRGNAM="spamassassin"
-VERSION="3.4.4"
+VERSION="3.4.6"
 HOMEPAGE="https://spamassassin.apache.org/"
-DOWNLOAD="https://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.4.tar.bz2"
-MD5SUM="ce51fe5665d5838c56db6712846b58bb"
+DOWNLOAD="https://downloads.apache.org//spamassassin/source/Mail-SpamAssassin-3.4.6.tar.bz2"
+MD5SUM="0ef3f64ffcdf6f1e96068e19a16ce1be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwww-perl perl-Crypt-OpenSSL-Bignum perl-Encode-Detect perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-IP-Country perl-Image-Info perl-Mail-DKIM perl-Mail-SPF perl-Net-Ident perl-Net-Server pyzor re2c"
diff --git a/network/speedtest-cli/speedtest-cli.SlackBuild b/network/speedtest-cli/speedtest-cli.SlackBuild
index a4c0111069..fc239bbd50 100644
--- a/network/speedtest-cli/speedtest-cli.SlackBuild
+++ b/network/speedtest-cli/speedtest-cli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for speedtest-cli
 
-# Copyright 2014-2020  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=speedtest-cli
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
diff --git a/network/speedtest-cli/speedtest-cli.info b/network/speedtest-cli/speedtest-cli.info
index 2f063b47fe..6f2f9c5567 100644
--- a/network/speedtest-cli/speedtest-cli.info
+++ b/network/speedtest-cli/speedtest-cli.info
@@ -1,8 +1,8 @@
 PRGNAM="speedtest-cli"
-VERSION="2.1.2"
+VERSION="2.1.3"
 HOMEPAGE="https://github.com/sivel/speedtest-cli"
-DOWNLOAD="https://files.pythonhosted.org/packages/5c/c8/296057f78f16721863f9edb5abdb0d2648c5c6932697f29d80d920fdcd91/speedtest-cli-2.1.2.tar.gz"
-MD5SUM="543d38f8939e1716641cc7c00169ca03"
+DOWNLOAD="https://files.pythonhosted.org/packages/85/d2/32c8a30768b788d319f94cde3a77e0ccc1812dca464ad8062d3c4d703e06/speedtest-cli-2.1.3.tar.gz"
+MD5SUM="4bd1cf455e210ce47be1a3290988160b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ssh-chat/README b/network/ssh-chat/README
new file mode 100644
index 0000000000..839acf76ee
--- /dev/null
+++ b/network/ssh-chat/README
@@ -0,0 +1,23 @@
+ssh-chat (IRC-like chat server using ssh as a client)
+
+ssh-chat is a custom SSH server written in Go. Instead of a shell, you
+get a chat prompt.
+
+Note that this is only the server. There is no dedicated client: users
+just use ssh to connect to the server.
+
+This SlackBuild just repackages the official release binary, and does
+not attempt to compile anything.
+
+There is no startup script; if you want to run ssh-chat as a daemon,
+add something like this to /etc/rc.d/rc.local:
+
+if [ -x /usr/sbin/ssh-chat ]; then
+  cd /
+  /usr/sbin/ssh-chat <options> </dev/null >/dev/null 2>&1 &
+fi
+
+Replace <options> with whatever options you want (one of which should
+be --log). If you'd rather run as a non-root user, prefix the command
+with e.g. "su - nobody -s ", and make sure your --bind has a port
+numbered higher than 1024.
diff --git a/network/ssh-chat/slack-desc b/network/ssh-chat/slack-desc
new file mode 100644
index 0000000000..6b2b1f2413
--- /dev/null
+++ b/network/ssh-chat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+ssh-chat: ssh-chat (IRC-like chat server using ssh as a client)
+ssh-chat:
+ssh-chat: ssh-chat is a custom SSH server written in Go. Instead of a shell, you
+ssh-chat: get a chat prompt.
+ssh-chat:
+ssh-chat: Note that this is only the server. There is no dedicated client: users
+ssh-chat: just use ssh to connect to the server.
+ssh-chat:
+ssh-chat:
+ssh-chat:
+ssh-chat:
diff --git a/network/ssh-chat/ssh-chat.8 b/network/ssh-chat/ssh-chat.8
new file mode 100644
index 0000000000..a1889dafdb
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.8
@@ -0,0 +1,116 @@
+.\" Man page generated from reStructuredText.
+.
+.TH SSH-CHAT 8 "2020-11-18" "1.10" "SlackBuilds.org"
+.SH NAME
+ssh-chat \- custom ssh server providing IRC-like chat
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for ssh-chat(1) man page. Convert with:
+.
+.\" rst2man.py ssh-chat.rst > ssh-chat.8
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+ssh\-chat [\fI\-options\fP]
+.SH DESCRIPTION
+.sp
+ssh\-chat is a custom SSH server written in Go. Instead of a shell,
+clients get a chat prompt when they connect.
+.sp
+There is no specific client for ssh\-chat; use a standard ssh client to connect.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-v\fP,\fB  \-\-verbose
+Show verbose logging.
+.TP
+.B \-\-version
+Print version and exit.
+.TP
+.BI \-i\fP,\fB  \-\-identity\fB= file
+Private key to identify server with. (default: ~/.ssh/id_rsa)
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-bind=host:port
+Host and port to listen on. (default: 0.0.0.0:2022)
+.UNINDENT
+.INDENT 0.0
+.TP
+.BI \-\-admin\fB= file
+File of public keys who are admins.
+.TP
+.BI \-\-whitelist\fB= file
+Optional file of public keys who are allowed to connect.
+.TP
+.BI \-\-motd\fB= file
+Optional Message of the Day file.
+.TP
+.BI \-\-log\fB= file
+Write chat log to this file.
+.TP
+.BI \-\-pprof\fB= yes
+Enable pprof http server for profiling.
+.TP
+.B \-h\fP,\fB  \-\-help
+Show this help message
+.UNINDENT
+.SH DEMO
+.sp
+To connect to the project\(aqs ssh\-chat server:
+.sp
+$ ssh ssh.chat
+.SH EXAMPLES
+.sp
+ssh\-chat \-\-verbose \-\-bind ":22" \-\-identity ~/.ssh/id_dsa
+.sp
+To bind on port 22, you\(aqll need to make sure it\(aqs free (move any other ssh
+daemons to another port) and run ssh\-chat as root (or with sudo).
+.sp
+Note that ssh\-chat doesn\(aqt run in the background. If you want to \(aqdaemonize\(aq it,
+use the \-\-log option, and run it with a command like:
+.sp
+$ cd / ; ssh\-chat [options] \-\-log=logfile </dev/null >/dev/null 2>&1 &
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/ssh\-chat\-1.10/LICENSE for license information.
+.SH AUTHORS
+.sp
+ssh\-chat was written by Andrey Petrov.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+ssh(1), sshd(1)
+.sp
+The ssh\-chat homepage: \fI\%https://github.com/shazow/ssh\-chat/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/network/ssh-chat/ssh-chat.SlackBuild b/network/ssh-chat/ssh-chat.SlackBuild
new file mode 100644
index 0000000000..8227429ec8
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Slackware build script for ssh-chat
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=ssh-chat
+VERSION=${VERSION:-1.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+case "$ARCH" in
+  i?86)   SRCARCH="386"   ;;
+  x86_64) SRCARCH="amd64" ;;
+  *)      echo "Unsupported ARCH '$ARCH' (only i586, i686, x864_64 supported)" 1>&2
+          exit 1 ;;
+esac
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-linux_$SRCARCH.tgz
+cd $PRGNAM
+chown -R root:root .
+
+mkdir -p $PKG/usr/sbin $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0755 $PRGNAM $PKG/usr/sbin
+install -m0644 README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+
+# man page by SlackBuild author
+mkdir -p $PKG/usr/man/man8
+gzip -9 < $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
+
+# include our README since it has Slack-specific stuff.
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ssh-chat/ssh-chat.info b/network/ssh-chat/ssh-chat.info
new file mode 100644
index 0000000000..82a1e31182
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.info
@@ -0,0 +1,10 @@
+PRGNAM="ssh-chat"
+VERSION="1.10"
+HOMEPAGE="https://github.com/shazow/ssh-chat/"
+DOWNLOAD="https://github.com/shazow/ssh-chat/releases/download/v1.10/ssh-chat-linux_386.tgz"
+MD5SUM="21313e16a3ffcb2659231d93d4010d40"
+DOWNLOAD_x86_64="https://github.com/shazow/ssh-chat/releases/download/v1.10/ssh-chat-linux_amd64.tgz"
+MD5SUM_x86_64="624d31da8f76331bc03bd07f3ff6fd4c"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/ssh-chat/ssh-chat.rst b/network/ssh-chat/ssh-chat.rst
new file mode 100644
index 0000000000..1e3dfb44ef
--- /dev/null
+++ b/network/ssh-chat/ssh-chat.rst
@@ -0,0 +1,104 @@
+.. RST source for ssh-chat(1) man page. Convert with:
+..   rst2man.py ssh-chat.rst > ssh-chat.8
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.10
+.. |date| date::
+
+========
+ssh-chat
+========
+
+-----------------------------------------
+custom ssh server providing IRC-like chat
+-----------------------------------------
+
+:Manual section: 8
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+ssh-chat [*-options*]
+
+DESCRIPTION
+===========
+
+ssh-chat is a custom SSH server written in Go. Instead of a shell,
+clients get a chat prompt when they connect.
+
+There is no specific client for ssh-chat; use a standard ssh client to connect.
+
+OPTIONS
+=======
+
+-v, --verbose
+  Show verbose logging.
+
+--version
+  Print version and exit.
+
+-i, --identity=file
+  Private key to identify server with. (default: ~/.ssh/id_rsa)
+
+--bind=host:port
+  Host and port to listen on. (default: 0.0.0.0:2022)
+
+--admin=file
+  File of public keys who are admins.
+
+--whitelist=file
+  Optional file of public keys who are allowed to connect.
+
+--motd=file
+  Optional Message of the Day file.
+
+--log=file
+  Write chat log to this file.
+
+--pprof=yes
+  Enable pprof http server for profiling.
+
+-h, --help       Show this help message
+
+DEMO
+====
+
+To connect to the project's ssh-chat server:
+
+$ ssh ssh.chat
+
+EXAMPLES
+========
+
+ssh-chat --verbose --bind ":22" --identity ~/.ssh/id_dsa
+
+To bind on port 22, you'll need to make sure it's free (move any other ssh
+daemons to another port) and run ssh-chat as root (or with sudo).
+
+Note that ssh-chat doesn't run in the background. If you want to 'daemonize' it,
+use the --log option, and run it with a command like:
+
+$ cd / ; ssh-chat [options] --log=logfile </dev/null >/dev/null 2>&1 &
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/ssh-chat-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+ssh-chat was written by Andrey Petrov.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+ssh(1), sshd(1)
+
+The ssh-chat homepage: https://github.com/shazow/ssh-chat/
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild
index 57cb03c150..c473ebeec4 100644
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ b/network/sshfs-fuse/sshfs-fuse.SlackBuild
@@ -24,6 +24,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20201208 bkw: update for v3.7.1.
 # 20200804 bkw: update for v3.7.0.
 # 20200101 bkw:
 # - take over maintenance
@@ -31,7 +32,7 @@
 
 PRGNAM=sshfs-fuse
 SRCNAM=sshfs
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
index fd6101a05a..54bb56b52e 100644
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ b/network/sshfs-fuse/sshfs-fuse.info
@@ -1,8 +1,8 @@
 PRGNAM="sshfs-fuse"
-VERSION="3.7.0"
+VERSION="3.7.1"
 HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.0/sshfs-3.7.0.tar.xz"
-MD5SUM="0a1414bfad323d9f3d7aaccdec671e06"
+DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.1/sshfs-3.7.1.tar.xz"
+MD5SUM="22ac23d05ca7c56fb568627f086374d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson fuse3"
diff --git a/network/sshuttle/sshuttle.SlackBuild b/network/sshuttle/sshuttle.SlackBuild
index fac90f515f..4815edb73c 100644
--- a/network/sshuttle/sshuttle.SlackBuild
+++ b/network/sshuttle/sshuttle.SlackBuild
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sshuttle
-VERSION=${VERSION:-1.0.4}
+VERSION=${VERSION:-1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/sshuttle/sshuttle.info b/network/sshuttle/sshuttle.info
index adfb885888..bf996f1487 100644
--- a/network/sshuttle/sshuttle.info
+++ b/network/sshuttle/sshuttle.info
@@ -1,8 +1,8 @@
 PRGNAM="sshuttle"
-VERSION="1.0.4"
+VERSION="1.0.5"
 HOMEPAGE="https://github.com/sshuttle/sshuttle"
-DOWNLOAD="https://pypi.python.org/packages/source/s/sshuttle/sshuttle-1.0.4.tar.gz"
-MD5SUM="282b2d24521f9e44865025f51098a41a"
+DOWNLOAD="https://pypi.python.org/packages/source/s/sshuttle/sshuttle-1.0.5.tar.gz"
+MD5SUM="10c9765f2cc2a3e3e080a4a218428cc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/network/sslscan/README b/network/sslscan/README
index 681709f7d3..f20fe6373c 100644
--- a/network/sslscan/README
+++ b/network/sslscan/README
@@ -5,6 +5,6 @@ certificate, and is in Text and XML formats.
 
 Upstream recommends building statically against OpenSSL 1.1.1 for the
 widest compatibility for scanning. You can build against the system
- openssl with:
+openssl with:
 
 STATIC=no ./sslscan.SlackBuild
diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild
index 6dcdda2f4e..8cb4d1483a 100644
--- a/network/sslscan/sslscan.SlackBuild
+++ b/network/sslscan/sslscan.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright (c) 2010  Markus Reichelt, Aachen, DE
 # Copyright (c) 2014  Andrew Clemons, Wellington, New Zealand
 # Copyright (c) 2015  Andrew Clemons, Leimen, Germany
-# Copyright (c) 2016-2020  Andrew Clemons, Wellington, New Zealand
+# Copyright (c) 2016-2021  Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,7 +33,7 @@
 # 2014-10-23 - changed to build rbsec's fork from github
 
 PRGNAM=sslscan
-VERSION=${VERSION:-2.0.4}
+VERSION=${VERSION:-2.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
 STATIC=${STATIC:-yes}
 
 if [ "$STATIC" = "yes" ] ; then
-  OPENSSLVERSION=${OPENSSLVERSION:-7455f247e6f9d621fa79ae3af1588df23078fb11}
+  OPENSSLVERSION=${OPENSSLVERSION:-f82f5392f39797c1cf3a5d114c0125f121b0f769}
   tar xf "$CWD/openssl-$OPENSSLVERSION.tar.gz"
   mv "openssl-$OPENSSLVERSION" openssl
 fi
diff --git a/network/sslscan/sslscan.info b/network/sslscan/sslscan.info
index ab7f02bbb9..43d38b4602 100644
--- a/network/sslscan/sslscan.info
+++ b/network/sslscan/sslscan.info
@@ -1,10 +1,10 @@
 PRGNAM="sslscan"
-VERSION="2.0.4"
+VERSION="2.0.9"
 HOMEPAGE="https://github.com/rbsec/sslscan"
-DOWNLOAD="https://github.com/rbsec/sslscan/archive/2.0.4/sslscan-2.0.4.tar.gz \
-          https://github.com/openssl/openssl/archive/7455f247e6f9d621fa79ae3af1588df23078fb11/openssl-7455f247e6f9d621fa79ae3af1588df23078fb11.tar.gz"
-MD5SUM="4f1e9f1038ea1f4ca5ffe99a2b827d8b \
-        8bb842f9588d91bfa94a3a65785a7473"
+DOWNLOAD="https://github.com/rbsec/sslscan/archive/2.0.9/sslscan-2.0.9.tar.gz \
+          https://github.com/openssl/openssl/archive/f82f5392f39797c1cf3a5d114c0125f121b0f769/openssl-f82f5392f39797c1cf3a5d114c0125f121b0f769.tar.gz"
+MD5SUM="40499de48ece973c22fc342067161c80 \
+        442bd6882aaef2f2199507ec6c6ec357"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/strongswan/README b/network/strongswan/README
index 1a0e9c8a6a..df3dafaff3 100644
--- a/network/strongswan/README
+++ b/network/strongswan/README
@@ -4,7 +4,7 @@ This SlackBuild enables configure options which are known to compile
 without issue on a stock Slackware 14.2 system. These options provide
 additional functionality and increase this packages ability to
 inter operate with various vendor implementations. Unwanted and/or
-unnecessary plugins can be disabled a run-time via the 'load' flag in
+unnecessary plugins can be disabled at run-time via the 'load' flag in
 /etc/strongswan.d/charon/*.conf files.
 
 The following configure options are enabled by default:
@@ -67,6 +67,10 @@ EXTRA_CONFIG_OPTS environment variable.
 Example:
 env EXTRA_CONFIG_OPTS="--enable-socket-dynamic --enable-dhcp"  sh ./strongswan.SlackBuild
 
+Certain use cases may cause issues when bypass-lan is loaded. The SlackBuild script
+disables loading of the bypass-lan module. This can be changed in bypass-lan.conf
+after installation if required.
+
 The list of available options and their descriptions are available here:
 
 https://wiki.strongswan.org/projects/strongswan/wiki/Autoconf
diff --git a/network/strongswan/doinst.sh b/network/strongswan/doinst.sh
index a88995c5ed..19a6ff6ac8 100644
--- a/network/strongswan/doinst.sh
+++ b/network/strongswan/doinst.sh
@@ -1,22 +1,13 @@
-
 config() {
-    NEW="$1"
-    OLD="${1%.new}"
-    if [ ! -r $OLD ];
-    then
-        # If there's no config file by that name, mv it over:
-        mv $NEW $OLD
-    elif [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ];
-    then
-        # toss the redundant copy
-        rm $NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# doinst.sh reads the list of files from ./install/conffiles at install time.
-# ./install/conffiles was generated by strongswan.SlackBuild
-for cf in $(cat install/conffiles)
-do
-    config $cf.new
-done
diff --git a/network/strongswan/strongswan.SlackBuild b/network/strongswan/strongswan.SlackBuild
index a36d0c351c..b10ef33b87 100644
--- a/network/strongswan/strongswan.SlackBuild
+++ b/network/strongswan/strongswan.SlackBuild
@@ -23,6 +23,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
+# 2020-12-21
+#   - upgraded upstream version to 5.9.1
+#   - continue building bypass-lan but disable it by default so that the
+#     admin can still enable it if necessary
+#
 # 2019-09-17
 #   - upgraded upstream version to 5.8.1
 #   - added additional "enable" options to DEFAULT_CONFIG_OPTS
@@ -33,7 +38,7 @@
 #
 
 PRGNAM=strongswan
-VERSION=${VERSION:-5.8.1}
+VERSION=${VERSION:-5.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -165,7 +170,12 @@ cd $PKG
 for i in $(find etc -type f)
 do
     mv $i $i.new
-    echo $i
-done 1>>$PKG/install/conffiles
+    echo "config $i.new" >> $PKG/install/doinst.sh
+done
+
+# bypass-lan may cause problems for most users but it still used in many
+# situations. Disable it by default allowing the user to enable it if
+# necessary.
+sed -i -e 's/load = yes/load = no/' $PKG/etc/strongswan.d/charon/bypass-lan.conf.new
 
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/strongswan/strongswan.info b/network/strongswan/strongswan.info
index 2150bf7408..e546dc9c3b 100644
--- a/network/strongswan/strongswan.info
+++ b/network/strongswan/strongswan.info
@@ -1,8 +1,8 @@
 PRGNAM="strongswan"
-VERSION="5.8.1"
+VERSION="5.9.1"
 HOMEPAGE="https://www.strongswan.org"
-DOWNLOAD="https://download.strongswan.org/strongswan-5.8.1.tar.bz2"
-MD5SUM="5a6b9980cd1ac4fad3c24b55ed960ac9"
+DOWNLOAD="https://download.strongswan.org/strongswan-5.9.1.tar.bz2"
+MD5SUM="1f4db969d072e120dc12d1c116a0f658"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/surl/README b/network/surl/README
new file mode 100644
index 0000000000..0fe4a8170a
--- /dev/null
+++ b/network/surl/README
@@ -0,0 +1,14 @@
+surl (URL shortener)
+
+surl is a URL shortening command line application that supports
+various sites. It supports stdin or filename input. It grabs the
+URLs, converts them, and returns the same text that was used in the
+input. It is known to work with a few services, such as tinyurl.com,
+is.gd, and others.
+
+surl hasn't been updated in a few years, so not all of the services
+it supports are still functional due to changes in the services' APIs.
+The known non-working services have been disabled in this SlackBuild.
+
+Note: Another "surl" project exists, on github. It's a service, not a
+client like this surl.
diff --git a/network/surl/disable_broken_services.diff b/network/surl/disable_broken_services.diff
new file mode 100644
index 0000000000..a8c3581532
--- /dev/null
+++ b/network/surl/disable_broken_services.diff
@@ -0,0 +1,94 @@
+diff -Naur recipe-0.7.1.1-1~ppa2/docs/surl.1 recipe-0.7.1.1-1~ppa2.patched/docs/surl.1
+--- recipe-0.7.1.1-1~ppa2/docs/surl.1	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/docs/surl.1	2020-11-14 00:21:20.723851357 -0500
+@@ -124,16 +124,16 @@
+ .INDENT 0.0
+ .IP \(bu 2
+ .
+-\fCecho \(aqhttp://google.co.uk\(aq | surl \-a myapikey123 \-u example \-s bit.ly\fP
++\fCecho \(aqhttp://google.co.uk\(aq | surl \-a myapikey123 \-u example \-s turl.ca\fP
+ .IP \(bu 2
+ .
+-\fCecho \(aqhttp://www.google.com\(aq | surl \-s tr.im\fP
++\fCecho \(aqhttp://www.google.com\(aq | surl \-s clck.ru\fP
+ .IP \(bu 2
+ .
+-\fCsurl \-c http://www.google.com \-s tr.im\fP
++\fCsurl \-c http://www.google.com \-s is.gd\fP
+ .IP \(bu 2
+ .
+-\fCsurl \-f example.txt \-i \-s tr.im\fP
++\fCsurl \-f example.txt \-i \-s is.gd\fP
+ .UNINDENT
+ .SH BUGS
+ .sp
+diff -Naur recipe-0.7.1.1-1~ppa2/docs/surl.rst recipe-0.7.1.1-1~ppa2.patched/docs/surl.rst
+--- recipe-0.7.1.1-1~ppa2/docs/surl.rst	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/docs/surl.rst	2020-11-14 00:19:23.019862057 -0500
+@@ -64,10 +64,10 @@
+ 
+ EXAMPLES
+ ========
+-* ``echo 'http://google.co.uk' | surl -a myapikey123 -u example -s bit.ly``
+-* ``echo 'http://www.google.com' | surl -s tr.im``
+-* ``surl -c http://www.google.com -s tr.im``
+-* ``surl -f example.txt -i -s tr.im``
++* ``echo 'http://google.co.uk' | surl -a myapikey123 -u example -s turl.ca``
++* ``echo 'http://www.google.com' | surl -s clck.ru``
++* ``surl -c http://www.google.com -s is.gd``
++* ``surl -f example.txt -i -s is.gd``
+ 
+ BUGS
+ ====
+diff -Naur recipe-0.7.1.1-1~ppa2/surl/services.py recipe-0.7.1.1-1~ppa2.patched/surl/services.py
+--- recipe-0.7.1.1-1~ppa2/surl/services.py	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/surl/services.py	2020-11-14 00:15:04.403885566 -0500
+@@ -29,30 +29,11 @@
+ def supportedServices():
+     """ Returns a dictionary with the supported surl services """
+     dict_service = {
+-        'bit.ly'       : bitly_com('bit.ly'),
+-        'bitly.com'    : bitly_com('bit.ly'),
+-        'j.mp'         : bitly_com('j.mp'),
+         'chilp.it'     : chilp_it(),
+         'clck.ru'      : clck_ru(),
+-        'crum.bs'      : crum_bs(),
+-        'decenturl.com': decenturl_com(),
+-        'goo.gl'       : goo_gl(),
+         'is.gd'        : is_gd(),
+-        'liip.to'      : liip_to(),
+-        'metamark.net' : metamark_net(),
+-        'redir.ec'     : redir_ec(),
+-        'ri.ms'        : tinyarro_ws('ri.ms'),
+-        'ta.gd'        : tinyarro_ws('ta.gd'),
+-        'tinyarro.ws'  : tinyarro_ws('tinyarro.ws'),
+-        'sn.im'        : sn_im('sn.im'),
+-        'snipr.com'    : sn_im('snipr.com'),
+-        'snipurl.com'  : sn_im('snipurl.com'),
+-        'snurl.com'    : sn_im('snurl.com'),
+-        'tiny.cc'      : tiny_cc(),
+         'tinyurl.com'  : tinyurl_com(),
+         'turl.ca'      : turl_ca(),
+-        'twurl.nl'     : twurl_nl(),
+-        'urlx.ru'      : urlx_ru(),
+     }
+     return dict_service
+ 
+diff -Naur recipe-0.7.1.1-1~ppa2/surl/surl.py recipe-0.7.1.1-1~ppa2.patched/surl/surl.py
+--- recipe-0.7.1.1-1~ppa2/surl/surl.py	2013-09-01 08:27:48.000000000 -0400
++++ recipe-0.7.1.1-1~ppa2.patched/surl/surl.py	2020-11-14 00:17:42.283871214 -0500
+@@ -98,10 +98,10 @@
+         print("  -r, --script <path>\t\tThe surlscript to execute")
+         print("\n\nSupported URL shortening services:")
+         print(" %s\n" % ', '.join(service_list))
+-        print("Example:\n  echo 'http://google.co.uk' | surl -a myapikey123 -u example -s bit.ly")
+-        print("  echo 'http://www.google.com' | surl -s tr.im")
+-        print("  surl -c http://www.google.com -s tr.im")
+-        print("  surl -f example.txt -i -s tr.im")
++        print("Example:\n  echo 'http://google.co.uk' | surl -a myapikey123 -u example -s turl.ca")
++        print("  echo 'http://www.google.com' | surl -s clck.ru")
++        print("  surl -c http://www.google.com -s is.gd")
++        print("  surl -f example.txt -i -s is.gd")
+         ps.call("Help()")
+         ps.unload()
+         sys.exit(error)
diff --git a/network/surl/slack-desc b/network/surl/slack-desc
new file mode 100644
index 0000000000..f47efc3aac
--- /dev/null
+++ b/network/surl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+surl: surl (URL shortener)
+surl:
+surl: surl is a URL shortening command line application that supports
+surl: various sites. It supports stdin or filename input. It grabs the
+surl: URLs, converts them, and returns the same text that was used in the
+surl: input. It is known to work with a few services, such as tinyurl.com,
+surl: is.gd, and others.
+surl:
+surl:
+surl:
+surl:
diff --git a/network/surl/surl.SlackBuild b/network/surl/surl.SlackBuild
new file mode 100644
index 0000000000..743b1ef192
--- /dev/null
+++ b/network/surl/surl.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Slackware build script for surl
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=surl
+VERSION=${VERSION:-0.7.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Upstream files and directories are weirdly named.
+TARBALL=$CWD/${PRGNAM}_$VERSION-1~ppa2~ubuntu13.10.1.tar.gz
+SRCDIR=recipe-$VERSION-1~ppa2
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCDIR
+tar xvf $TARBALL
+cd $SRCDIR
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+patch -p1 < $CWD/disable_broken_services.diff
+
+sed -i 's,share/man,man,' setup.py
+python setup.py install --root=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/surl/surl.info b/network/surl/surl.info
new file mode 100644
index 0000000000..bc3564187c
--- /dev/null
+++ b/network/surl/surl.info
@@ -0,0 +1,10 @@
+PRGNAM="surl"
+VERSION="0.7.1.1"
+HOMEPAGE="https://launchpad.net/surl"
+DOWNLOAD="http://ppa.launchpad.net/surl/ppa/ubuntu/pool/main/s/surl/surl_0.7.1.1-1~ppa2~ubuntu13.10.1.tar.gz"
+MD5SUM="a70434fabce4c865edd744dd49786e8a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/syncthing/syncthing.SlackBuild b/network/syncthing/syncthing.SlackBuild
index 850ebef29c..f1bfc7fc9a 100644
--- a/network/syncthing/syncthing.SlackBuild
+++ b/network/syncthing/syncthing.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=syncthing
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/syncthing/syncthing.info b/network/syncthing/syncthing.info
index eced0acfb1..ded831ebd6 100644
--- a/network/syncthing/syncthing.info
+++ b/network/syncthing/syncthing.info
@@ -1,10 +1,10 @@
 PRGNAM="syncthing"
-VERSION="1.9.0"
+VERSION="1.14.0"
 HOMEPAGE="https://syncthing.net"
-DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.9.0/syncthing-linux-386-v1.9.0.tar.gz"
-MD5SUM="f5d974047b4e5208ff343e36e156470d"
-DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.9.0/syncthing-linux-amd64-v1.9.0.tar.gz"
-MD5SUM_x86_64="2318ea72b7e8c5ae1ef75319f4ed6e7b"
+DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.14.0/syncthing-linux-386-v1.14.0.tar.gz"
+MD5SUM="08be360b13127e25fd87e4ffb871150a"
+DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.14.0/syncthing-linux-amd64-v1.14.0.tar.gz"
+MD5SUM_x86_64="18a0ebe796720813b5fce68cc4256f98"
 REQUIRES=""
 MAINTAINER="Sebastian Arcus"
 EMAIL="s.arcus@open-t.co.uk"
diff --git a/network/teams/doinst.sh b/network/teams/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/network/teams/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/network/teams/teams.SlackBuild b/network/teams/teams.SlackBuild
index 76e834007d..9a6616383b 100644
--- a/network/teams/teams.SlackBuild
+++ b/network/teams/teams.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for teams
 
-# Copyright 2020  Mario Preksavec, Zagreb, Croatia
+# Copyright 2020, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=teams
-VERSION=${VERSION:-1.3.00.958}
+VERSION=${VERSION:-1.4.00.7556}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,14 +52,25 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 ar p $CWD/${PRGNAM}_${VERSION}_amd64.deb data.tar.xz | tar -xvJ
 
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
 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
+( cd $PKG/usr
+  for i in share/teams/LICENSE* ; do ln -s ../../$i $PKG/usr/doc/$PRGNAM-$VERSION/ ; done
+)
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/network/teams/teams.info b/network/teams/teams.info
index 7c821d73ff..fdf0ea4ee4 100644
--- a/network/teams/teams.info
+++ b/network/teams/teams.info
@@ -1,10 +1,10 @@
 PRGNAM="teams"
-VERSION="1.3.00.958"
+VERSION="1.4.00.7556"
 HOMEPAGE="https://teams.microsoft.com/downloads"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.958_amd64.deb"
-MD5SUM_x86_64="a99569f085aa19f911a8d69182c312cf"
+DOWNLOAD_x86_64="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.7556_amd64.deb"
+MD5SUM_x86_64="3144e00cf533801a3aa48e38d5ec81dc"
 REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild
index e2c90f7756..291d818b28 100644
--- a/network/teamviewer/teamviewer.SlackBuild
+++ b/network/teamviewer/teamviewer.SlackBuild
@@ -26,7 +26,7 @@
 # Modified by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=teamviewer
-VERSION=${VERSION:-15.10.5}
+VERSION=${VERSION:-15.16.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info
index 53c3085b42..217c4407c8 100644
--- a/network/teamviewer/teamviewer.info
+++ b/network/teamviewer/teamviewer.info
@@ -1,10 +1,10 @@
 PRGNAM="teamviewer"
-VERSION="15.10.5"
+VERSION="15.16.8"
 HOMEPAGE="https://www.teamviewer.com/"
-DOWNLOAD="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.10.5_i386.deb"
-MD5SUM="d326a6874cb3f5954463385e8bcb6632"
-DOWNLOAD_x86_64="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.10.5_amd64.deb"
-MD5SUM_x86_64="b1cd598a462824a3ad06c9c295cf4f42"
+DOWNLOAD="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.16.8_i386.deb"
+MD5SUM="84817975641bcc20521103f2ccd3d519"
+DOWNLOAD_x86_64="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.16.8_amd64.deb"
+MD5SUM_x86_64="88897103b9207acc3529291e0611b8c0"
 REQUIRES="qt5-webkit"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/telegram/README b/network/telegram/README
index 02b7582df6..1bab2085c8 100644
--- a/network/telegram/README
+++ b/network/telegram/README
@@ -2,3 +2,5 @@ Telegram
 
 Telegram is a cloud-based mobile and desktop messaging app with a focus on
 security and speed.
+
+NOTE: Telegram x86 (32 bit) stays at 2.4.4
diff --git a/network/telegram/telegram.SlackBuild b/network/telegram/telegram.SlackBuild
index 4fd4f25538..9f1ff6eff5 100644
--- a/network/telegram/telegram.SlackBuild
+++ b/network/telegram/telegram.SlackBuild
@@ -28,7 +28,7 @@
 PRGNAM=telegram
 SRCNAM=tsetup
 SRCDIR=Telegram
-VERSION=${VERSION:-2.4.4}
+VERSION=${VERSION:-2.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,6 +51,7 @@ case "$ARCH" in
   i586)
     SRC="${SRCNAM}32"
     LIBDIRSUFFIX=""
+    VERSION=2.4.4
     ;;
   *)
     echo "$ARCH is not supported."
diff --git a/network/telegram/telegram.info b/network/telegram/telegram.info
index 8f3a4b6e78..dbee2cd1c0 100644
--- a/network/telegram/telegram.info
+++ b/network/telegram/telegram.info
@@ -1,10 +1,10 @@
 PRGNAM="telegram"
-VERSION="2.4.4"
+VERSION="2.7.1"
 HOMEPAGE="https://telegram.org"
 DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.2.4.4.tar.xz"
 MD5SUM="857865fb0baa7aabadf3a6136f8276ba"
-DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.2.4.4.tar.xz"
-MD5SUM_x86_64="068508e2c837fbee1057444b5c17fb1e"
+DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.2.7.1.tar.xz"
+MD5SUM_x86_64="e552cb10bcb0e3fa5dfe5eba8a45371a"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/tightvnc/README b/network/tightvnc/README
index e6132561f5..6c055516e3 100644
--- a/network/tightvnc/README
+++ b/network/tightvnc/README
@@ -13,3 +13,17 @@ TightVNC is:
 
 TightVNC also ships with Xvnc, a headless X server that speaks the VNC
 protocol.
+
+NOTE: vncserver/Xvnc requires a configuration file (tightvncserver.conf) in
+/etc to operate.  A suitable, basic, configuration file is by this slackbuild
+in /usr/doc/tightvnc-1.3.10.  Copy this file to /etc before attempting to
+launch vncserver/Xvnc.
+
+Also included is a small, optional, patch to vncserver (vncserver.patch),
+contributed by Andrei Desculì–¢, which modifies the vncserver startup to use
+the system configured xinitrc instead of the minimal xterm/twm configuration 
+used by default.  Note that if you have launched vncserver prior to applying
+the optional patch, you will need to remove the $HOME/.vnc/xstartup file to
+use the alternate configuration.  If you wish to use the optional patch, you
+will need to apply it manually (i.e., using the 'patch' command from the
+command line).
diff --git a/network/tightvnc/tightvnc.SlackBuild b/network/tightvnc/tightvnc.SlackBuild
index d6219e6301..2e946b2b4f 100644
--- a/network/tightvnc/tightvnc.SlackBuild
+++ b/network/tightvnc/tightvnc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tightvnc
 
-# Copyright 2014 Richard Ellis (USA)
+# Copyright 2014-2021 Richard Ellis (USA)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -69,6 +69,10 @@ 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 {} \;
 
+# Apply patch to tightvncserver.conf for Slack 14.2 font and rgb.txt path
+# locations
+patch < $CWD/tightvncserver.conf.patch
+
 xmkmf
 make World
 
diff --git a/network/tightvnc/tightvncserver.conf.patch b/network/tightvnc/tightvncserver.conf.patch
new file mode 100644
index 0000000000..fc8e5ebe99
--- /dev/null
+++ b/network/tightvnc/tightvncserver.conf.patch
@@ -0,0 +1,16 @@
+--- tightvncserver.conf.orig	2021-03-27 00:33:41.773056870 -0400
++++ tightvncserver.conf	2021-03-27 00:38:34.195076768 -0400
+@@ -23,11 +23,11 @@
+ # $vncUserDir = "$ENV{HOME}/.vnc";
+ # $fontPath = "unix/:7100";
+ # $authType = "-rfbauth $vncUserDir/passwd";
+-# $colorPath = "/usr/lib/X11/rgb";
++$colorPath = "/usr/share/X11/rgb";
+ 
+ ## Here is another example of setting the font path:
+ #
+-# $fontPath = "/usr/lib/X11/fonts/misc/"
++$fontPath = "/usr/share/fonts/misc/"
+ # $fontPath = "$fontPath,/usr/lib/X11/fonts/75dpi/";
+ 
+ ## You might wish to make your vnc directory under /tmp, to make sure
diff --git a/network/tightvnc/vncserver.patch b/network/tightvnc/vncserver.patch
new file mode 100644
index 0000000000..0c3bc23380
--- /dev/null
+++ b/network/tightvnc/vncserver.patch
@@ -0,0 +1,30 @@
+--- vncserver.orig	2009-02-12 06:27:18.000000000 +0200
++++ vncserver	2021-03-27 08:35:57.331183132 -0400
+@@ -48,10 +48,12 @@
+ 
+ $defaultXStartup
+     = ("#!/bin/sh\n\n".
+-       "xrdb \$HOME/.Xresources\n".
+-       "xsetroot -solid grey\n".
+-       "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
+-       "twm &\n");
++       "#xrdb \$HOME/.Xresources\n".
++       "#xsetroot -solid grey\n".
++       "#xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
++       "#twm &\n".
++       "# Start X session using xinitrc \n".
++       "/etc/X11/xinit/xinitrc &\n");
+ 
+ $xauthorityFile = "$ENV{XAUTHORITY}";
+ 
+@@ -161,7 +163,9 @@
+ 
+ $cmd = "Xvnc :$displayNumber";
+ $cmd .= " -desktop " . &quotedString($desktopName);
+-$cmd .= " -httpd $vncClasses";
++if ( -d $vncCllasses ) {
++   $cmd .= " -httpd $vncClasses";
++}
+ $cmd .= " -auth $xauthorityFile";
+ $cmd .= " -geometry $geometry" if ($geometry);
+ $cmd .= " -depth $depth" if ($depth);
diff --git a/network/tinyirc/README b/network/tinyirc/README
new file mode 100644
index 0000000000..47008dec66
--- /dev/null
+++ b/network/tinyirc/README
@@ -0,0 +1,10 @@
+tinyirc (tiny IRC client)
+
+A very small, stripped down IRC client. It doesn't have most of the
+more advanced commands in the ircII family of IRC clients, nor does
+it have any color, but it works, and it's tiny. It's a bare bones
+IRC client which has no editing capabilities other than backspace to
+correct typing.
+
+This SlackBuild sets the default IRC server to chat.freenode.org, when
+tinyirc is run without a server argument.
diff --git a/network/tinyirc/slack-desc b/network/tinyirc/slack-desc
new file mode 100644
index 0000000000..51060e7c9b
--- /dev/null
+++ b/network/tinyirc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+tinyirc: tinyirc (tiny IRC client)
+tinyirc:
+tinyirc: A very small, stripped down IRC client. It doesn't have most of the
+tinyirc: more advanced commands in the ircII family of IRC clients, nor does it
+tinyirc: have any color, but it works, and it's tiny.
+tinyirc:
+tinyirc:
+tinyirc:
+tinyirc:
+tinyirc:
+tinyirc:
diff --git a/network/tinyirc/tinyirc.SlackBuild b/network/tinyirc/tinyirc.SlackBuild
new file mode 100644
index 0000000000..1abc53e2cf
--- /dev/null
+++ b/network/tinyirc/tinyirc.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for tinyirc
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=tinyirc
+VERSION=${VERSION:-1.1_4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCVER=${VERSION%_*}.dfsg.1
+DEBVER=${VERSION#*_}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.gz
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+# Change the default server and port to something people actually use.
+make $PRGNAM \
+  SERVER="chat.freenode.net" \
+  PORT=6667 \
+  CFLAGS="$SLKCFLAGS -DPOSIX -DDO_CTCP -DCURSES -DHAVE_NCURSES" \
+  LIBS=-lncurses \
+  CC=${CC:-gcc}
+
+mkdir -p $PKG/usr/bin
+install -m0755 -s $PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/man/man1
+pod2man -cSlackBuilds.org -s1 -r1.1 -nTINYIRC debian/$PRGNAM.1.pod | \
+  gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# These are text files, not word docs, don't confuse desktop software.
+rename .doc _doc.txt *.doc
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING announce *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/tinyirc/tinyirc.info b/network/tinyirc/tinyirc.info
new file mode 100644
index 0000000000..6325f142f8
--- /dev/null
+++ b/network/tinyirc/tinyirc.info
@@ -0,0 +1,12 @@
+PRGNAM="tinyirc"
+VERSION="1.1_4"
+HOMEPAGE="https://github.com/nlaredo/tinyirc/"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1-4.debian.tar.xz"
+MD5SUM="b655596125a525d54f82dba6a96a84b7 \
+        e2c989de71c7324bc86fb6aa45a4d8a3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/tixati/tixati.SlackBuild b/network/tixati/tixati.SlackBuild
index 060b436a95..132c608c68 100644
--- a/network/tixati/tixati.SlackBuild
+++ b/network/tixati/tixati.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tixati
 
-# Copyright 2015-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tixati
-VERSION=${VERSION:-2.63_1}
+VERSION=${VERSION:-2.78_1}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/tixati/tixati.info b/network/tixati/tixati.info
index 0bbb325eed..5403092742 100644
--- a/network/tixati/tixati.info
+++ b/network/tixati/tixati.info
@@ -1,10 +1,10 @@
 PRGNAM="tixati"
-VERSION="2.63_1"
+VERSION="2.78_1"
 HOMEPAGE="https://www.tixati.com/"
-DOWNLOAD="https://download2.tixati.com/download/tixati-2.63-1.i686.manualinstall.tar.gz"
-MD5SUM="4d7814d0e0333fe45d77160e1a20537c"
-DOWNLOAD_x86_64="https://download2.tixati.com/download/tixati-2.63-1.x86_64.manualinstall.tar.gz"
-MD5SUM_x86_64="4030ab24e1bb7a18dfcbde538816e5c6"
+DOWNLOAD="https://download2.tixati.com/download/tixati-2.78-1.i686.manualinstall.tar.gz"
+MD5SUM="227f8d87b5ebfe7bfe3e0b9ed5841c82"
+DOWNLOAD_x86_64="https://download2.tixati.com/download/tixati-2.78-1.x86_64.manualinstall.tar.gz"
+MD5SUM_x86_64="256b842726851370f9359a5a2c815165"
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/tnftp/tnftp.SlackBuild b/network/tnftp/tnftp.SlackBuild
index 3b6f930511..6c1dac60e8 100644
--- a/network/tnftp/tnftp.SlackBuild
+++ b/network/tnftp/tnftp.SlackBuild
@@ -23,6 +23,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>.
 
+# 20201024 bkw: update for v20200705.
 # 20180629 bkw:
 # - Take over maintenance.
 # - Add 'todo' to docdir, BUILD=2.
@@ -30,8 +31,8 @@
 # - Script simplification.
 
 PRGNAM=tnftp
-VERSION=${VERSION:-20151004}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20200705}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,11 +71,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # ./configure --enable-ipv6 --with-socks
 #   configure: WARNING: IPv6 is incompatible with socks, disabling IPv6 support
@@ -83,7 +81,14 @@ find -L . \
 # /usr/bin/tnftp, and tell the user he can call the socks one by name,
 # or replace the symlink.
 
-# These configure options are used for both builds:
+# These configure options are used for both builds. A word about libedit:
+# --enable-editcomplete enables linking with the system libedit (if it
+# exists). If there is no system libedit, it builds and links with the
+# bundled libedit in the tnftp source. To avoid nasty surprises
+# caused by libedit changes (since libedit is not one of my builds),
+# I'm going to force it to use the bundled libedit. The disadvantage
+# is that it doubles the sizes of the binaries, but they're still well
+# under 1MB each.
 runconfig() {
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
@@ -95,6 +100,7 @@ runconfig() {
     --docdir=/usr/doc/$PRGNAM-$VERSION \
     --build=$ARCH-slackware-linux \
     --enable-editcomplete \
+    --with-local-libedit \
     --enable-ssl \
     "$@"
 }
diff --git a/network/tnftp/tnftp.info b/network/tnftp/tnftp.info
index ab6241890a..61ac2b566b 100644
--- a/network/tnftp/tnftp.info
+++ b/network/tnftp/tnftp.info
@@ -1,8 +1,8 @@
 PRGNAM="tnftp"
-VERSION="20151004"
+VERSION="20200705"
 HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp"
-DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20151004.tar.gz"
-MD5SUM="a49fbe752318d5a7893f900046ea00d5"
+DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20200705.tar.gz"
+MD5SUM="fc6a6bfa3d14005b3275b5508c47b8e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild
index 10539fdc10..b2133030b7 100644
--- a/network/tor-browser/tor-browser.SlackBuild
+++ b/network/tor-browser/tor-browser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tor-browser
 
-# Copyright 2014-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tor-browser
-VERSION=${VERSION:-10.0.2}
+VERSION=${VERSION:-10.0.15}
 PRGLANG=${PRGLANG:-en-US}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/tor-browser/tor-browser.info b/network/tor-browser/tor-browser.info
index ebe62d676f..2b8d5d838a 100644
--- a/network/tor-browser/tor-browser.info
+++ b/network/tor-browser/tor-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="tor-browser"
-VERSION="10.0.2"
+VERSION="10.0.15"
 HOMEPAGE="https://www.torproject.org"
-DOWNLOAD="https://dist.torproject.org/torbrowser/10.0.2/tor-browser-linux32-10.0.2_en-US.tar.xz"
-MD5SUM="7088da975c3a5d74c09d2db4d412c146"
-DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/10.0.2/tor-browser-linux64-10.0.2_en-US.tar.xz"
-MD5SUM_x86_64="b8133ee04be102ba61d281fb01686f2d"
+DOWNLOAD="https://dist.torproject.org/torbrowser/10.0.15/tor-browser-linux32-10.0.15_en-US.tar.xz"
+MD5SUM="aad93bbabe1076403b40eb80b6afa575"
+DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/10.0.15/tor-browser-linux64-10.0.15_en-US.tar.xz"
+MD5SUM_x86_64="2f6994bae2b0c2a58506f8900bbd5dee"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/tor/README b/network/tor/README
index ef4c0eff74..425c746d6f 100644
--- a/network/tor/README
+++ b/network/tor/README
@@ -8,18 +8,20 @@ applications with built-in anonymity, safety, and privacy features.
 This script requires a 'tor' user/group to exist before running.
 The recommended UID/GID is 220. You can create these like so:
   groupadd -g 220 tor
-  useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null -s /bin/false tor
+  useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null \
+  -s /bin/false tor
 
-You can pass another user/group to the script; this is however, less safe:
+You can pass another user/group to the script; this is however, less
+safe:
   TOR_USER=nobody TOR_GROUP=nogroup sh tor.SlackBuild
 
 The following can be used to start/stop tor automatically:
-/etc/rc.d/rc.local
+In file /etc/rc.d/rc.local, add following
   if [ -x /etc/rc.d/rc.tor ]; then
     /etc/rc.d/rc.tor start
   fi
 
-/etc/rc.d/rc.local_shutdown
+In /etc/rc.d/rc.local_shutdown, add following
   if [ -x /etc/rc.d/rc.tor ]; then
     /etc/rc.d/rc.tor stop
   fi
diff --git a/network/tor/README.SLACKWARE b/network/tor/README.SLACKWARE
index cc45175114..70b0f821d7 100644
--- a/network/tor/README.SLACKWARE
+++ b/network/tor/README.SLACKWARE
@@ -16,3 +16,7 @@ Starting from Tor 0.4.2.5 this is the default for the tor.SlackBuild.
 
 Also, since Tor 0.4.2.5 contrib/dist/torctl has been removed by upstream.
 Have a look at https://bugs.torproject.org/30550
+
+In case your relay does not start after the upgrade to Tor 0.4.5.6+
+make sure your system is IPv6 ready. Have a look at 
+https://lists.torproject.org/pipermail/tor-relays/2021-February/019299.html
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 11ca2521ed..564266e9c8 100644
--- a/network/tor/tor.SlackBuild
+++ b/network/tor/tor.SlackBuild
@@ -27,7 +27,7 @@
 # Updated by Markus Reichelt slackbuilds@mareichelt.de
 
 PRGNAM=tor
-VERSION=${VERSION:-0.4.4.5}
+VERSION=${VERSION:-0.4.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/tor/tor.info b/network/tor/tor.info
index 0efaae9a0d..ee4a5c1eaf 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,8 +1,8 @@
 PRGNAM="tor"
-VERSION="0.4.4.5"
+VERSION="0.4.5.7"
 HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://dist.torproject.org/tor-0.4.4.5.tar.gz"
-MD5SUM="b061b7c4ce6102fb7c800b73c8573388"
+DOWNLOAD="https://dist.torproject.org/tor-0.4.5.7.tar.gz"
+MD5SUM="3a1800592293a8d4122823eab9233739"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tribler/tribler.info b/network/tribler/tribler.info
index d14d0ae232..a9f6fb0f92 100644
--- a/network/tribler/tribler.info
+++ b/network/tribler/tribler.info
@@ -6,5 +6,5 @@ MD5SUM="979de2e5a22a4c5f13d3e78c77a8bbb2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython apsw python-twisted pyasn1 pycrypto python-requests netifaces gmpy libtorrent-rasterbar PyXML"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/network/uTox/uTox.SlackBuild b/network/uTox/uTox.SlackBuild
index b1684e95cb..96c5837ac5 100644
--- a/network/uTox/uTox.SlackBuild
+++ b/network/uTox/uTox.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for uTox
 #
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
-# Copyright 2016-2020 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2021 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -19,7 +19,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=uTox
-VERSION=${VERSION:-0.17.2}
+VERSION=${VERSION:-0.18.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/uTox/uTox.info b/network/uTox/uTox.info
index b8c8986fc6..de041273db 100644
--- a/network/uTox/uTox.info
+++ b/network/uTox/uTox.info
@@ -1,8 +1,8 @@
 PRGNAM="uTox"
-VERSION="0.17.2"
+VERSION="0.18.1"
 HOMEPAGE="https://github.com/uTox/uTox"
-DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.17.2/uTox-0.17.2-full.tar.gz"
-MD5SUM="2aedb6199ca6238bd2cf274864fd658c"
+DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.18.1/uTox-0.18.1-full.tar.gz"
+MD5SUM="add2df145292ffe0a30965bdf3e8a3d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="c-toxcore libfilteraudio check"
diff --git a/network/ubertooth/ubertooth.SlackBuild b/network/ubertooth/ubertooth.SlackBuild
index 412f21b290..8ca1ed36f8 100644
--- a/network/ubertooth/ubertooth.SlackBuild
+++ b/network/ubertooth/ubertooth.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ubertooth
-VERSION=${VERSION:-2018_12_R1}
+VERSION=${VERSION:-2020.12.R1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-${VERSION//_/-}
+cd $PRGNAM-${VERSION//./-}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/network/ubertooth/ubertooth.info b/network/ubertooth/ubertooth.info
index 95d4311f20..781e286c17 100644
--- a/network/ubertooth/ubertooth.info
+++ b/network/ubertooth/ubertooth.info
@@ -1,8 +1,8 @@
 PRGNAM="ubertooth"
-VERSION="2018_12_R1"
+VERSION="2020.12.R1"
 HOMEPAGE="https://github.com/greatscottgadgets/ubertooth"
-DOWNLOAD="https://github.com/greatscottgadgets/ubertooth/archive/2018-12-R1/ubertooth-2018_12_R1.tar.gz"
-MD5SUM="4b97ee031722a2965633b2bd49e2309d"
+DOWNLOAD="https://github.com/greatscottgadgets/ubertooth/archive/2020-12-R1/ubertooth-2020.12.R1.tar.gz"
+MD5SUM="4dd2d6539cfc694f3d63424c65b28394"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libbtbb"
diff --git a/network/unbound/unbound.SlackBuild b/network/unbound/unbound.SlackBuild
index b35d89548b..a305c32a7a 100644
--- a/network/unbound/unbound.SlackBuild
+++ b/network/unbound/unbound.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unbound
-VERSION=${VERSION:-1.10.0}
+VERSION=${VERSION:-1.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -123,7 +123,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/var/run/unbound
 chown $USER:$GROUP $PKG/var/run/unbound/
-install -m 0640 -D doc/example.conf.in $PKG/etc/unbound/unbound.conf.new
+mv $PKG/etc/unbound/unbound.conf $PKG/etc/unbound/unbound.conf.new
 install -m 0644 -D $CWD/rc.unbound $PKG/etc/rc.d/rc.unbound.new
 
 mkdir -p $PKG/install
diff --git a/network/unbound/unbound.info b/network/unbound/unbound.info
index 467b1fbcc6..0d32e3cc39 100644
--- a/network/unbound/unbound.info
+++ b/network/unbound/unbound.info
@@ -1,8 +1,8 @@
 PRGNAM="unbound"
-VERSION="1.10.0"
+VERSION="1.13.1"
 HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/"
-DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.10.0.tar.gz"
-MD5SUM="0754392baee77c18fd8295b5e51e6fd8"
+DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz"
+MD5SUM="0cd660a40d733acc6e7cce43731cac62"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ldns"
diff --git a/network/varnish/README b/network/varnish/README
index d8c1194ce9..4d742ff527 100644
--- a/network/varnish/README
+++ b/network/varnish/README
@@ -4,5 +4,3 @@ HTTP and configure it to cache the contents.
 
 Varnish is free software licensed under a two-clause BSD licence, also
 known as the FreeBSD licence.  The project was initiated in 2005.
-
-Homepage: https://www.varnish-cache.org/
diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild
index 269f74dff2..deec595f7e 100644
--- a/network/varnish/varnish.SlackBuild
+++ b/network/varnish/varnish.SlackBuild
@@ -6,7 +6,7 @@
 # Updated by Emmanuel N. Millan
 
 PRGNAM=varnish
-VERSION=${VERSION:-6.5.0}
+VERSION=${VERSION:-6.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info
index 6c4841b69b..17e7902b96 100644
--- a/network/varnish/varnish.info
+++ b/network/varnish/varnish.info
@@ -1,8 +1,8 @@
 PRGNAM="varnish"
-VERSION="6.5.0"
+VERSION="6.5.1"
 HOMEPAGE="https://www.varnish-cache.org/"
-DOWNLOAD="https://varnish-cache.org/_downloads/varnish-6.5.0.tgz"
-MD5SUM="9cf1b50bee82119cc2cf315277534d35"
+DOWNLOAD="https://varnish-cache.org/_downloads/varnish-6.5.1.tgz"
+MD5SUM="09304038cb3bb744a7c1742c8de848a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx"
diff --git a/network/verm/verm.SlackBuild b/network/verm/verm.SlackBuild
index 7cf47f213e..501041a028 100644
--- a/network/verm/verm.SlackBuild
+++ b/network/verm/verm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for verm
 
-# Copyright 2016-2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2018,2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=verm
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,6 +72,8 @@ 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 {} \;
 
+rm -f go.mod # go.mod exists but should not
+
 SRCDIR="$(pwd)"
 export GOPATH="$SRCDIR"
 mkdir -p src/github.com/willbryant
diff --git a/network/verm/verm.info b/network/verm/verm.info
index dbe359a680..10ac2daaa6 100644
--- a/network/verm/verm.info
+++ b/network/verm/verm.info
@@ -1,8 +1,8 @@
 PRGNAM="verm"
-VERSION="1.5.1"
+VERSION="1.5.2"
 HOMEPAGE="https://github.com/willbryant/verm"
-DOWNLOAD="https://github.com/willbryant/verm/archive/1.5.1/verm-1.5.1.tar.gz"
-MD5SUM="18b7c847dda5c52a74bb49ecd35a447a"
+DOWNLOAD="https://github.com/willbryant/verm/archive/1.5.2/verm-1.5.2.tar.gz"
+MD5SUM="7bd8fb6aea4483531ac1f5475205cfc0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index 2f3c73400b..36d63fd57a 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -4,7 +4,7 @@
 #
 # Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia
-# Copyright 2019-2020, Ruari Oedegaard, Oslo, Norway
+# Copyright 2019-2021, Ruari Oedegaard, Oslo, Norway
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vivaldi
-VERSION=${VERSION:-3.4.2066.86}
-FFMPEG_VERSION="86.0.4240.75"
+VERSION=${VERSION:-3.7.2218.52}
+FFMPEG_VERSION="89.0.4389.90"
 WIDEVINE_VERSION="4.10.1582.2"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index 99cf9dabf1..c26ed60304 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,16 +1,16 @@
 PRGNAM="vivaldi"
-VERSION="3.4.2066.86"
+VERSION="3.7.2218.52"
 HOMEPAGE="https://vivaldi.com"
-DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.86-1_i386.deb \
-          https://launchpadlibrarian.net/501166678/chromium-codecs-ffmpeg-extra_86.0.4240.75-0ubuntu0.16.04.1_i386.deb \
+DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.52-1_i386.deb \
+          https://launchpadlibrarian.net/528923945/chromium-codecs-ffmpeg-extra_89.0.4389.90-0ubuntu0.16.04.2_i386.deb \
           https://dl.google.com/widevine-cdm/4.10.1582.2-linux-ia32.zip"
-MD5SUM="6c4715c8cfaf72313169b231fdc8b787 \
-        10215936f249eb67ad66ca3422c3cd03 \
+MD5SUM="688dcaabbded8a31e70c2be6a5ba3ddf \
+        00d2f09afa9447e9a506c9a4ff52bbdd \
         247a331a4d5bceb9f20366a39136a4fa"
-DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.86-1_amd64.deb \
-                 https://launchpadlibrarian.net/501258521/chromium-codecs-ffmpeg-extra_86.0.4240.75-0ubuntu0.16.04.1_amd64.deb"
-MD5SUM_x86_64="16967591130901d3acfc65c059d68853 \
-               d4634848a7488794b982d3ebd4eb870c"
-REQUIRES=""
+DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.52-1_amd64.deb \
+                 https://launchpadlibrarian.net/528666745/chromium-codecs-ffmpeg-extra_89.0.4389.90-0ubuntu0.16.04.2_amd64.deb"
+MD5SUM_x86_64="89626848f295aa3d6b9fd60706a03f3a \
+               7bbb3d45d15b806c0b29ed0a1728af64"
+REQUIRES="libxkbcommon"
 MAINTAINER="Ruari Oedegaard"
 EMAIL="sbo@ruari.com"
diff --git a/network/wakeonlan/wakeonlan.SlackBuild b/network/wakeonlan/wakeonlan.SlackBuild
index b3f34ea2b3..8b0c3eaad3 100644
--- a/network/wakeonlan/wakeonlan.SlackBuild
+++ b/network/wakeonlan/wakeonlan.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wakeonlan
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2020  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -69,7 +69,10 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/bin
+mv $PKG/usr/bin/wol $PKG/usr/bin/wakeonlan
 
 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
diff --git a/network/wakeonlan/wakeonlan.info b/network/wakeonlan/wakeonlan.info
index df492a4c92..41c393af24 100644
--- a/network/wakeonlan/wakeonlan.info
+++ b/network/wakeonlan/wakeonlan.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/w/wakeonlan/wakeonlan-0.2.2.ta
 MD5SUM="738cf2e3c01de8ff393d0863f5172383"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/waterfox/README b/network/waterfox/README
deleted file mode 100644
index b3c73f191f..0000000000
--- a/network/waterfox/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Waterfox was one of the first widely distributed 64-Bit browsers on
-the Web and quickly gained a loyal following. At one time, Waterfox
-had one thing in mind - speed. But now Waterfox also attempts to be an
-ethical, user-oriented browser.
-
-Features:
-
-    Disabled Encrypted Media Extensions (EME)
-    Disabled Web Runtime (deprecated as of 2015)
-    Removed Pocket
-    Removed Telemetry
-    Removed data collection
-    Removed startup profiling
-    Allow running of all 64-Bit NPAPI plugins
-    Allow running of unsigned extensions
-    Removal of Sponsored Tiles on New Tab Page
-    Addition of Duplicate Tab option
-    Locale selector in about:preferences > General
-
-Waterfox is only available for the x86-64 architecture.
-
-This SlackBuild just repackages the binary package provided by the project.
-It doesn't attempt to build the browser from source.
diff --git a/network/waterfox/waterfox.desktop b/network/waterfox/waterfox.desktop
deleted file mode 100644
index 66c468c68f..0000000000
--- a/network/waterfox/waterfox.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Waterfox Web Browser
-Comment=Browse the World Wide Web
-Keywords=Internet;WWW;Browser;Web;Explorer
-Exec=waterfox %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=waterfox
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-StartupNotify=true
diff --git a/network/waterfox/waterfox.info b/network/waterfox/waterfox.info
deleted file mode 100644
index 6a5736d48a..0000000000
--- a/network/waterfox/waterfox.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="waterfox"
-VERSION="2020.02.1"
-HOMEPAGE="https://www.waterfox.net"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://storage-waterfox.netdna-ssl.com/releases/linux64/installer/waterfox-classic-2020.02.1.en-US.linux-x86_64.tar.bz2"
-MD5SUM_x86_64="20b4a4bce5eb61adf850996fdd8265ad"
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/network/wavemon/README b/network/wavemon/README
index f1f5ddfffd..3d1a5c51a6 100644
--- a/network/wavemon/README
+++ b/network/wavemon/README
@@ -11,5 +11,6 @@ It was originally developed by Jan Morgenstern.
 
 If you use a filesystem that supports posix capabilities, an easy way to
 start wavemon as a normal user, while still providing it with all of the
-access permissions it requires, is by issuing the following command as root:
+access permissions it requires, is by issuing the following command as
+root:
 # setcap cap_net_admin=eip /usr/bin/wavemon
diff --git a/network/wavemon/wavemon.SlackBuild b/network/wavemon/wavemon.SlackBuild
index e9c8499483..79885a0040 100644
--- a/network/wavemon/wavemon.SlackBuild
+++ b/network/wavemon/wavemon.SlackBuild
@@ -3,11 +3,11 @@
 # Wavemon Copyright 2012 Vliegendehuiskat, Netherlands
 
 # Slackware build script for <wavemon>
-# Written by Nick Warne <nick@linicks.net> 2019...
+# Written by Nick Warne <warne.nick@gmail.com> 2019...
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
 PRGNAM=wavemon
-VERSION=${VERSION:-0.9.0}
+VERSION=${wavemon-0.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/wavemon/wavemon.info b/network/wavemon/wavemon.info
index bdb5de65f9..0774583082 100644
--- a/network/wavemon/wavemon.info
+++ b/network/wavemon/wavemon.info
@@ -1,10 +1,10 @@
 PRGNAM="wavemon"
-VERSION="0.9.0"
+VERSION="0.9.3"
 HOMEPAGE="https://github.com/uoaerg/wavemon"
-DOWNLOAD="https://github.com/uoaerg/wavemon/archive/v0.9.0/wavemon-0.9.0.tar.gz"
-MD5SUM="7276dd648da5463798f3662d33c29ecc"
+DOWNLOAD="https://github.com/uoaerg/wavemon/archive/v0.9.3/wavemon-0.9.3.tar.gz"
+MD5SUM="57879ea3bd68381f5e13c721d285f588"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Nick Warne"
-EMAIL="nick@linicks.net"
+EMAIL="warne.nick@gmail.com"
diff --git a/network/weboob/README b/network/weboob/README
deleted file mode 100644
index fa3f535370..0000000000
--- a/network/weboob/README
+++ /dev/null
@@ -1,2 +0,0 @@
-weboob (Web Out Of Browsers) provides several applications to
-interact with a lot of websites. 
diff --git a/network/weboob/weboob.info b/network/weboob/weboob.info
deleted file mode 100644
index 38feeabdd3..0000000000
--- a/network/weboob/weboob.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="weboob"
-VERSION="0.a"
-HOMEPAGE="http://weboob.org/"
-DOWNLOAD="https://symlink.me/attachments/download/165/weboob-0.a.tar.gz"
-MD5SUM="15568485fd2bea4c53b69a6edb8c7e45"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="PyYAML feedparser html2text lxml mechanize nose python-dateutil rtmpdump"
-MAINTAINER="Brandon Soonaye"
-EMAIL="brandonsoonaye@live.fr"
diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild
index ab283f2c07..ee28d2d234 100644
--- a/network/weechat/weechat.SlackBuild
+++ b/network/weechat/weechat.SlackBuild
@@ -2,7 +2,7 @@
 
 # Originally written by hollywoodb (hollywoodb@fastmail.fm)
 # Maintained 2011-2016 by sero (firebird209 at gmail dot com)
-# Maintained 2017-2020 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Maintained 2017-2021 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=weechat
-VERSION=${VERSION:-2.9}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/weechat/weechat.info b/network/weechat/weechat.info
index 0e557c4918..90780d1f44 100644
--- a/network/weechat/weechat.info
+++ b/network/weechat/weechat.info
@@ -1,8 +1,8 @@
 PRGNAM="weechat"
-VERSION="2.9"
+VERSION="3.1"
 HOMEPAGE="http://www.weechat.org"
-DOWNLOAD="http://weechat.org/files/src/weechat-2.9.tar.bz2"
-MD5SUM="4ecefa761affbe9083eb7a1942ae3fd6"
+DOWNLOAD="http://weechat.org/files/src/weechat-3.1.tar.bz2"
+MD5SUM="baf116300f4ae4050e46b61d11a4df81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/network/wendzelnntpd/README b/network/wendzelnntpd/README
new file mode 100644
index 0000000000..ec444c9b28
--- /dev/null
+++ b/network/wendzelnntpd/README
@@ -0,0 +1,12 @@
+WendzelNNTPd is an IPv6-ready Usenet server (NNTP daemon) with the
+main goal to maximize usability on the console level. WendzelNNTPd
+achieves this by breaking down complicated things into an easy-to-use
+configuration file and tool. The server is portable (Linux/*BSD/
+*nix), supports AUTHINFO authentication, contains support for Access
+Control Lists (ACL), Role-based Access Control (RBAC) and supports
+invisible newsgroups. It currently supports MySQL and SQLite backends.
+
+Note: This package is compiled without MYSQL support and uses
+      sqlite3 instead.
+      If you want to use MySQL instead of sqlite3, remove the
+      "MYSQL=NO" before ./configure in wendzelnntpd.Slackbuild.
diff --git a/network/wendzelnntpd/doinst.sh b/network/wendzelnntpd/doinst.sh
new file mode 100644
index 0000000000..203ca9ad9f
--- /dev/null
+++ b/network/wendzelnntpd/doinst.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+UDBFILE=/var/spool/news/wendzelnntpd/usenet.db
+
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
+  if [ -e ${OLD} ]; then
+    cp -a ${OLD} ${NEW}.incoming
+    cat ${NEW} > ${NEW}.incoming
+    mv ${NEW}.incoming ${NEW}
+  fi
+  config ${NEW}
+}
+
+# Keep same perms when installing rc.httpd.new:
+preserve_perms etc/rc.d/rc.wendzelnntpd.new
+
+# Backup old Usenet DB file if existent; if necessary, this allows to provide multiple copies; because after 2x replacing an existing with a .new file, we would lose all postings! However, replacing an existing usenet.db file is necessary since the database format might change and an old file might become incompatible with a newer one.
+if [ -f $UDBFILE ]; then mv $UDBFILE ${UDBFILE}.`date +"%m-%d-%y-%H:%M"`.bkp; chmod 0600 ${UDBFILE}.`date +"%m-%d-%y-%H:%M"`.bkp; echo "***Your old usenet database was backuped!***"; fi
+
+# install config file
+config var/spool/news/wendzelnntpd/usenet.db.new
+
+# Handle config files.  Unless this is a fresh installation, the
+# admin will have to move the .new files into place to complete
+# the package installation, as we don't want to clobber files that
+# may contain local customizations.
+config etc/wendzelnntpd.conf.new
+
+# create a first standard newsgroup so that server is directly usable after install
+/usr/sbin/wendzelnntpadm addgroup alt.wendzelnntpd.test y
diff --git a/network/wendzelnntpd/slack-desc b/network/wendzelnntpd/slack-desc
new file mode 100644
index 0000000000..fa06852729
--- /dev/null
+++ b/network/wendzelnntpd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+wendzelnntpd: wendzelnntpd (Easy-to-use NNTP Server)
+wendzelnntpd:
+wendzelnntpd: WendzelNNTPd is an IPv6-ready Usenet server (NNTP daemon) with the
+wendzelnntpd: main goal to maximize usability on the console level. WendzelNNTPd
+wendzelnntpd: achieves this by breaking down complicated things into an easy-to-use
+wendzelnntpd: configuration file and tool. The server is portable (Linux/*BSD/
+wendzelnntpd: *nix), supports AUTHINFO authentication, contains support for Access
+wendzelnntpd: Control Lists (ACL), Role-based Access Control (RBAC) and supports
+wendzelnntpd: invisible newsgroups. It currently supports MySQL and SQLite backends.
+wendzelnntpd: Note: This package is compiled without MYSQL support and uses
+wendzelnntpd:       sqlite3 instead.
diff --git a/network/wendzelnntpd/wendzelnntpd.SlackBuild b/network/wendzelnntpd/wendzelnntpd.SlackBuild
new file mode 100644
index 0000000000..cff6ef214a
--- /dev/null
+++ b/network/wendzelnntpd/wendzelnntpd.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/bash -e
+
+# Slackware build script for WendzelNNTPd
+#
+# Copyright 2021 Steffen Wendzel, https://www.wendzel.de
+# 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.
+#
+# This script was written using the one from slackbuilds.org as a reference.
+# Thanks to Patrick Volkerding and Adis Nezirovic for the original work.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=wendzelnntpd
+VERSION=${VERSION:-2.1.2}
+TGZ_DIRNAME=cdpxe-WendzelNNTPd-5ea53d6 # for v2.1.2
+BUILD=${BUILD:-3}
+TAG=${TAG:-_SBo}
+TMP=${TMP:-/tmp/SBo}
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+set -e
+
+# 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.txz"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PRGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+
+cd $TMP
+rm -rf $TGZ_DIRNAME
+tar -xvf $CWD/v$VERSION.tar.gz
+cd $TGZ_DIRNAME
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Configure:
+MYSQL=NO DESTDIR=/usr CONFDIR=/etc ./configure
+
+# Build and install:
+make
+
+# spool dir + usenet database
+mkdir -p $PKG/var/spool/news/wendzelnntpd
+
+# og-rwx since the passwords are stored in the database too!
+install -d -m 0700 -o 0 -g 0 $PKG/var/spool/news/wendzelnntpd
+cp database/usenet.db $PKG/var/spool/news/wendzelnntpd/usenet.db.new
+chmod 600 $PKG/var/spool/news/wendzelnntpd/usenet.db.new
+
+# add the rc.d script ; also fix URL of the deamon binary
+mkdir -p $PKG/etc/rc.d
+cat scripts/startup/init.d_script | sed 's/^DAEMON=.*$/DAEMON=\/usr\/sbin\/wendzelnntpd/' > $PKG/etc/rc.d/rc.wendzelnntpd.new
+chmod 644 $PKG/etc/rc.d/rc.wendzelnntpd.new
+
+# add the binaries
+mkdir -p $PKG/usr/sbin
+chmod 0755 $PKG/usr/sbin/
+cp -v bin/wendzelnntpd bin/wendzelnntpadm $PKG/usr/sbin/
+chmod 755 $PKG/usr/sbin/*
+
+# rename config file to .new
+cp -v wendzelnntpd.conf $PKG/etc/wendzelnntpd.conf.new
+chmod 644 $PKG/etc/wendzelnntpd.conf.new
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+# add version number to doc directory and also put it in /usr/doc
+# instead of /usr/share/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -vr docs/docs $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -v docs/docs.pdf $PKG/usr/doc/$PRGNAM-$VERSION/docs.pdf
+cp -v AUTHOR CHANGELOG HISTORY README.md INSTALL LICENSE database/usenet.db_struct database/mysql_db_struct.sql $PKG/usr/doc/$PRGNAM-$VERSION/
+chmod -R 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# This is kept for the case that wendzelnntpd will contain a manpage in the future.
+# Compress man pages
+# If the man pages are installed to /usr/share/man instead, you'll need to either
+# add the --mandir=/usr/man flag to configure or move them manually after the
+# make install process is run.
+#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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-$VERSION-$ARCH-${BUILD}${TAG}.${PKGTYPE:-tgz}
+
diff --git a/network/wendzelnntpd/wendzelnntpd.info b/network/wendzelnntpd/wendzelnntpd.info
new file mode 100644
index 0000000000..53e888a969
--- /dev/null
+++ b/network/wendzelnntpd/wendzelnntpd.info
@@ -0,0 +1,10 @@
+PRGNAM="wendzelnntpd"
+VERSION="2.1.2"
+HOMEPAGE="https://cdpxe.github.io/WendzelNNTPd/"
+DOWNLOAD="https://downloads.sourceforge.net/project/wendzelnntpd/v2.1.2/v2.1.2.tar.gz"
+MD5SUM="3cbeeca74d5e6ddb7e3bb99e99f86ddf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Steffen Wendzel"
+EMAIL="wendzel@hs-worms.de"
diff --git a/network/wire/wire.SlackBuild b/network/wire/wire.SlackBuild
index 680c62e094..d8216bbb3c 100644
--- a/network/wire/wire.SlackBuild
+++ b/network/wire/wire.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wire
-VERSION=${VERSION:-3.20.2934}
+VERSION=${VERSION:-3.24.2939}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/wire/wire.info b/network/wire/wire.info
index dac5cb8e32..d904ad0ea5 100644
--- a/network/wire/wire.info
+++ b/network/wire/wire.info
@@ -1,10 +1,10 @@
 PRGNAM="wire"
-VERSION="3.20.2934"
+VERSION="3.24.2939"
 HOMEPAGE="https://wire.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://wire-app.wire.com/linux/Wire-3.20.2934_amd64.deb"
-MD5SUM_x86_64="8ea529da6ff1630595a23e2fcdac8cd9"
+DOWNLOAD_x86_64="https://wire-app.wire.com/linux/Wire-3.24.2939_amd64.deb"
+MD5SUM_x86_64="f6ef6b45745579dac66d46a6d319ddf8"
 REQUIRES=""
 MAINTAINER="David O'Shaughnessy"
 EMAIL="dev@osh.id.au"
diff --git a/network/wireguard-linux-compat/README b/network/wireguard-linux-compat/README
index 3aa5507bfa..5db7f66f25 100644
--- a/network/wireguard-linux-compat/README
+++ b/network/wireguard-linux-compat/README
@@ -2,6 +2,11 @@ WireGuard is a VPN that uses state-of-the-art cryptography. It is
 designed as a general purpose VPN for running on embedded interfaces
 and super computers alike, fit for many different circumstances.
 
-This script only builds the WireGuard kernel module.  Userspace 
+This script only builds the WireGuard kernel module.  Userspace
 tools are also required to configure and use WireGuard tunnels. Refer
-to the wireguard-tools script on Slackbuilds.
+to the wireguard-tools script on SlackBuilds.
+
+NOTE: Slackware-current contains the WireGuard module as of
+kernel 5.10.1. If running an up to date -current, installing this
+module is no longer required. You will most likely still want to
+install the wireguard-tools SlackBuilds package.
diff --git a/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild b/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild
index 74b2c0080f..c205fdcd73 100644
--- a/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild
+++ b/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for the WireGuard kernel module
 
 # Copyright 2017-2019 David Spencer, Baildon, West Yorkshire, U.K.
-# Copyright 2020 Anj Duvnjak
+# Copyright 2020-2021 Anj Duvnjak
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wireguard-linux-compat
-VERSION=${VERSION:-1.0.20200908}
+VERSION=${VERSION:-1.0.20210219}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/wireguard-linux-compat/wireguard-linux-compat.info b/network/wireguard-linux-compat/wireguard-linux-compat.info
index 888b419065..eb59f72278 100644
--- a/network/wireguard-linux-compat/wireguard-linux-compat.info
+++ b/network/wireguard-linux-compat/wireguard-linux-compat.info
@@ -1,8 +1,8 @@
 PRGNAM="wireguard-linux-compat"
-VERSION="1.0.20200908"
+VERSION="1.0.20210219"
 HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200908.tar.xz"
-MD5SUM="bb8c981d0c537c9544ae42269ec548e5"
+DOWNLOAD="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210219.tar.xz"
+MD5SUM="8f177b685c7a18ea51ae7f4132cfb444"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/wireguard-tools/wireguard-tools.SlackBuild b/network/wireguard-tools/wireguard-tools.SlackBuild
index a1204696d2..14099a1bd2 100644
--- a/network/wireguard-tools/wireguard-tools.SlackBuild
+++ b/network/wireguard-tools/wireguard-tools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for WireGuard userspace tools
 
 # Copyright 2017-2019 David Spencer, Baildon, West Yorkshire, U.K.
-# Copyright 2020 Anj Duvnjak
+# Copyright 2020-2021 Anj Duvnjak
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wireguard-tools
-VERSION=${VERSION:-1.0.20200827}
+VERSION=${VERSION:-1.0.20210315}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/wireguard-tools/wireguard-tools.info b/network/wireguard-tools/wireguard-tools.info
index dae542e11f..3200d7dd29 100644
--- a/network/wireguard-tools/wireguard-tools.info
+++ b/network/wireguard-tools/wireguard-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="wireguard-tools"
-VERSION="1.0.20200827"
+VERSION="1.0.20210315"
 HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200827.tar.xz"
-MD5SUM="70c4c1a0260d89ca27abdadad10f450b"
+DOWNLOAD="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210315.tar.xz"
+MD5SUM="d6663d322ee5e5c4353838c6e9f98a1a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wireguard-linux-compat"
diff --git a/network/wireshark/README b/network/wireshark/README
index 7f0ebe2840..0b16ad486d 100644
--- a/network/wireshark/README
+++ b/network/wireshark/README
@@ -41,7 +41,6 @@ link libraries present in the old package, which will then be removed
 when upgrading).
 
 Optional dependencies:
-- c-ares
 - krb5
 - nghttp2
 - spandsp
@@ -49,6 +48,8 @@ Optional dependencies:
 - lz4
 - libsmi
 - libminizip
+- libilbc
+- opus
 
 NOTE: Wireshark 3.0 no longer support legacy GTK+ UI.
 
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild
index ccad018ef4..7f20f93f98 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for wireshark
 
 # Copyright 2008-2014  Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # Originally written by Jick Nan (jick.nan@gmail.com)
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # Modified by B. Watson <yalhcru@gmail.com> to add lua52 support.
 
 PRGNAM=wireshark
-VERSION=${VERSION:-3.2.7}
+VERSION=${VERSION:-3.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,6 +98,8 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
@@ -107,8 +109,6 @@ 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
 
-mv $PKG/usr/share/man $PKG/usr/
-
 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
 
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index 6582096515..8bbdeb1031 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,10 +1,10 @@
 PRGNAM="wireshark"
-VERSION="3.2.7"
+VERSION="3.4.4"
 HOMEPAGE="https://www.wireshark.org/"
-DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-3.2.7.tar.xz"
-MD5SUM="2d83614af3e99b08a230c3a416949d23"
+DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-3.4.4.tar.xz"
+MD5SUM="dbc93615612db327276aec8391a3c090"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 lua python3"
+REQUIRES="qt5 lua python3 c-ares"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/wp-cli/wp-cli.SlackBuild b/network/wp-cli/wp-cli.SlackBuild
index f2c840f0a1..ac1e8df938 100644
--- a/network/wp-cli/wp-cli.SlackBuild
+++ b/network/wp-cli/wp-cli.SlackBuild
@@ -56,4 +56,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild
index 2fc09749ce..deff03a691 100644
--- a/network/wsdd2/wsdd2.SlackBuild
+++ b/network/wsdd2/wsdd2.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wsdd2
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,6 +83,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 #copy over the rc file
 mkdir -p $PKG/etc/rc.d
 cp -a $CWD/rc.${PRGNAM} $PKG/etc/rc.d/rc.${PRGNAM}.new
+chown root:root $PKG/etc/rc.d/rc.${PRGNAM}.new
 # now for docs
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info
index fbe5e086c0..1fbfb16814 100644
--- a/network/wsdd2/wsdd2.info
+++ b/network/wsdd2/wsdd2.info
@@ -1,8 +1,8 @@
 PRGNAM="wsdd2"
-VERSION="1.8.1"
+VERSION="1.8.3.2"
 HOMEPAGE="https://github.com/Andy2244/wsdd2"
-DOWNLOAD="https://github.com/Andy2244/wsdd2/archive/1.8.1/wsdd2-1.8.1.tar.gz"
-MD5SUM="fe07c4d77d58eadc7f2d5fb82493a67d"
+DOWNLOAD="https://github.com/Andy2244/wsdd2/archive/1.8.3.2/wsdd2-1.8.3.2.tar.gz"
+MD5SUM="6ddc3411776bf102309f8edcde34115a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/network/xaric/README b/network/xaric/README
new file mode 100644
index 0000000000..ec0d41cd8f
--- /dev/null
+++ b/network/xaric/README
@@ -0,0 +1,5 @@
+xaric (simple colorful IRC client)
+
+Xaric is a UNIX irc client similar to (and forked from) BitchX and
+ircII. The purpose of xaric is to remove all of the bogus, broken crap
+and silly features from BitchX and have a nice colorful client.
diff --git a/network/xaric/doinst.sh b/network/xaric/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/network/xaric/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/xaric/slack-desc b/network/xaric/slack-desc
new file mode 100644
index 0000000000..adabe1fb53
--- /dev/null
+++ b/network/xaric/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xaric: xaric (simple colorful IRC client)
+xaric:
+xaric: Xaric is a UNIX irc client similar to (and forked from) BitchX and
+xaric: ircII. The purpose of xaric is to remove all of the bogus, broken crap
+xaric: and silly features from BitchX and have a nice colorful client.
+xaric:
+xaric:
+xaric:
+xaric:
+xaric:
+xaric:
diff --git a/network/xaric/xaric.SlackBuild b/network/xaric/xaric.SlackBuild
new file mode 100644
index 0000000000..c729e5fbd8
--- /dev/null
+++ b/network/xaric/xaric.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for xaric
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20201122 bkw: BUILD=2, install icons to the right place.
+
+PRGNAM=xaric
+VERSION=${VERSION:-0.13.7}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+sed -i 's,/usr/local,/usr,' $PRGNAM.1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man1/$PRGNAM.1
+
+# .desktop file ripped off (from hexchat.desktop) by SlackBuild
+# author. Normally I don't do these for purely console applications,
+# but upstream provided a nice icon, so might as well make use of it.
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cp -a $PRGNAM.xpm $PKG/usr/share/pixmaps
+for i in 16 32 48; do
+  dir=$PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  mkdir -p $dir
+  convert $PRGNAM.xpm -resize ${i}x${i}! $dir/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Don't need 2 copies of the GPL
+rm -f $PKG/usr/share/$PRGNAM/help/copying
+ln -s ../../../doc/$PRGNAM-$VERSION/COPYING $PKG/usr/share/$PRGNAM/help/copying
+
+mkdir -p $PKG/install
+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}
diff --git a/network/xaric/xaric.desktop b/network/xaric/xaric.desktop
new file mode 100644
index 0000000000..d8bafcd7c5
--- /dev/null
+++ b/network/xaric/xaric.desktop
@@ -0,0 +1,55 @@
+[Desktop Entry]
+Name=Xaric
+GenericName=IRC Client
+Comment=Chat with other people online
+Comment[ca]=Parla amb altres persones en línia.
+Comment[cs]=Chatujte online s ostatními lidmi
+Comment[da]=Chat med andre personer online
+Comment[de]=Online mit anderen Menschen chatten
+Comment[en_GB]=Chat with other people online
+Comment[es]=Chatea con otras personas en línea
+Comment[et]=Vestle teiste kasutajatega internetis
+Comment[fi]=Keskustele muiden kanssa verkossa
+Comment[fr]=Parlez avec d'autres personnes en ligne
+Comment[id]=Mengobrol dengan orang lain daring
+Comment[it]=Chiacchiera con altri utenti online
+Comment[ja_JP]=他�人�オンライン�ャットを���
+Comment[ko]=온��� 있는 사람들과 대화합니다
+Comment[lt]=Kalbėkite su kitais prisijungusiais žmonėmis
+Comment[nb]=Prat med andre folk på nettet
+Comment[pl]=Rozmawiaj z innymi ludźmi przez internet
+Comment[pt]=Conversa com outras pessoas online
+Comment[pt_BR]=Converse com outras pessoas na rede
+Comment[sq]=Bisedoni në linjë me persona të tjerë
+Comment[sr]=Ћа�кајте �а пријатељима онлајн
+Comment[sv]=Chatta med andra människor online
+Comment[zh_CN]=与其他人在线�天
+Keywords=IM;Chat;
+Keywords[ca]=MI;Xat;
+Keywords[da]=IM;Chat;
+Keywords[de]=IM;Chat;
+Keywords[en_GB]=IM;Chat;
+Keywords[es]=IM;Chat;
+Keywords[eu]=IM;Chat;Txat;
+Keywords[fi]=IM;Chat;pikaviestin;keskustelu;
+Keywords[fr]=IM;Chat;
+Keywords[id]=IM;Obrolan;
+Keywords[it]=IM;Chat;Messaggistica Istantanea;IRC;
+Keywords[ko]=IM;�스턴트 메신저;Chat;대화;
+Keywords[lt]=IM;Pokalbiai;
+Keywords[nb]=IM;Chat;
+Keywords[pl]=IM;Chat;
+Keywords[pt]=IM;Chat;
+Keywords[pt_BR]=IM;Chat;
+Keywords[ru]=IM;Чат;
+Keywords[sq]=IM;Fjalosje;
+Keywords[sr]=ИМ;Ћа�кање;
+Keywords[sv]=IM;Chatt;
+Keywords[zh_CN]=IM;�天;
+Exec=xaric
+Icon=xaric
+Terminal=true
+Type=Application
+Categories=Network;IRCClient;
+StartupNotify=false
+MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
diff --git a/network/xaric/xaric.info b/network/xaric/xaric.info
new file mode 100644
index 0000000000..2472aa7845
--- /dev/null
+++ b/network/xaric/xaric.info
@@ -0,0 +1,10 @@
+PRGNAM="xaric"
+VERSION="0.13.7"
+HOMEPAGE="https://xaric.org/"
+DOWNLOAD="http://xaric.org/software/xaric/releases/xaric-0.13.7.tar.gz"
+MD5SUM="46f4460dfab17819dd6d7e543be75206"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/yadifa/yadifa.SlackBuild b/network/yadifa/yadifa.SlackBuild
index 483f9709d4..717dea1e5e 100644
--- a/network/yadifa/yadifa.SlackBuild
+++ b/network/yadifa/yadifa.SlackBuild
@@ -23,11 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yadifa
-VERSION=${VERSION:-2.3.9_8497}
+VERSION=${VERSION:-2.4.0}
+VSUFFIX=${VSUFFIX:-9809}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=$(echo $VERSION | tr _ -)
+SRCVERSION=$(echo $VERSION-$VSUFFIX | tr _ -)
 
 if ! grep -q "^yadifa:" /etc/group; then
         echo "$0: Error: $PRGNAM group (yadifa) doesn't exist."
@@ -116,6 +117,7 @@ make install DESTDIR=$PKG
 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
 
+find $PKG/usr/man -type f -exec gzip -9 {} \+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 install --mode=644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/yadifa/yadifa.info b/network/yadifa/yadifa.info
index 123e39a495..a160056cfe 100644
--- a/network/yadifa/yadifa.info
+++ b/network/yadifa/yadifa.info
@@ -1,8 +1,8 @@
 PRGNAM="yadifa"
-VERSION="2.3.9_8497"
-HOMEPAGE="https://www.yadifa.eu/home"
-DOWNLOAD="https://cdn.yadifa.eu/sites/default/files/releases/yadifa-2.3.9-8497.tar.gz"
-MD5SUM="cde0cccb6bb56e4d3afdacc0591e38f7"
+VERSION="2.4.0"
+HOMEPAGE="https://www.yadifa.eu"
+DOWNLOAD="https://www.yadifa.eu/sites/default/files/releases/yadifa-2.4.0-9809.tar.gz"
+MD5SUM="af12001a6169533bc546aa7bfdac9c29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/yle-dl/README b/network/yle-dl/README
index 170d0a6712..9e7a4d78cc 100644
--- a/network/yle-dl/README
+++ b/network/yle-dl/README
@@ -1,2 +1,5 @@
 yle-dl is a tool for downloading media files from the video streaming
 services of the Finnish national broadcasting company Yle.
+
+Dependencies python-configargparse and python-requests need to be built with
+Python 3 support.
diff --git a/network/yle-dl/yle-dl.SlackBuild b/network/yle-dl/yle-dl.SlackBuild
index a896586185..91299e4d50 100644
--- a/network/yle-dl/yle-dl.SlackBuild
+++ b/network/yle-dl/yle-dl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yle-dl
-VERSION=${VERSION:-20201022}
+VERSION=${VERSION:-20210212}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/network/yle-dl/yle-dl.info b/network/yle-dl/yle-dl.info
index ecf2c0fec6..4445a4ab55 100644
--- a/network/yle-dl/yle-dl.info
+++ b/network/yle-dl/yle-dl.info
@@ -1,10 +1,10 @@
 PRGNAM="yle-dl"
-VERSION="20201022"
+VERSION="20210212"
 HOMEPAGE="https://aajanki.github.io/yle-dl/"
-DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20201022/yle-dl-20201022.tar.gz"
-MD5SUM="580855d3dac77e7dfe8a8f25b0c4c033"
+DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20210212/yle-dl-20210212.tar.gz"
+MD5SUM="afe636dc51baa133fa79c17c231c99e0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="attrs ffmpeg lxml python-configargparse python-future python-requests"
+REQUIRES="ffmpeg lxml python3 python3-attrs python-configargparse python-requests"
 MAINTAINER="Markus Rinne"
 EMAIL="markus.ka.rinne@gmail.com"
diff --git a/network/you-get/you-get.SlackBuild b/network/you-get/you-get.SlackBuild
index eca0ac883f..ad58723991 100644
--- a/network/you-get/you-get.SlackBuild
+++ b/network/you-get/you-get.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for you-get
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2020  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=you-get
-VERSION=${VERSION:-0.4.1355}
+VERSION=${VERSION:-0.4.1500}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/you-get/you-get.info b/network/you-get/you-get.info
index 1af7fc72a2..8331c1e6fd 100644
--- a/network/you-get/you-get.info
+++ b/network/you-get/you-get.info
@@ -1,8 +1,8 @@
 PRGNAM="you-get"
-VERSION="0.4.1355"
+VERSION="0.4.1500"
 HOMEPAGE="http://www.soimort.org/you-get/"
-DOWNLOAD="https://files.pythonhosted.org/packages/9f/41/b2bb0bb994b6511f3bb306f237dbd56b9920b331d6db48e7ce7d473e68f7/you-get-0.4.1355.tar.gz"
-MD5SUM="0d77679e86c3e5c19c526f046cf9e31f"
+DOWNLOAD="https://files.pythonhosted.org/packages/b3/eb/e24fa3352fa27e1be3b7f8b3d158a3b12f6ee294c09614eb61b5d85fa054/you-get-0.4.1500.tar.gz"
+MD5SUM="f1145217fc4a4f9407d24aa25a4828e8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild
index e4aa3a78f1..161b33d8ec 100644
--- a/network/youtube-dl/youtube-dl.SlackBuild
+++ b/network/youtube-dl/youtube-dl.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for youtube-dl
 # Copyright 2010 GPLeo <gpleomail@gmail.com>
 # Copyright 2010-2012 byteframe <byteframe@gmail.com>
-# Copyright 2015-2020  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=youtube-dl
-VERSION=${VERSION:-2020.09.14}
+VERSION=${VERSION:-2021.02.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info
index dd0862ae6b..fbfcde50a9 100644
--- a/network/youtube-dl/youtube-dl.info
+++ b/network/youtube-dl/youtube-dl.info
@@ -1,8 +1,8 @@
 PRGNAM="youtube-dl"
-VERSION="2020.09.14"
+VERSION="2021.02.22"
 HOMEPAGE="http://www.yt-dl.org/"
-DOWNLOAD="https://yt-dl.org/downloads/2020.09.14/youtube-dl-2020.09.14.tar.gz"
-MD5SUM="27e1cab5c6cd2063a489a9cb028c4c41"
+DOWNLOAD="https://yt-dl.org/downloads/2021.02.22/youtube-dl-2021.02.22.tar.gz"
+MD5SUM="a9136b338055166a233a753e149095f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/zeek/README b/network/zeek/README
index 02323c5758..da3cea66cd 100644
--- a/network/zeek/README
+++ b/network/zeek/README
@@ -2,3 +2,7 @@ Zeek (Bro) is an open source intrusion detection system (IDS).
 It is different from traditional IDS tools in that it is
 focused on network analysis. In other words, it is used
 to monitor traffic traversing a network to identify anomalies.
+
+This is the last version of zeek supported by GCC v5.5.0
+
+Zeek v3.1.0 and newer requires GCC v7 for C++17 support.
diff --git a/network/zeek/slack-desc b/network/zeek/slack-desc
index 2b0f45921b..20f6a2e36d 100644
--- a/network/zeek/slack-desc
+++ b/network/zeek/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-zeek: zeek (The Zeek Network Security Monitor)
+zeek: Zeek (The Zeek Network Security Monitor)
 zeek:
 zeek: Zeek (Bro) is an open source intrusion detection system (IDS).
 zeek: It is different from traditional IDS tools in that it is
diff --git a/network/zeek/zeek.SlackBuild b/network/zeek/zeek.SlackBuild
index ccdf4107b9..f8456abe99 100644
--- a/network/zeek/zeek.SlackBuild
+++ b/network/zeek/zeek.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Zeek
 
-# Copyright 2018-2020 Michael Edie Orlando, FL USA
+# Copyright 2018-2021 Michael Edie Orlando, FL USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zeek
-VERSION=${VERSION:-3.0.5}
+VERSION=${VERSION:-3.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/zeek/zeek.info b/network/zeek/zeek.info
index 958a620696..db3ca5dc9a 100644
--- a/network/zeek/zeek.info
+++ b/network/zeek/zeek.info
@@ -1,8 +1,8 @@
 PRGNAM="zeek"
-VERSION="3.0.5"
+VERSION="3.0.13"
 HOMEPAGE="https://www.zeek.org"
-DOWNLOAD="https://download.zeek.org/zeek-3.0.5.tar.gz"
-MD5SUM="e460609f3b8386710cefca7f2d785615"
+DOWNLOAD="https://download.zeek.org/zeek-3.0.13.tar.gz"
+MD5SUM="1c331fabaef8376d1fd741b8b4cfec06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/zoom-linux/zoom-linux.SlackBuild b/network/zoom-linux/zoom-linux.SlackBuild
index aaa7c3d33d..d28d59e439 100644
--- a/network/zoom-linux/zoom-linux.SlackBuild
+++ b/network/zoom-linux/zoom-linux.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for zoom-linux
 #
-# Copyright 2018-2020 Ebben Aries <e@dscp.org>
+# Copyright 2018-2020 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zoom-linux
-VERSION=${VERSION:-5.3.472687.1012} # may be overridden by source!
+VERSION=${VERSION:-5.6.13632.0328} # may be overridden by source!
 SRCNAM=zoom
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/zoom-linux/zoom-linux.info b/network/zoom-linux/zoom-linux.info
index 3649b0c74c..2375c3f896 100644
--- a/network/zoom-linux/zoom-linux.info
+++ b/network/zoom-linux/zoom-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="zoom-linux"
-VERSION="5.3.472687.1012"
+VERSION="5.6.13632.0328"
 HOMEPAGE="https://www.zoom.us/"
-DOWNLOAD="https://www.zoom.us/client/5.3.472687.1012/zoom_i686.tar.xz"
-MD5SUM="28d10fa521da5728d8ba0478a6a7fef1"
-DOWNLOAD_x86_64="https://www.zoom.us/client/5.3.472687.1012/zoom_x86_64.tar.xz"
-MD5SUM_x86_64="4f1e2a56b01a9b5034bd56a6ed8fd75b"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://d11yldzmag5yn.cloudfront.net/prod/5.6.13632.0328/zoom_x86_64.tar.xz"
+MD5SUM_x86_64="22c42ad1549f4f3f9c2ac57ddeca52b6"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/office/CherryTree/CherryTree.info b/office/CherryTree/CherryTree.info
index 99e9e0068c..7d8f5e0c14 100644
--- a/office/CherryTree/CherryTree.info
+++ b/office/CherryTree/CherryTree.info
@@ -1,8 +1,8 @@
 PRGNAM="CherryTree"
 VERSION="0.39.2"
 HOMEPAGE="http://www.giuspen.com/cherrytree"
-DOWNLOAD="http://www.giuspen.com/software/cherrytree-0.39.2.tar.xz"
-MD5SUM="d9c654e1393fd2ce859101fbba47ade7"
+DOWNLOAD="https://github.com/giuspen/cherrytree/archive/0.39.2/cherrytree-0.39.2.tar.gz"
+MD5SUM="4cac6149f06ea402f08d1f4a4d939624"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygtksourceview"
diff --git a/office/FreeOffice/FreeOffice.SlackBuild b/office/FreeOffice/FreeOffice.SlackBuild
new file mode 100644
index 0000000000..4bd56ee0e6
--- /dev/null
+++ b/office/FreeOffice/FreeOffice.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for FreeOffice
+
+# Copyright 2020 Andre Fernando, Indonesia
+# 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=FreeOffice
+SRCNAM=softmaker-${PRGNAM,,}
+VERSION=${VERSION:-2018_978}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86)
+      DEBARCH=i386
+      ARCH=i586
+      ;;
+    x86_64)
+      DEBARCH=amd64
+      ARCH=x86_64
+      ;;
+      # unsupported
+      *)
+      echo "ARCH $( uname -m ) is unsupported"
+      exit 1
+      ;;
+  esac
+else
+  case "$ARCH" in
+    i?86)
+      DEBARCH=i386
+      ;;
+    x86_64)
+      DEBARCH=amd64
+      ;;
+      # unsupported
+      *)
+      echo "$ARCH is unsupported"
+      exit 1
+      ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+cd $PRGNAM
+ar -x $CWD/$SRCNAM-$VERSION-01_$DEBARCH.deb
+tar xvf data.tar.xz -C $PKG
+cd $PKG
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+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
+
+cp $CWD/*.desktop $PKG/usr/share/applications/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/office/FreeOffice/FreeOffice.info b/office/FreeOffice/FreeOffice.info
new file mode 100644
index 0000000000..291305998a
--- /dev/null
+++ b/office/FreeOffice/FreeOffice.info
@@ -0,0 +1,10 @@
+PRGNAM="FreeOffice"
+VERSION="2018_978"
+HOMEPAGE="https://www.freeoffice.com/"
+DOWNLOAD="https://www.softmaker.net/down/softmaker-freeoffice-2018_978-01_i386.deb"
+MD5SUM="32d74c5c109a53df7ad8312d43dfc866"
+DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-freeoffice-2018_978-01_amd64.deb"
+MD5SUM_x86_64="2f42846d70bd4ebfaa6f1d0a73cd8689"
+REQUIRES=""
+MAINTAINER="Andre Fernando"
+EMAIL="ando344@gmail.com"
diff --git a/office/FreeOffice/README b/office/FreeOffice/README
new file mode 100644
index 0000000000..a0dee50d4a
--- /dev/null
+++ b/office/FreeOffice/README
@@ -0,0 +1,8 @@
+FreeOffice ( The best free alternative to Microsoft Office )
+
+FreeOffice is a complete Office suite with a word processor,
+a spreadsheet application and a presentation program – all compatible 
+with their counterparts in Microsoft Office.
+
+for add additional languages visit official sites:
+https://www.freeoffice.com/en/download/dictionaries
diff --git a/office/FreeOffice/doinst.sh b/office/FreeOffice/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/office/FreeOffice/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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/office/FreeOffice/planmaker-free18.desktop b/office/FreeOffice/planmaker-free18.desktop
new file mode 100644
index 0000000000..1a2cb71191
--- /dev/null
+++ b/office/FreeOffice/planmaker-free18.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Categories=Application;Office;Spreadsheet;
+Comment=PlanMaker lets you create all kinds of spreadsheets -- from simple ones to the most complex ones. Includes a high-caliber charting module.
+Encoding=UTF-8
+Exec=/usr/bin/planmaker18free %F
+GenericName=Spreadsheet
+Icon=/usr/share/pixmaps/pml18free.png
+InitialPreference=10
+MimeType=application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;
+Name=FreeOffice 2018 PlanMaker
+NoDisplay=false
+Path[$e]=/usr/share/freeoffice2018
+StartupNotify=true
+StartupWMClass=pm
+Terminal=0
+TerminalOptions=
+TryExec=/usr/bin/planmaker18free
+Type=Application
+Version=1.0
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/office/FreeOffice/presentations-free18.desktop b/office/FreeOffice/presentations-free18.desktop
new file mode 100644
index 0000000000..a9d8a7a5ac
--- /dev/null
+++ b/office/FreeOffice/presentations-free18.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Categories=Application;Office;Presentation;
+Comment=The Presentations software lets you design any kind of presentation - even including special effects, animations, and transitions.
+Encoding=UTF-8
+Exec=/usr/bin/presentations18free %F
+GenericName=Presentation
+Icon=/usr/share/pixmaps/prl18free.png
+InitialPreference=10
+MimeType=application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;
+Name=FreeOffice 2018 Presentations
+NoDisplay=false
+Path[$e]=/usr/share/freeoffice2018
+StartupNotify=true
+StartupWMClass=pr
+Terminal=0
+TerminalOptions=
+TryExec=/usr/bin/presentations18free
+Type=Application
+Version=1.0
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/office/FreeOffice/slack-desc b/office/FreeOffice/slack-desc
new file mode 100644
index 0000000000..8b82587d03
--- /dev/null
+++ b/office/FreeOffice/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+FreeOffice: FreeOffice (The best free alternative to Microsoft Office)
+FreeOffice:
+FreeOffice: FreeOffice is a complete Office suite with a word processor,
+FreeOffice: a spreadsheet application and a presentation program – all compatible
+FreeOffice: with their counterparts in Microsoft Office.
+FreeOffice:
+FreeOffice:
+FreeOffice: Homepage: https://www.freeoffice.com/
+FreeOffice:
+FreeOffice:
+FreeOffice:
diff --git a/office/FreeOffice/textmaker-free18.desktop b/office/FreeOffice/textmaker-free18.desktop
new file mode 100644
index 0000000000..e24915cf3e
--- /dev/null
+++ b/office/FreeOffice/textmaker-free18.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Categories=Application;Office;WordProcessor;
+Comment=The TextMaker word processor lets you work on any type of document.
+Encoding=UTF-8
+Exec=/usr/bin/textmaker18free %F
+GenericName=Word Processor
+Icon=/usr/share/pixmaps/tml18free.png
+InitialPreference=10
+MimeType=application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;
+Name=FreeOffice 2018 TextMaker
+NoDisplay=false
+Path[$e]=/usr/share/freeoffice2018
+StartupNotify=true
+StartupWMClass=tm
+Terminal=0
+TerminalOptions=
+TryExec=/usr/bin/textmaker18free
+Type=Application
+Version=1.0
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/office/JabRef/JabRef.SlackBuild b/office/JabRef/JabRef.SlackBuild
index a71b3adf8a..edf204eac0 100644
--- a/office/JabRef/JabRef.SlackBuild
+++ b/office/JabRef/JabRef.SlackBuild
@@ -2,67 +2,70 @@
 
 # Slackware build script for JabRef
 
-# Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Update by: Andre Barboza <bmg.andre@gmail.com>
+# Copyright 2020, David O'Shaughnessy
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 1.- Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# 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.
-
-# Update by: Andre Barboza <bmg.andre@gmail.com>
-
-# This script is just a binary repackaging.
+# 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=JabRef
-VERSION=${VERSION:-2.9.2}
+VERSION=${VERSION:-5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=${ARCH:-noarch}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT
-install -D -m 0644 $CWD/$PRGNAM-$VERSION.jar $PKG/opt/$PRGNAM/$PRGNAM-$VERSION.jar
+ARCH=${ARCH:-noarch}
+DEBARCH=amd64
 
-mkdir -p $PKG/usr/bin
-cat << EOF > $PKG/usr/bin/$PRGNAM
-#!/bin/bash
-cd \$HOME
-java -jar /opt/$PRGNAM/$PRGNAM-$VERSION.jar \$@
-EOF
-chmod 0755 $PKG/usr/bin/$PRGNAM
+set -e
 
-cd $PKG/opt/$PRGNAM
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$PKG"
+ar p "$CWD"/${PRGNAM,,}_"$VERSION"-"$BUILD"_"$DEBARCH".deb data.tar.xz | tar xJv
 
-install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+# permissions
+chown -R root:root .
+find -L . \
+     \( -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 {} \;
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+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
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# create a symlink for program
+mkdir -p "$PKG"/usr/bin
+ln -s /opt/${PRGNAM,,}/bin/$PRGNAM "$PKG"/usr/bin/$PRGNAM
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# desktop and icon
+install -D -m 0644 opt/${PRGNAM,,}/lib/${PRGNAM,,}-$PRGNAM.desktop -t "$PKG"/usr/share/applications
+install -D -m 0644 opt/${PRGNAM,,}/lib/$PRGNAM.png -t "$PKG"/usr/share/pixmaps
+# docs
+install -D -m 0644 opt/${PRGNAM,,}/share/doc/* "$CWD"/$PRGNAM.SlackBuild -t "$PKG"/usr/doc/$PRGNAM-"$VERSION"
+# package files
+install -D -m 0644 "$CWD"/slack-desc "$CWD"/doinst.sh -t "$PKG"/install
 
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT"/$PRGNAM-"$VERSION"-"$ARCH"-"$BUILD""$TAG"."${PKGTYPE:-tgz}"
diff --git a/office/JabRef/JabRef.info b/office/JabRef/JabRef.info
index 230c0d955e..32c35e46a6 100644
--- a/office/JabRef/JabRef.info
+++ b/office/JabRef/JabRef.info
@@ -1,10 +1,10 @@
 PRGNAM="JabRef"
-VERSION="2.9.2"
-HOMEPAGE="http://jabref.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/JabRef-2.9.2.jar"
-MD5SUM="62575e9f6921c904fe8c2e4be2a34081"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="Mário Antunes"
-EMAIL="mariolpantunes@gmail.com"
+VERSION="5.2"
+HOMEPAGE="https://jabref.org"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/JabRef/jabref/releases/download/v5.2/jabref_5.2-1_amd64.deb"
+MD5SUM_x86_64="c6479c48243e9a86cca2e0326b937678"
+REQUIRES=""
+MAINTAINER="David O'Shaughnessy"
+EMAIL="dev@osh.id.au"
diff --git a/office/JabRef/README b/office/JabRef/README
index 8e01ca899d..52057ff55b 100644
--- a/office/JabRef/README
+++ b/office/JabRef/README
@@ -1,12 +1,6 @@
-JabRef is an open source bibliography reference manager.
-The native file format used by JabRef is BibTeX, the
-standard LaTeX bibliography format.b JabRef runs on the 
-Java VM (version 1.6 or newer), and should work equally 
-well on Windows, Linux and Mac OS X.
+JabRef is an open source bibliography reference manager, with native
+BibTeX and BibLaTeX support. JabRef helps you collect, edit, organize,
+and cite your work. As of version 5, JabRef is bundled with its own
+Java runtime.
 
-BibTeX is an application and a bibliography file format 
-written by Oren Patashnik and Leslie Lamport for the LaTeX
-document preparation system. Bibliographies generated by 
-LaTeX and BibTeX from a BibTeX file can be formatted to suit 
-any reference list specifications through the use of different 
-BibTeX style files.
+This is a repackaging of the .deb release.
diff --git a/office/JabRef/slack-desc b/office/JabRef/slack-desc
index 9a3c4ac06d..08f6f0c520 100644
--- a/office/JabRef/slack-desc
+++ b/office/JabRef/slack-desc
@@ -8,10 +8,10 @@
       |-----handy-ruler------------------------------------------------------|
 JabRef: JabRef (Reference Manager)
 JabRef:
-JabRef: JabRef is an open source bibliography reference manager. The native
-JabRef: file format used by JabRef is BibTeX, the standard LaTeX bibliography
-JabRef: format.b JabRef runs on the Java VM (version 1.6 or newer), and
-JabRef: should work equally well on Windows, Linux and Mac OS X.
+JabRef: JabRef is an open source bibliography reference manager, with native
+JabRef: BibTeX and BibLaTeX support. JabRef helps you collect, edit, organize,
+JabRef: and cite your work.
+JabRef:
 JabRef:
 JabRef:
 JabRef:
diff --git a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
index 9031958d5c..2d391257f8 100644
--- a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
+++ b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MasterPDFEditor
 
-# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=MasterPDFEditor
 SRCNAM=master-pdf-editor
-VERSION=${VERSION:-5.6.49}
+VERSION=${VERSION:-5.7.53}
 MAJVER=${MAJVER:-5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -42,21 +42,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  SOURCEARCH=".i386"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  SOURCEARCH="i386"
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SOURCEARCH="-qt4.x86_64"
+  SOURCEARCH="-qt5.x86_64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  echo "Architecture is not supported."
+  exit 1
 fi
 
 set -e
diff --git a/office/MasterPDFEditor/MasterPDFEditor.info b/office/MasterPDFEditor/MasterPDFEditor.info
index 67d71174a4..89126ec4b3 100644
--- a/office/MasterPDFEditor/MasterPDFEditor.info
+++ b/office/MasterPDFEditor/MasterPDFEditor.info
@@ -1,10 +1,10 @@
 PRGNAM="MasterPDFEditor"
-VERSION="5.6.49"
+VERSION="5.7.53"
 HOMEPAGE="https://code-industry.net/"
-DOWNLOAD="https://code-industry.net/public/master-pdf-editor-5.6.49.i386.tar.gz"
-MD5SUM="3d651154c13d1f82ba5607cb1a06d603"
-DOWNLOAD_x86_64="https://code-industry.net/public/master-pdf-editor-5.6.49-qt4.x86_64.tar.gz"
-MD5SUM_x86_64="76a64c13fdab15485ec29e5d0ff2c2dc"
-REQUIRES=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://code-industry.net/public/master-pdf-editor-5.7.53-qt5.x86_64.tar.gz"
+MD5SUM_x86_64="5847c43318812eaf198a1338cdee83b5"
+REQUIRES="qt5"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/ProjectLibre/ProjectLibre.SlackBuild b/office/ProjectLibre/ProjectLibre.SlackBuild
index d89af03948..6ef68b9b5c 100644
--- a/office/ProjectLibre/ProjectLibre.SlackBuild
+++ b/office/ProjectLibre/ProjectLibre.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SlackBuild Script for ProjectLibre
 
-# Copyright 2012-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2012-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ProjectLibre
-VERSION=${VERSION:-1.9.2}
+VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/ProjectLibre/ProjectLibre.info b/office/ProjectLibre/ProjectLibre.info
index 639f6c1b64..e29265ce12 100644
--- a/office/ProjectLibre/ProjectLibre.info
+++ b/office/ProjectLibre/ProjectLibre.info
@@ -1,8 +1,8 @@
 PRGNAM="ProjectLibre"
-VERSION="1.9.2"
+VERSION="1.9.3"
 HOMEPAGE="https://sourceforge.net/projects/projectlibre/"
-DOWNLOAD="https://downloads.sourceforge.net/projectlibre/projectlibre-1.9.2.tar.gz"
-MD5SUM="2d39d676dfb03c25b84fc123e03440f7"
+DOWNLOAD="https://downloads.sourceforge.net/projectlibre/projectlibre-1.9.3.tar.gz"
+MD5SUM="00ba2b6f674fbdf781b04830c8d8a973"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/office/SOGo/SOGo.SlackBuild b/office/SOGo/SOGo.SlackBuild
index 36fd51a7ce..b04c90351e 100644
--- a/office/SOGo/SOGo.SlackBuild
+++ b/office/SOGo/SOGo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SOGo
-VERSION=${VERSION:-4.3.2}
+VERSION=${VERSION:-5.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/SOGo/SOGo.info b/office/SOGo/SOGo.info
index 54e915b851..257b204e19 100644
--- a/office/SOGo/SOGo.info
+++ b/office/SOGo/SOGo.info
@@ -1,16 +1,16 @@
 PRGNAM="SOGo"
-VERSION="4.3.2"
+VERSION="5.0.1"
 HOMEPAGE="https://sogo.nu/"
-DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOGo-4.3.2.tar.gz \
+DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOGo-5.0.1.tar.gz \
           https://sogo.nu/files/docs/SOGoInstallationGuide.pdf \
           https://sogo.nu/files/docs/SOGoMozillaThunderbirdConfigurationGuide.pdf \
           https://sogo.nu/files/docs/SOGoOutlookConnectorConfigurationGuide.pdf"
-MD5SUM="b058df93af615c664b969bbf1931306c \
-        82453330a2796d378da9eac9016b8ef2 \
-        fb1171674d9c82d267891626fe7a675d \
-        be547ae24200d83f64b2f267b96e9818"
+MD5SUM="f7112b11568d68d58b32fb4ba64a8bbc \
+        69977733e37855bd521fdec223d9a7b9 \
+        b4af8941febedb25c124a4ff3244b1f7 \
+        29e7144dd129d344d16509b188487ffb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SOPE libmemcached"
+REQUIRES="SOPE libmemcached libsodium"
 MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"
diff --git a/office/SOGo/SOGoInstallationGuide.pdf b/office/SOGo/SOGoInstallationGuide.pdf
deleted file mode 100644
index 2410be2393..0000000000
--- a/office/SOGo/SOGoInstallationGuide.pdf
+++ /dev/null
diff --git a/office/SOGo/SOGoMozillaThunderbirdConfigurationGuide.pdf b/office/SOGo/SOGoMozillaThunderbirdConfigurationGuide.pdf
deleted file mode 100644
index 7d5aebc4fe..0000000000
--- a/office/SOGo/SOGoMozillaThunderbirdConfigurationGuide.pdf
+++ /dev/null
diff --git a/office/SOGo/SOGoOutlookConnectorConfigurationGuide.pdf b/office/SOGo/SOGoOutlookConnectorConfigurationGuide.pdf
deleted file mode 100644
index aa2dd4f057..0000000000
--- a/office/SOGo/SOGoOutlookConnectorConfigurationGuide.pdf
+++ /dev/null
diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild
index 6a979d2fc5..41c8d29ce6 100644
--- a/office/calcurse/calcurse.SlackBuild
+++ b/office/calcurse/calcurse.SlackBuild
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calcurse
-VERSION=${VERSION:-4.6.0}
+VERSION=${VERSION:-4.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/calcurse/calcurse.info b/office/calcurse/calcurse.info
index 72ad284cd2..d3a8a11736 100644
--- a/office/calcurse/calcurse.info
+++ b/office/calcurse/calcurse.info
@@ -1,8 +1,8 @@
 PRGNAM="calcurse"
-VERSION="4.6.0"
+VERSION="4.7.1"
 HOMEPAGE="http://calcurse.org/"
-DOWNLOAD="https://calcurse.org/files/calcurse-4.6.0.tar.gz"
-MD5SUM="20b59e3a41713f6433be252ea8413dbe"
+DOWNLOAD="https://calcurse.org/files/calcurse-4.7.1.tar.gz"
+MD5SUM="1645068d2a15da6c773f231a1441a760"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/calibre-bin/calibre-bin.SlackBuild b/office/calibre-bin/calibre-bin.SlackBuild
index 78dcaa82b7..def2d94619 100644
--- a/office/calibre-bin/calibre-bin.SlackBuild
+++ b/office/calibre-bin/calibre-bin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for calibre-bin
 
-# Copyright 2019-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,18 +23,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calibre-bin
-VERSION=${VERSION:-5.3.0}
+VERSION=${VERSION:-5.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i686 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH="$( uname -m )"
 fi
 
+case "$ARCH" in
+  i?86) ARCH=i686 ;;
+  arm*) ARCH=arm ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -45,9 +46,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-mkdir -p opt/calibre usr/{share/zsh/site-functions,bin}
+mkdir -p opt/calibre usr/bin \
+  usr/share/{desktop-directories,applications,metainfo,mime/packages,icons/hicolor,zsh/site-functions}
 tar xvf $CWD/${PRGNAM%-bin}-$VERSION-$ARCH.txz -C opt/calibre
-opt/calibre/calibre_postinstall --root=usr
+XDG_DATA_DIRS=$PKG/usr/share XDG_CONFIG_HOME=$PKG/root/.config opt/calibre/calibre_postinstall --root=$PKG/usr
+rmdir -p root/.config
+shopt -s extglob
+rm -r usr/share/{desktop-directories,mime/!(packages)}
+shopt -u extglob
+rm -f usr/share/applications/mimeinfo.cache
 
 cd usr/bin
 for f in $(find . -maxdepth 1 -type l); do
@@ -56,21 +63,6 @@ done
 rm calibre-uninstall
 cd ../..
 
-mkdir -p usr/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256}/apps
-cp -a opt/calibre/resources/images/{lt,tweak,viewer}.png \
-  usr/share/icons/hicolor/256x256/apps
-for s in 16 32 48 64 128; do
-  convert opt/calibre/resources/images/lt.png -resize ${s}x${s} \
-    usr/share/icons/hicolor/${s}x${s}/apps/${PRGNAM%-bin}-gui.png
-  convert opt/calibre/resources/images/viewer.png -resize ${s}x${s} \
-    usr/share/icons/hicolor/${s}x${s}/apps/${PRGNAM%-bin}-viewer.png
-  convert opt/calibre/resources/images/tweak.png -resize ${s}x${s} \
-    usr/share/icons/hicolor/${s}x${s}/apps/${PRGNAM%-bin}-ebook-edit.png
-done
-
-mkdir -p usr/share/applications
-cp -a $CWD/calibre-{ebook-edit,viewer,gui}.desktop usr/share/applications/
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/office/calibre-bin/calibre-bin.info b/office/calibre-bin/calibre-bin.info
index f04073e5a9..66002b3a25 100644
--- a/office/calibre-bin/calibre-bin.info
+++ b/office/calibre-bin/calibre-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="calibre-bin"
-VERSION="5.3.0"
+VERSION="5.15.0"
 HOMEPAGE="https://calibre-ebook.com"
-DOWNLOAD="https://download.calibre-ebook.com/5.3.0/calibre-5.3.0-i686.txz"
-MD5SUM="e44c137057a02b538acbfe22f785403f"
-DOWNLOAD_x86_64="https://download.calibre-ebook.com/5.3.0/calibre-5.3.0-x86_64.txz"
-MD5SUM_x86_64="323c4e4bc807d250b7d1b47d0d10e74f"
+DOWNLOAD="https://download.calibre-ebook.com/5.15.0/calibre-5.15.0-i686.txz"
+MD5SUM="66fd3a67515ea40d67267bea163ad929"
+DOWNLOAD_x86_64="https://download.calibre-ebook.com/5.15.0/calibre-5.15.0-x86_64.txz"
+MD5SUM_x86_64="2d0a5e8c350537f79efda07610c089fc"
 REQUIRES="libxkbcommon"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/calibre-bin/calibre-ebook-edit.desktop b/office/calibre-bin/calibre-ebook-edit.desktop
deleted file mode 100644
index afcebf7333..0000000000
--- a/office/calibre-bin/calibre-ebook-edit.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=E-book Editor
-GenericName=Editor for E-books
-Comment=Edit E-books in various formats
-TryExec=ebook-edit
-Exec=ebook-edit --detach %f
-Icon=calibre-ebook-edit
-Categories=Office;
diff --git a/office/calibre-bin/calibre-gui.desktop b/office/calibre-bin/calibre-gui.desktop
deleted file mode 100644
index c89ad697b4..0000000000
--- a/office/calibre-bin/calibre-gui.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=calibre
-GenericName=E-book library management
-Comment=E-book library management: Convert, view, share, catalogue all your e-books
-TryExec=calibre
-Exec=calibre --detach %F
-Icon=calibre-gui
-Categories=Office;
diff --git a/office/calibre-bin/calibre-viewer.desktop b/office/calibre-bin/calibre-viewer.desktop
deleted file mode 100644
index d90b7fd648..0000000000
--- a/office/calibre-bin/calibre-viewer.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=E-book Viewer
-GenericName=Viewer for E-books
-Comment=Viewer for E-books in all the major formats
-TryExec=ebook-viewer
-Exec=ebook-viewer --detach %f
-Icon=calibre-viewer
-Categories=Office;Graphics;Viewer;
diff --git a/office/coolreader/coolreader.SlackBuild b/office/coolreader/coolreader.SlackBuild
index 8bd2795b74..4464360dad 100644
--- a/office/coolreader/coolreader.SlackBuild
+++ b/office/coolreader/coolreader.SlackBuild
@@ -23,6 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210222 bkw: update for v3.2.54. Upstream no longer ships libunibreak
+# and fribidi source, so add them to DOWNLOAD. Replace qt4_settings_ui.diff
+# with a more robust sed command. Add -fpermissive. Sigh.
+
+# 20201102 bkw:
+# - update for v3.2.50.
+# - embiggen the default window size.
+# - make standard (since the 1980s!) keyboard accelerators work
+#   (alt-f for file menu, alt-v for view, etc), in the qt4/5 UIs.
+
 # 20201019 bkw:
 # - update for v3.2.49, new homepage.
 # - allow for building qt4, qt5, wx UIs.
@@ -37,7 +47,7 @@
 # - save/load settings (.ini file) to ~/.cr3, not /usr/share/cr3.
 
 PRGNAM=coolreader
-VERSION=${VERSION:-3.2.49}
+VERSION=${VERSION:-3.2.54}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,15 +80,39 @@ fi
 
 set -e
 
+FBDVER=${FBDVER:-1.0.10}
+LUBVER=${LUBVER:-4.3}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-cr$VERSION
 tar xvf $CWD/$PRGNAM-cr$VERSION.tar.gz
 cd $PRGNAM-cr$VERSION
+( cd thirdparty
+  tar xvf $CWD/fribidi-$FBDVER.tar.xz
+  tar xvf $CWD/libunibreak-$LUBVER.tar.gz )
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# Apply coolreader-specific patches to thirdparty libs.
+( cd thirdparty/fribidi-$FBDVER
+  for i in ../../thirdparty_repo/patches/fribidi/*.patch; do
+    patch -p1 < $i
+  done )
+
+( cd thirdparty/libunibreak-$LUBVER
+  for i in ../../thirdparty_repo/patches/libunibreak/*.patch; do
+    patch -p1 < $i
+  done )
+
+# FFS, it's 2020, we don't need GUI apps hardcoded to start at
+# 640x400 window size. Honestly we don't need them hardcoded at
+# all, but since that's what coolreader does, pick a size that's
+# bigger than a 3x5" index card on a modern screen...
+sed -i 's,\(<height>\)400,\11024,' cr3qt/src/mainwindow.ui
+sed -i 's,\(<width>\)600,\11280,' cr3qt/src/mainwindow.ui
+
 # Use bundled libunibreak, ours is too old (3.0).
 # Use bundled fribidi, Pat's is too old (0.19.7).
 sed -i -e '/find_package(libunibreak)/d' \
@@ -88,7 +122,7 @@ sed -i -e '/find_package(libunibreak)/d' \
 # Install the docs in the right place for Slackware.
 sed -i "s,share/doc/cr3,doc/$PRGNAM-$VERSION," cr3qt/CMakeLists.txt
 
-# The settings patch for qt4 was made by loading cr3qt/src/settings.ui
+# The settings sed for qt4 was made by loading cr3qt/src/settings.ui
 # into Qt Designer and saving it again. Needed because upstream's
 # using a different (older?) version of qt4.
 
@@ -96,7 +130,8 @@ GUI=${GUI:-QT}
 GUI="$( echo $GUI | tr a-z A-Z )"
 case "$GUI" in
   QT)  UI=Qt4
-       patch -p1 < $CWD/qt4_settings_ui.diff ;;
+       sed -i '/<property name="currentText"/s,>, stdset="0">,' cr3qt/src/settings.ui
+       ;;
   QT5) UI=Qt5 ;;
   WX)  # Either 2.8.x or 3.0.x works, be specific in the slack-desc.
        UI="wxWidgets $( wx-config --version | cut -d. -f1,2)" ;;
@@ -104,6 +139,22 @@ case "$GUI" in
        exit 1 ;;
 esac
 
+# 20201103 bkw: Alt+F for the File menu, Alt+V for View, etc. This
+# has been a UI standard since before Windows 1.0 (MS-DOS apps had it),
+# and I'm not sure why upstream didn't include it. Only affects the
+# Qt4/5 UIs.
+sed -i 's,>\(File\|View\|Navigation\|Help\)<,>\&amp;\1<,' \
+       cr3qt/src/mainwindow.ui
+
+# This is undocumented and exists purely for my own use. It gets rid
+# of the "Escape = minimize" keystroke, because I keep expecting Escape
+# to exit (like 3 or 4 other document readers I use regularly).
+# Only affects the Qt4/5 UIs.
+if [ "${NO_ESCAPE:-no}" = "yes" ]; then
+  echo "=== Activating super-secret Urchlay mode"
+  echo -e 'g/>Esc<\n-1,+1d\nw\nq' | ed cr3qt/src/mainwindow.ui
+fi
+
 echo "=== Building $UI GUI"
 
 mkdir -p build
@@ -111,7 +162,7 @@ cd build
   cmake \
     -D USE_UNRAR=1 \
     -D CMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D LIB_SUFFIX=${LIBDIRSUFFIX} \
     -D CMAKE_BUILD_TYPE=Release \
diff --git a/office/coolreader/coolreader.info b/office/coolreader/coolreader.info
index 93eab170aa..975d7c9aee 100644
--- a/office/coolreader/coolreader.info
+++ b/office/coolreader/coolreader.info
@@ -1,8 +1,12 @@
 PRGNAM="coolreader"
-VERSION="3.2.49"
+VERSION="3.2.54"
 HOMEPAGE="https://github.com/buggins/coolreader"
-DOWNLOAD="https://github.com/buggins/coolreader/archive/cr3.2.49/coolreader-cr3.2.49.tar.gz"
-MD5SUM="0a1f72a2799ba454a47e846ad59825c3"
+DOWNLOAD="https://github.com/buggins/coolreader/archive/cr3.2.54/coolreader-cr3.2.54.tar.gz \
+          https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_3/libunibreak-4.3.tar.gz \
+          https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz"
+MD5SUM="b1c15673c84f3171fa9a2c471bb0b54e \
+        f0c4488fad8dc92a11f4523d22c099d3 \
+        97c87da9930e8e70fbfc8e2bcd031554"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/coolreader/qt4_settings_ui.diff b/office/coolreader/qt4_settings_ui.diff
deleted file mode 100644
index cf95520bd9..0000000000
--- a/office/coolreader/qt4_settings_ui.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- coolreader-cr3.2.49/cr3qt/src/settings.ui	2020-09-11 07:17:23.000000000 -0400
-+++ settings.ui	2020-10-19 12:30:04.557739030 -0400
-@@ -1566,7 +1566,7 @@
-          </item>
-          <item row="12" column="1">
-           <widget class="QComboBox" name="cbFontShaping">
--           <property name="currentText">
-+           <property name="currentText" stdset="0">
-             <string>Simple (FreeType only, fastest)</string>
-            </property>
-            <item>
-@@ -1733,8 +1733,8 @@
-              <rect>
-               <x>0</x>
-               <y>0</y>
--              <width>393</width>
--              <height>620</height>
-+              <width>387</width>
-+              <height>625</height>
-              </rect>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_9">
diff --git a/office/diction/README b/office/diction/README
new file mode 100644
index 0000000000..18d9a3c566
--- /dev/null
+++ b/office/diction/README
@@ -0,0 +1,11 @@
+diction (grammar checker)
+
+GNU diction and style are free implementations of old standard
+UNIX commands, that are not available on many modern systems,
+because they have been unbundled. Diction prints wordy and commonly
+misused phrases. Style analyses surface characteristics of a document,
+e.g. sentence length and various readability measures, but unlike the
+original code, it lacks sentence type, word usage and most sentence
+beginning processing.
+
+Both commands support Dutch, English and German documents.
diff --git a/office/diction/diction.SlackBuild b/office/diction/diction.SlackBuild
new file mode 100644
index 0000000000..bf4fc516c7
--- /dev/null
+++ b/office/diction/diction.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for diction
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=diction
+VERSION=${VERSION:-1.14}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+strip $PRGNAM style
+make install DESTDIR=$PKG
+gzip $PKG/usr/man/man?/*.?
+
+# These 2 files are identical, make one a symlink
+rm -f $PKG/usr/share/$PRGNAM/C
+ln -s en $PKG/usr/share/$PRGNAM/C
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/diction/diction.info b/office/diction/diction.info
new file mode 100644
index 0000000000..42287d84af
--- /dev/null
+++ b/office/diction/diction.info
@@ -0,0 +1,10 @@
+PRGNAM="diction"
+VERSION="1.14"
+HOMEPAGE="https://www.gnu.org/software/diction/diction.html"
+DOWNLOAD="http://www.moria.de/~michael/diction/diction-1.14.tar.gz"
+MD5SUM="2a162c2ae7cb4a28e9471dd756b38019"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/office/diction/slack-desc b/office/diction/slack-desc
new file mode 100644
index 0000000000..63394cc89b
--- /dev/null
+++ b/office/diction/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+diction: diction (grammar checker)
+diction:
+diction: GNU diction and style are free implementations of old standard
+diction: UNIX commands, that are not available on many modern systems,
+diction: because they have been unbundled. Diction prints wordy and commonly
+diction: misused phrases. Style analyses surface characteristics of a document,
+diction: e.g. sentence length and various readability measures, but unlike the
+diction: original code, it lacks sentence type, word usage and most sentence
+diction: beginning processing.
+diction:
+diction:
diff --git a/office/etmtk/README b/office/etmtk/README
index 0085003667..d3bbb19445 100644
--- a/office/etmtk/README
+++ b/office/etmtk/README
@@ -1,9 +1,9 @@
 etmtk is an acronym for event and task manager.
 
-In contrast to most calendar/todo applications, creating items (events, tasks,
-and so forth) in etm does not require filling out fields in a form. Instead,
-items are created as free-form text entries using a simple, intuitive format
-and stored in plain text files.
+In contrast to most calendar/todo applications, creating items (events,
+tasks, and so forth) in etm does not require filling out fields in
+a form. Instead, items are created as free-form text entries using a
+simple, intuitive format and stored in plain text files.
 
-Before running etm for the first time run this command as user:
-mkdir ~/.etm
+Before running etm for the first time run this command as user: mkdir
+~/.etm
diff --git a/office/etmtk/etmtk.SlackBuild b/office/etmtk/etmtk.SlackBuild
index 8e5a11a743..834a80ff93 100644
--- a/office/etmtk/etmtk.SlackBuild
+++ b/office/etmtk/etmtk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for etmtk
 
-# Copyright 2016-2017 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016-2021 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=etmtk
-VERSION=${VERSION:-3.2.31}
+VERSION=${VERSION:-3.2.37}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/etmtk/etmtk.info b/office/etmtk/etmtk.info
index a168f00447..99476c970e 100644
--- a/office/etmtk/etmtk.info
+++ b/office/etmtk/etmtk.info
@@ -1,10 +1,10 @@
 PRGNAM="etmtk"
-VERSION="3.2.31"
+VERSION="3.2.37"
 HOMEPAGE="http://people.duke.edu/~dgraham/etmtk/"
-DOWNLOAD="http://people.duke.edu/~dgraham/etmtk/etmtk-3.2.31.tar.gz"
-MD5SUM="ec05c44702c6ea1db05e0daf110ff91d"
+DOWNLOAD="https://github.com/dagraham/etm-tk/releases/download/v3.2.37/etmtk-3.2.37.tar.gz"
+MD5SUM="46c776a7de9ada38555b28c52d4b330d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-dateutil PyYAML"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/fop-legacy/README b/office/fop-legacy/README
new file mode 100644
index 0000000000..e72fb644e1
--- /dev/null
+++ b/office/fop-legacy/README
@@ -0,0 +1,23 @@
+Apache FOP is a print formatter driven by XSL formatting objects. It
+is a Java application that reads a formatting object tree conforming
+to the XSL 1.1 Recommendation (05 December 2006) and then turns it
+into a PDF document, certain other output formats or allows you to
+preview it directly on screen. 
+
+Output formats currently supported include PDF, PS, PCL, AFP, XML
+(area tree representation), Print, AWT and PNG, and to a lesser extent,
+RTF and TXT.  The primary output target is PDF.
+
+The goals of the Apache FOP project are to deliver an XSL-FO to PDF
+formatter that is compliant to at least the Basic conformance level
+described in the W3C Recommendation from 05 December 2006, and that
+complies with the November 2001 Portable Document Format Specification
+(Version 1.4) from Adobe Systems.
+
+This is the old fop 2.3 for the incredibly ancient jdk 6 (including
+openjdk6).  If you are running jdk 7 or newer, you will need fop, also
+available on SBo.
+
+Also note that fop and fop-legacy cannot coexist on the same computer.
+
+jai and jai-imageio are optional but recommended dependencies.
diff --git a/office/fop2.0/README.postinst b/office/fop-legacy/README.postinst
index d079a0e881..d079a0e881 100644
--- a/office/fop2.0/README.postinst
+++ b/office/fop-legacy/README.postinst
diff --git a/office/fop2.0/fop2.0.SlackBuild b/office/fop-legacy/fop-legacy.SlackBuild
index 25b6901cf8..24f7faefb6 100644
--- a/office/fop2.0/fop2.0.SlackBuild
+++ b/office/fop-legacy/fop-legacy.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for fop
 
 # Copyright 2015 Thorn Inurcide USA
+# Copyright 2020 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=fop2.0
+PRGNAM=fop-legacy
 SRCNAM=fop
-VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-2}
+VERSION=2.3
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -38,7 +39,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$SRCNAM
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
@@ -70,28 +71,32 @@ 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 {} \;
 
-# Compiles with apache-ant:
-ant compile
-ant jar-main
-ant javadocs
+# Increase hyphenation stacksize from 512k to 1M:
+sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml
 
-mv build/javadocs .
+# Copy hyphenation tables:
+unzip $CWD/offo-hyphenation.zip
+cp offo-hyphenation/hyph/* fop/hyph
+rm -rf offo-hyphenation
 
+# Compiles with apache-ant:
+( cd fop
+ant all javadocs
 mkdir -p $PKG/opt/$PRGNAM-$VERSION
 install -v -d -m755 $PKG/opt/$PRGNAM-$VERSION/
-
-cp -va build conf examples fop* javadocs lib status.xml \
- $PKG/opt/$PRGNAM-$VERSION
+mv build/javadocs .
+cp -va build conf examples javadocs fop* lib \
+ $PKG/opt/$PRGNAM-$VERSION )
 
 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
 
 # Create fop symlink to /usr/bin:
 mkdir -p $PKG/usr/bin
-( ln -sf /opt/${PRGNAM}-${VERSION}/${SRCNAM} $PKG/usr/bin/ )
+( ln -sf /opt/${PRGNAM}-${VERSION}/${PRGNAM} $PKG/usr/bin/ )
 
-# Symlink it all to /opt/fop so the .foprc won't need edited every update:
-( cd $PKG/opt ; ln -sf ${PRGNAM}-${VERSION} ${SRCNAM} )
+# Symlink it all to /opt/fop so .foprc won't need edited every update:
+( cd $PKG/opt ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM} )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README NOTICE LICENSE KEYS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/office/fop2.0/fop2.0.info b/office/fop-legacy/fop-legacy.info
index 7cf3b80d51..45a81bef04 100644
--- a/office/fop2.0/fop2.0.info
+++ b/office/fop-legacy/fop-legacy.info
@@ -1,8 +1,10 @@
-PRGNAM="fop2.0"
-VERSION="2.0"
+PRGNAM="fop-legacy"
+VERSION="2.3"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.0-src.tar.gz"
-MD5SUM="754e5307a73433afb5c4c9b11d45e302"
+DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.3-src.tar.gz \
+          https://downloads.sourceforge.net/offo/2.2/offo-hyphenation.zip"
+MD5SUM="fc95040a8db4a7f22c6f26e18fd6d033 \
+        bf9c09bf05108ef9661b8f08d91c2336"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"
diff --git a/office/fop-legacy/slack-desc b/office/fop-legacy/slack-desc
new file mode 100644
index 0000000000..4bf71b54a2
--- /dev/null
+++ b/office/fop-legacy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+fop-legacy: fop-legacy (print formatter)
+fop-legacy:
+fop-legacy: Apache FOP is a print formatter driven by XSL formatting objects. It
+fop-legacy: is a Java application that reads a formatting object tree conforming
+fop-legacy: to the XSL 1.1 Recommendation (05 December 2006) and renders the
+fop-legacy: resulting pages to a specified output.  Current outputs supported
+fop-legacy: include PDF, PS, PCL,AFP, XML (area tree representation), Print,
+fop-legacy: AWT, and TXT.  The primary output target is PDF.
+fop-legacy: This version is for jdk6, including openjdk6.
+fop-legacy:
+fop-legacy: Home: https://xmlgraphics.apache.org/fop/
diff --git a/office/fop/README b/office/fop/README
index d8c102386f..063a19b2f8 100644
--- a/office/fop/README
+++ b/office/fop/README
@@ -13,10 +13,17 @@ described in the W3C Recommendation from 05 December 2006, and that
 complies with the November 2001 Portable Document Format Specification
 (Version 1.4) from Adobe Systems.
 
-The default build is for jdk 8 and older (including openjdk).  To build
-on jdk11 and newer, pass JDK11=yes to the build script.
+Conformance to the XML 1.0 and 1.1 Recommendations, XSLT 1.0 and 2.0
+Recommendations and the XML Namespaces Recommendation is understood.
+Other relevant documents, such as the XPath and XLink Working Drafts,
+are referenced as necessary. The FOP Project will attempt to use the
+latest version of evolving specifications.
 
-jai and jai-imageio are optional but recommended dependencies.
+The default build is for jdk 7 and 8 (including openjdk).  To build
+on jdk11 and newer, pass JDK11=yes to the build scrip.  If you are
+still running the (incredibly ancient) jdk 6, please use fop2.0, also
+available on SBo.
+
+Requires apache-ant and apache-maven.
 
-NOTE:
-This build needs a working connection to the internet.
+jai and jai-imageio are optional but recommended dependencies.
diff --git a/office/fop/fop.SlackBuild b/office/fop/fop.SlackBuild
index b5f4f9a5ce..80b4d2bea5 100644
--- a/office/fop/fop.SlackBuild
+++ b/office/fop/fop.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for fop
 
 # Copyright 2015 Thorn Inurcide USA
-# Copyright 2020 Lenard Spencer, Orlando, Florida, USA
+# Copyright 2020, 2021 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fop
-VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -92,7 +92,7 @@ sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml
 
 # Copy updated {pdf,font}box files:
 rm fop/lib/fontbox-2.0.*.jar || true
-cp $CWD/{font,pdf}box-2.0.21.jar fop/lib
+cp $CWD/{font,pdf}box-2.0.*.jar fop/lib
 
 # Copy hyphenation tables:
 unzip $CWD/offo-hyphenation.zip
diff --git a/office/fop/fop.info b/office/fop/fop.info
index e1f35c0c25..9cfe10aec6 100644
--- a/office/fop/fop.info
+++ b/office/fop/fop.info
@@ -1,16 +1,16 @@
 PRGNAM="fop"
-VERSION="2.5"
+VERSION="2.6"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.5-src.tar.gz \
-          http://mirror.reverse.net/pub/apache/pdfbox/2.0.21/fontbox-2.0.21.jar \
-          http://mirror.reverse.net/pub/apache/pdfbox/2.0.21/pdfbox-2.0.21.jar \
+DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.6-src.tar.gz \
+          http://mirror.reverse.net/pub/apache/pdfbox/2.0.23/fontbox-2.0.23.jar \
+          http://mirror.reverse.net/pub/apache/pdfbox/2.0.23/pdfbox-2.0.23.jar \
           https://downloads.sourceforge.net/offo/2.2/offo-hyphenation.zip"
-MD5SUM="5e7e87ef12845d31bce7a1fe8d61f501 \
-        5840ff3bcc1e2ea1d066b7f0114c359b \
-        aa28f5d7a9a89bb46391643315d5307b \
+MD5SUM="1d6bc84d2ab7f971bbc628080e3c307f \
+        f9aa90c666c88ff29e3cd34c15d538ca \
+        6b71c42c567d419f068f46f410dcc3a5 \
         bf9c09bf05108ef9661b8f08d91c2336"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-maven apache-ant"
+REQUIRES="apache-ant apache-maven"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/office/fop2.0/README b/office/fop2.0/README
deleted file mode 100644
index fa78d9462a..0000000000
--- a/office/fop2.0/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Apache FOP is a print formatter driven by XSL formatting objects. It
-is a Java application that reads a formatting object tree conforming
-to the XSL 1.1 Recommendation (05 December 2006) and then turns it
-into a PDF document, certain other output formats or allows you to
-preview it directly on screen. 
-
-Note that not all parts of the XSL 1.1 specification have yet been 
-implemented.
-
-This is the old fop 2.0 for the incredibly ancient jdk 6 (including
-openjdk6).  If you are running jdk 7 or newer, please use fop, also
-available on SBo.
-
-Also note that fop and fop2.0 cannot coexist on the same computer.
-
-jai is an optional but recommended dependency.
diff --git a/office/fop2.0/slack-desc b/office/fop2.0/slack-desc
deleted file mode 100644
index 76530dc12b..0000000000
--- a/office/fop2.0/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-fop2.0: fop2.0 (print formatter)
-fop2.0:
-fop2.0: Apache FOP is a print formatter driven by XSL formatting objects. It
-fop2.0: is a Java application that reads a formatting object tree conforming
-fop2.0: to the XSL 1.1 Recommendation (05 December 2006) and then turns it
-fop2.0: into a PDF document, certain other output formats or allows you to
-fop2.0: preview it directly on screen. Note that not all parts of the XSL
-fop2.0: 1.1 specification have yet been implemented.
-fop2.0: This version is for jdk version 6, including openjdk6.
-fop2.0:
-fop2.0: Home: https://xmlgraphics.apache.org/fop/
diff --git a/office/ghostwriter/fix-build-with-qt5.15.patch b/office/ghostwriter/fix-build-with-qt5.15.patch
new file mode 100644
index 0000000000..358e8bd21c
--- /dev/null
+++ b/office/ghostwriter/fix-build-with-qt5.15.patch
@@ -0,0 +1,21 @@
+commit ecad6c28195e535ae8ea8a29a91fa14f5e39faa9
+Author: Andrzej Telszewski <andrzej@telszewski.com>
+Date:   Wed Apr 7 22:55:57 2021 +0200
+
+    Fix build error with Qt 5.15
+    
+    Shamelessly based on upstream patch:
+      https://github.com/wereturtle/ghostwriter/commit/f8f4ec0a1b53d1f3e670817f051c59444851cf7f
+
+diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp
+index 2e4a9a1..45fc3e4 100644
+--- a/src/MarkdownEditor.cpp
++++ b/src/MarkdownEditor.cpp
+@@ -34,6 +34,7 @@
+ #include <QUrl>
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFileInfo>
+ #include <QDir>
+ 
diff --git a/office/ghostwriter/ghostwriter.SlackBuild b/office/ghostwriter/ghostwriter.SlackBuild
index 5abab5fafe..f9b6b2b7aa 100644
--- a/office/ghostwriter/ghostwriter.SlackBuild
+++ b/office/ghostwriter/ghostwriter.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ghostwriter
 
-# Copyright 2020 Andrzej Telszewski, Szczecin
+# Copyright 2021 Andrzej Telszewski, Szczecin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=ghostwriter
 VERSION=${VERSION:-1.8.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -67,6 +67,10 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-st,u+rwX,go-w+rX .
 
+# Fix build error with Qt 5.15
+
+cat $CWD/fix-build-with-qt5.15.patch | patch -p1
+
 # Adjust docs location.
 
 sed -i $PRGNAM.pro -e "s|man\.path.*$|man.path = /usr/man/man1|"
diff --git a/office/ghostwriter/ghostwriter.info b/office/ghostwriter/ghostwriter.info
index e2471bb7e6..cbc1933ccf 100644
--- a/office/ghostwriter/ghostwriter.info
+++ b/office/ghostwriter/ghostwriter.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
 MAINTAINER="Andrzej Telszewski"
-EMAIL="atelszewski@gmail.com"
+EMAIL="andrzej@telszewski.com"
diff --git a/office/gnucash-legacy-docs/gnucash-legacy-docs.info b/office/gnucash-legacy-docs/gnucash-legacy-docs.info
index d7d301f559..39441735b8 100644
--- a/office/gnucash-legacy-docs/gnucash-legacy-docs.info
+++ b/office/gnucash-legacy-docs/gnucash-legacy-docs.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-2.6.20.tar.gz"
 MD5SUM="b55a5a2d2486ec3e2c3b392bc397b822"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnucash rarian yelp"
+REQUIRES="gnucash-legacy rarian yelp"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/office/gnucash-legacy/README b/office/gnucash-legacy/README
index 6070b0bd0f..d1c71a62a1 100644
--- a/office/gnucash-legacy/README
+++ b/office/gnucash-legacy/README
@@ -9,9 +9,13 @@ on professional accounting principles to ensure balanced books and
 accurate reports.
 
 Pass OFX="yes" for OFX (USA) (requies libofx)
-Pass AQ="yes" to enable aqbanking (Germany) (requires aqbanking)
+
 Pass WITHPYTHON="yes" to enable Python bindings for report gereration.
 
+Note that the AQ="yes/no" switch has been removed as this version of
+gnucash will not build with the new versions of aqbanking; the older
+versions of aqbanking are not only obsolete, but no longer available.
+
 If you want the SQL database integration, you must first have libdbi
 and libdbi-drivers installed, and then pass the DBI="yes" flag.
 
diff --git a/office/gnucash-legacy/gnucash-legacy.SlackBuild b/office/gnucash-legacy/gnucash-legacy.SlackBuild
index 942ef90282..c203787a98 100644
--- a/office/gnucash-legacy/gnucash-legacy.SlackBuild
+++ b/office/gnucash-legacy/gnucash-legacy.SlackBuild
@@ -85,14 +85,6 @@ else
   OFXBANKING="--disable-ofx"
 fi
 
-if [ "$AQ" = "yes" ]; then
-  AQBANKING="--enable-aqbanking"
-  echo " building with aqbanking enabled"
-  sleep 1
-else
-  AQBANKING="--disable-aqbanking"
-fi
-
 if [ "$WITHPYTHON" = "yes" ]; then
   W_PYTHON="--enable-python"
   echo " building with Python bindings enabled"
@@ -129,7 +121,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$SRCNAM-$VERSION \
   $W_PYTHON \
   $OFXBANKING \
-  $AQBANKING \
+  --disable-aqbanking \
   --disable-schemas-compile \
   $DBIARGS \
   --build=$ARCH-slackware-linux
diff --git a/office/hebcal/hebcal.SlackBuild b/office/hebcal/hebcal.SlackBuild
index b52bda74c2..f74215ff85 100644
--- a/office/hebcal/hebcal.SlackBuild
+++ b/office/hebcal/hebcal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for hebcal
 
-# Copyright 2017 Judah Milgram, Washington DC
+# Copyright 2017-2021 Judah Milgram, Washington DC
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hebcal
-VERSION=${VERSION:-4.13}
+VERSION=${VERSION:-4.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/hebcal/hebcal.info b/office/hebcal/hebcal.info
index 1fb679f4cc..67cd9ae299 100644
--- a/office/hebcal/hebcal.info
+++ b/office/hebcal/hebcal.info
@@ -1,10 +1,10 @@
 PRGNAM="hebcal"
-VERSION="4.13"
+VERSION="4.24"
 HOMEPAGE="http://hebcal.github.io/"
-DOWNLOAD="https://github.com/hebcal/hebcal/archive/v4.13/hebcal-4.13.tar.gz"
-MD5SUM="23fb97bf63cd330d4d0a32b8ba69548a"
+DOWNLOAD="https://github.com/hebcal/hebcal/archive/v4.24/hebcal-4.24.tar.gz"
+MD5SUM="5772b0f41c07ff4bd9814da6fcb155d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Judah Milgram"
-EMAIL="milgram@cgpp.com"
+EMAIL="milgram at cgpp dot com"
diff --git a/office/keepassxc/keepassxc.SlackBuild b/office/keepassxc/keepassxc.SlackBuild
index a77d39e0c0..2ee32823c3 100644
--- a/office/keepassxc/keepassxc.SlackBuild
+++ b/office/keepassxc/keepassxc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for KeePassXC
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keepassxc
-VERSION=${VERSION:-2.6.1}
+VERSION=${VERSION:-2.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/keepassxc/keepassxc.info b/office/keepassxc/keepassxc.info
index 56436723bc..1569fdc32c 100644
--- a/office/keepassxc/keepassxc.info
+++ b/office/keepassxc/keepassxc.info
@@ -1,8 +1,8 @@
 PRGNAM="keepassxc"
-VERSION="2.6.1"
+VERSION="2.6.4"
 HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
-DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.6.1/keepassxc-2.6.1-src.tar.xz"
-MD5SUM="9089b93bacb23d4ad8c3c7846ab703a3"
+DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.6.4/keepassxc-2.6.4-src.tar.xz"
+MD5SUM="9574ff6fdd215e014569fc8a6b1f56e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="argon2 libsodium qrencode qt5"
diff --git a/office/lout/install-fix.patch b/office/lout/install-fix.patch
index 00b75ebbe9..9a2148480e 100644
--- a/office/lout/install-fix.patch
+++ b/office/lout/install-fix.patch
@@ -1,11 +1,11 @@
---- lout-3.39-org/makefile	2010-04-21 15:52:47.000000000 -0700
-+++ lout-3.39/makefile	2012-05-14 14:26:11.095459297 -0700
-@@ -386,12 +386,6 @@
- 	mkdir $(LOUTLIBDIR)/$(LIBLOCA)
+--- lout-3.42/makefile	2020-12-27 16:45:43.000000000 -0800
++++ lout-3.42-slackware/makefile	2021-01-08 10:42:01.398114307 -0800
+@@ -402,12 +402,6 @@
+ 	$(MKDIR) $(LOUTLIBDIR)/$(LIBLOCA)
  	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
  	@echo ""
 -	@echo "(c) Initializing run (should be silent, no errors expected)"
--	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
+-	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init -I $(LOUTLIBDIR)/$(LIBINCL) -H $(LOUTLIBDIR)/$(LIBHYPH) -D $(LOUTLIBDIR)/$(LIBDATA)
 -	@echo ""
 -	@echo "(d) Changing mode of files just created by initializing run"
 -	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
diff --git a/office/lout/lout.SlackBuild b/office/lout/lout.SlackBuild
index 55fa5f4939..9fad17c4be 100644
--- a/office/lout/lout.SlackBuild
+++ b/office/lout/lout.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=lout
-VERSION=${VERSION:-3.40}
+VERSION=${VERSION:-3.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -115,8 +115,6 @@ 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
 
 cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
-cp $CWD/$PRGNAM-$VERSION-user.ps.gz $PKG/usr/doc/$PRGNAM-$VERSION/
-find $PKG/usr/doc/$PRGNAM-$VERSION -name "*.ps" | xargs gzip
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/lout/lout.info b/office/lout/lout.info
index d86cf98a45..83ad97f70b 100644
--- a/office/lout/lout.info
+++ b/office/lout/lout.info
@@ -1,10 +1,8 @@
 PRGNAM="lout"
-VERSION="3.40"
-HOMEPAGE="http://savannah.nongnu.org/projects/lout"
-DOWNLOAD="http://download.savannah.gnu.org/releases/lout/lout-3.40.tar.gz \
-          http://download.savannah.gnu.org/releases/lout/lout-3.40-user.ps.gz"
-MD5SUM="fd0fe084cebd07fc209d392a2d380755 \
-        07fea75d0d03a3cd783646f638747f18"
+VERSION="3.42"
+HOMEPAGE="https://github.com/william8000/lout"
+DOWNLOAD="https://github.com/william8000/lout/archive/3.42/lout-3.42.tar.gz"
+MD5SUM="f69866918f309bed399fae1822f26bf0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/lyx/README b/office/lyx/README
index 7f819af3a1..dfddcefb2f 100644
--- a/office/lyx/README
+++ b/office/lyx/README
@@ -1,13 +1,13 @@
 LyX - A WYSIWYM document processor.
 
-LyX is a document processor that encourages an approach to 
-writing based on the structure of your documents (WYSIWYM) 
+LyX is a document processor that encourages an approach to
+writing based on the structure of your documents (WYSIWYM)
 and not simply their appearance (WYSIWYG).
 
-LyX combines the power and flexibility of TeX/LaTeX with the 
+LyX combines the power and flexibility of TeX/LaTeX with the
 ease of use of a graphical interface.
-This results in world-class support for creation of mathematical 
-content (via a fully integrated equation editor) and structured 
+This results in world-class support for creation of mathematical
+content (via a fully integrated equation editor) and structured
 documents like academic articles, theses, and books.
 
 LyX requires a working installation of TeX/LaTeX. For this you
diff --git a/office/lyx/lyx.SlackBuild b/office/lyx/lyx.SlackBuild
index a062abe012..9ef11d4703 100644
--- a/office/lyx/lyx.SlackBuild
+++ b/office/lyx/lyx.SlackBuild
@@ -5,7 +5,7 @@
 # Now maintained by R. S. Ananda Murthy (rsamurti@gmail.com)
 
 PRGNAM=lyx
-VERSION=${VERSION:-2.3.5.2}
+VERSION=${VERSION:-2.3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,7 +43,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-2.3.5.2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -60,7 +60,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-qt5 \
   --build=$ARCH-slackware-linux
 make
 make install DESTDIR=$PKG
diff --git a/office/lyx/lyx.info b/office/lyx/lyx.info
index 156f897010..5bc29cbd91 100644
--- a/office/lyx/lyx.info
+++ b/office/lyx/lyx.info
@@ -1,10 +1,10 @@
 PRGNAM="lyx"
-VERSION="2.3.5.2"
+VERSION="2.3.6.1"
 HOMEPAGE="http://www.lyx.org"
-DOWNLOAD="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-2.3.5.2.tar.xz"
-MD5SUM="9152c9525c8c7ee1ad0c43901101acad"
+DOWNLOAD="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-2.3.6.1.tar.xz"
+MD5SUM="e8cb8d271dda076fa0671aa7605ba384"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES=""
 MAINTAINER="R. S. Ananda Murthy"
 EMAIL="rsamurti@gmail.com"
diff --git a/office/mairix/mairix.SlackBuild b/office/mairix/mairix.SlackBuild
index 3707c91369..cfb8dc849e 100644
--- a/office/mairix/mairix.SlackBuild
+++ b/office/mairix/mairix.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mairix
 
-# Copyright 2015-2018  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2015-2018  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 PRGNAM=mairix
 VERSION=${VERSION:-0.24}
diff --git a/office/mairix/mairix.info b/office/mairix/mairix.info
index bf502dbd8e..dce2800e0e 100644
--- a/office/mairix/mairix.info
+++ b/office/mairix/mairix.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/mate-calc/mate-calc.SlackBuild b/office/mate-calc/mate-calc.SlackBuild
index 055d8d2ba3..a166f47b0c 100644
--- a/office/mate-calc/mate-calc.SlackBuild
+++ b/office/mate-calc/mate-calc.SlackBuild
@@ -102,4 +102,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:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/moneydance/moneydance.SlackBuild b/office/moneydance/moneydance.SlackBuild
index 8d51115337..3a4bf1be72 100644
--- a/office/moneydance/moneydance.SlackBuild
+++ b/office/moneydance/moneydance.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
-#
+
 # Slackware build script for moneydance
 
-# Copyright 2008-2017  Robby Workman, Tuscaloosa, AL, USA
+# Copyright 2008-2020  Robby Workman, Tuscaloosa, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=moneydance
-VERSION=${VERSION:-2017.1597}
+VERSION=${VERSION:-2021.2006}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,9 +38,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-  MDARCH=x86
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
   MDARCH=amd64
 else
   printf "$ARCH is not supported.\n"; exit 1
@@ -48,13 +46,17 @@ fi
 
 set -e
 
-rm -rf $PKG
-mkdir -p $PKG/opt $OUTPUT
-tar xvf $CWD/Moneydance_linux_${MDARCH}.tar.gz -C $PKG/opt
+rm -rf $TMP/$PRGNAM $PKG
+mkdir -p $TMP/$PRGNAM $PKG
+cd $TMP/$PRGNAM
+ar -x $CWD/${PRGNAM}_linux_amd64.deb
+tar xvf data.tar.bz2 -C $PKG
+
+rm -f $PKG/opt/Moneydance/create_desktop_file.sh
 
 mkdir -p $PKG/usr/bin
 ln -s /opt/Moneydance/Moneydance $PKG/usr/bin/moneydance
-ln -s /opt/Moneydance/Moneydance $PKG/usr/bin
+ln -s /opt/Moneydance/Moneydance $PKG/usr/bin/Moneydance
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/moneydance.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
@@ -65,8 +67,9 @@ ln -s /opt/Moneydance/resources/moneydance_icon32.png \
       $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/Moneydance/README.md $PKG/usr/doc/$PRGNAM-$VERSION
 ln -s /opt/Moneydance/resources/license.txt \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+      $PKG/usr/doc/$PRGNAM-$VERSION/license.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/moneydance/moneydance.info b/office/moneydance/moneydance.info
index 7cb9d06d34..5144ebfca4 100644
--- a/office/moneydance/moneydance.info
+++ b/office/moneydance/moneydance.info
@@ -1,10 +1,10 @@
 PRGNAM="moneydance"
-VERSION="2017.1597"
+VERSION="2020.2006"
 HOMEPAGE="http://moneydance.com"
-DOWNLOAD="http://infinitekind.com/stabledl/2017/Moneydance_linux_x86.tar.gz"
-MD5SUM="a238bf03130bdf944fecd1fcf2ab8bb7"
-DOWNLOAD_x86_64="http://infinitekind.com/stabledl/2017/Moneydance_linux_amd64.tar.gz"
-MD5SUM_x86_64="80ce4c0c690c483bb09cf22d0ac64cab"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://infinitekind.com/stabledl/current/moneydance_linux_amd64.deb"
+MD5SUM_x86_64="a537fa1f72492d6de2e60aae09c87b8b"
 REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/office/msee/README b/office/msee/README
new file mode 100644
index 0000000000..047a88b004
--- /dev/null
+++ b/office/msee/README
@@ -0,0 +1,2 @@
+*msee* is a command-line tool to read markdown file.
+And it's a library help your command-line software to output readable markdown content.
diff --git a/office/msee/msee.SlackBuild b/office/msee/msee.SlackBuild
new file mode 100644
index 0000000000..55dedc7d08
--- /dev/null
+++ b/office/msee/msee.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for msee
+
+# Copyright 2020 Tonus
+# 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=msee
+VERSION=${VERSION:-0.3.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+DESTDIR=$PKG npm install -g $CWD/$PRGNAM-$VERSION.tar.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  Example.md Help.md History.md README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/msee/msee.info b/office/msee/msee.info
new file mode 100644
index 0000000000..9442b13dd9
--- /dev/null
+++ b/office/msee/msee.info
@@ -0,0 +1,10 @@
+PRGNAM="msee"
+VERSION="0.3.3"
+HOMEPAGE="https://github.com/firede/msee"
+DOWNLOAD="https://github.com/firede/msee/archive/v0.3.3/msee-0.3.3.tar.gz"
+MD5SUM="4c08715e10433ba43dcf1efe799676eb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Tonus"
+EMAIL="tonus1@gmail.com"
diff --git a/office/msee/slack-desc b/office/msee/slack-desc
new file mode 100644
index 0000000000..d155be43b7
--- /dev/null
+++ b/office/msee/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+msee: msee (command line tool)
+msee:
+msee:
+msee: msee is a command-line tool to read markdown file.
+msee:
+msee: And it's a library help your command-line software to output readable 
+msee: markdown content.
+msee:
+msee:
+msee:
+msee:
diff --git a/office/mu/mu.SlackBuild b/office/mu/mu.SlackBuild
index c4c856b5bf..8f5a4a243d 100644
--- a/office/mu/mu.SlackBuild
+++ b/office/mu/mu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mu
 
-# Copyright 2013-2018 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2013-2018 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/office/mu/mu.info b/office/mu/mu.info
index 534da643df..752e3ee3b5 100644
--- a/office/mu/mu.info
+++ b/office/mu/mu.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/mupdf/README b/office/mupdf/README
index c67d450b06..4d84fe11bb 100644
--- a/office/mupdf/README
+++ b/office/mupdf/README
@@ -19,6 +19,6 @@ regular PDF viewer, and mupdf-x11-curl has support for fetching remote
 resources from the network (which may be considered a security risk).
 mupdf-gl uses OpenGL for rendering (and doesn't support curl).
 
-3. By default, mupdf is now built as shared libraries. If for some
-reason you need static libs instead, build with STATIC=yes in the
-script's environment. See README_shared.txt for more information.
+3. mupdf's PDF digital signature verification and signing support is
+disabled in this build, because Slackware 14.2's openssl is too old.
+For most users, this is a rarely- or never-used feature anyway.
diff --git a/office/mupdf/README_shared.txt b/office/mupdf/README_shared.txt
deleted file mode 100644
index 227928d253..0000000000
--- a/office/mupdf/README_shared.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Here is a hopefully informative mini-rant about shared library support
-for mupdf.
-
-Upstream doesn't do shared libraries and doesn't recommend distro
-packages use them. This build used to follow that advice. However,
-mupdf is just too large to use as a static library. We end up with a
-47MB libmupdf.a, plus 7 33MB binaries. *Every* distro I've looked at
-ships mupdf as shared libs, despite upstream's policy.
-
-A long time ago (in 2013), I used to patch mupdf for shared lib support,
-but I removed it when it stopped applying cleanly. Thomas Morper on the
-slackbuilds-users mailing list recently (2018) asked if I could include
-a patch (from LFS) that adds shared library support, so starting with
-mupdf 1.13.0, BUILD 2, we have shared libraries again.
-
-In case someone *really* disagrees with this change, I added a STATIC=yes
-environment setting. If you use this, you get static libs and no
-shared ones, per upstream's policy. This has been tested and works for
-1.13.0-2, but be aware that I probably won't be testing static builds
-for every mupdf release. If you run into trouble, email me and/or the
-slackbuilds-users list.
-
-The library versioning scheme I had to use is unfortunate. The major
-soname version is supposed to only change when there's an incompatible ABI
-change. The way I'm doing it, it changes for every mupdf release [*]. This
-is because upstream doesn't tell us when the ABI changes, because it's
-not relevant for them. They support only static libs specifically to
-avoid the headache of having to track and minimize ABI changes. Whenever
-they want to change the ABI, they just do it. Anything built against the
-old version will keep working fine, because it's statically linked. With
-shared libs, I have to invent my own library versioning scheme.
-
-The end result of this is, I (humble packager) can't easily tell when
-the ABI has changed, so I treat every release [*] as an ABI change. Means
-anything linked with libmupdf will fail with 'cannot open shared object
-file' after a mupdf upgrade, so it'll have to be rebuilt. The alternative
-would be to use unversioned shared libs, which would (seem to) avoid
-the need to rebuild... but whenever the undocumented ABI changed, we'd
-get weird behaviour and segfaults instead of a clean error message.
-
-The shared library patch used here is by me (B. Watson), based on a
-patch from Linux From Scratch. The original LFS patch doesn't include
-versioned libs, I suspect becase in LFS you tend to upgrade the entire
-OS by rebuilding it, instead of upgrading just one library.
-
-Right now, the only SBo builds affected by mupdf upgrades will be
-zathura-pdf-mupdf and possibly fbpdf (if built with optional mupdf
-support). Both have been tested with shared mupdf, and both compile and
-run cleanly.
-
-[*] Actually, not micro-version point releases (e.g. 1.13.0 => 1.13.1).
-    Hopefully this doesn't cause a problem later. Upstream has just
-    switched to a major.minor.micro version scheme starting with 1.13.0,
-    so I don't know how often there will be micro-version bumps, and
-    whether or not they'll have ABI changes.
diff --git a/office/mupdf/doinst.sh b/office/mupdf/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/office/mupdf/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild
index cf8e18afdc..bd6aad3948 100644
--- a/office/mupdf/mupdf.SlackBuild
+++ b/office/mupdf/mupdf.SlackBuild
@@ -7,6 +7,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201020 bkw: update for 1.18.0. See notes, below.
 # 20200217 bkw: update for 1.16.1.
 # 20180623 bkw: BUILD=2, add patch for dynamic linking. Thanks
 #               to Thomas Morper for pointing me in the right direction.
@@ -16,8 +17,42 @@
 # 20170621 bkw: fix build with -current's newer openjpeg, BUILD=2.
 # 20170122 bkw: update for 1.10a.
 
+# Notes for 1.18.0:
+# - This script can no longer build older versions, too many changes.
+# - Upstream *finally* supports building as a shared library, so I and
+#   all other distro packagers can stop patching it... except the
+#   shared lib is unversioned, which means upgrades would cause more
+#   breakage than they should. So there's still some trickery here to
+#   build a versioned solib.
+# - I've got rid of the STATIC=yes option and now only build shared libs.
+#   As a side effect, libmupdf-third is gone, but I've included a
+#   placeholder so stuff that links with it, will work without patching.
+# - gumbo (HTML parser) is now a hard dep. The source is bundled, so
+#   there's no need to create a new gumbo SlackBuild, but it does mean
+#   the mupdf shared lib has grown in size.
+# - mupdf-gl uses freeglut. The version we have in 14.2 is new enough to
+#   build with, but old enough that you can't copy text from mupdf-gl.
+#   So we build the bundled version here.
+# - API docs are now included in the package.
+# - Now using upstream's icons, including scalable SVG.
+# - Add missing doinst.sh
+# - There's now the option to build with tesseract and leptonica,
+#   but it's disabled in this script. I have yet to get it to
+#   actually *do* anything other than fail to build (when using
+#   upstream's tesseract/leptonica forks) or complain about being
+#   unable to load eng.traineddata (using SBo tesseract/leptonica,
+#   and yes eng.traineddata is fine). Until I work out what's wrong,
+#   or upstream releases a new version, this script doesn't support
+#   building with tesseract. Don't contact me about this before March
+#   1, 2021, unless you actually have a patch that fixes it. After
+#   that, if this message is still here, feel free to remind me to
+#   revisit it.
+# - Slackware 14.2's libcrypto (from openssl) is too old for mupdf,
+#   and there's no bundled souce for it. So currently mupdf is being
+#   built without libcrypto. Hope that's OK.
+
 PRGNAM=mupdf
-VERSION=${VERSION:-1.16.1}
+VERSION=${VERSION:-1.18.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,6 +84,22 @@ else
 fi
 set -e
 
+# Tesseract code left here for future reference. At some point upstream
+# (or maybe I) will fix it.
+if [ "${TESSERACT:-no}" = "yes" ]; then
+  TESSARGS="USE_SYSTEM_LEPTONICA=yes USE_SYSTEM_TESSERACT=yes"
+  cat <<EOF
+***
+*** 20201023 bkw: Tesseract support in mupdf is currently broken. If
+*** you want to forcibly build with it, edit the SlackBuild. Aborting.
+***
+EOF
+  exit 1
+else
+  TESSARGS="HAVE_LEPTONICA=no HAVE_TESSERACT=no"
+fi
+
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -60,28 +111,37 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-
 # Hard-code the version number so it'll stop trying to use git to retrieve
 # it and spewing harmless but scary 'fatal: Not a git repository' errors.
 sed -i "/^VERSION/s,=.*,= $VERSION," Makefile
 
-# 20180623 bkw: Finally, dynamic linking again. Patch is based on
-# http://www.linuxfromscratch.org/patches/blfs/svn/mupdf-1.13.0-shared_libs-1.patch
-# but I added versioned sonames. See README_shared.txt for the gory details.
-STATIC=${STATIC:-no}
+# As of 1.18.0, we don't actually have to patch the Makefile
+# to do a versioned shared lib, but we do have to override some
+# variables. SOMAJOR is the mupdf major and zero-padded minor version
+# jammed together (e.g. 113 for 1.13.0, 203 for 2.3.0). SOMINOR is the
+# mupdf micro version (e.g. 0 for 1.13.0).
+SOMAJOR=$(echo $VERSION | cut -d. -f1-2 | sed -e 's,\.[0-9]$,0&,' -e 's,\.,,g')
+SOMINOR=$(echo $VERSION | cut -d. -f3-  | sed 's,\.,,g' )
+SOVER=$SOMAJOR.$SOMINOR
 
-if [ "$STATIC" != "yes" ]; then
-  patch -p1 < $CWD/shared_libs.diff
-  LIBTYPE=shared
-else
-  LIBTYPE=static
-fi
+# Shared libraries should be installed executable.
+sed -i '/install.*644.*INSTALL_LIBS/s,644,755,' Makefile
+
+# tesseract autodetection is mildly broken:
+sed -i 's,tesseract-ocr,tesseract,' Makerules
 
-# Build against system libs instead of bundled ones. If we didn't do this,
-# libmupdf would be useless for building anything else.
+# Build against system libs instead of bundled ones, where possible.
+# C++ (XCXXFLAGS) is only actually used if building with tesseract.
 make verbose=yes \
+  shared=yes \
+  LIB_LDFLAGS="-shared -Wl,-soname -Wl,libmupdf.so.$SOMAJOR" \
+  SO="so.$SOVER" \
   XCFLAGS="$SLKCFLAGS -DJBIG_NO_MEMENTO" \
+  XCXXFLAGS="-std=c++11 -fpermissive" \
   USE_SYSTEM_LIBS=yes \
+  USE_SYSTEM_GUMBO=no \
+  USE_SYSTEM_GLUT=no \
+  $TESSARGS \
   build=release \
   prefix=/usr \
   libdir=/usr/lib$LIBDIRSUFFIX \
@@ -90,9 +150,24 @@ make verbose=yes \
   DESTDIR=$PKG \
   all install
 
-strip $PKG/usr/bin/*
+# bins and libs are already stripped.
 gzip -9 $PKG/usr/man/man1/*.1
 
+# ldconfig will create the libmupdf.so.$SOVER link, but the libmupdf.so
+# one has to be part of the package.
+ln -s lib$PRGNAM.so.$SOMAJOR.$SOMINOR $PKG/usr/lib$LIBDIRSUFFIX/lib$PRGNAM.so
+
+# Historically, mupdf has included two libraries: libmupdf itself,
+# and libmupdf-third, containing all the bundled third party code
+# included with the source. In version 1.18.0, when building a
+# shared lib, no libmupdf-third gets created (all the code ends up in
+# libmupdf.so). However, most projects that link with libmupdf expect
+# this library to exist. This will probably change in the future as
+# those projects get updated for the changes in mupdf, but for now,
+# to be compatible with older mupdf versions, we include an empty
+# libmupdf-third for stuff to link with.
+ar crs $PKG/usr/lib$LIBDIRSUFFIX/libmupdf-third.a
+
 # Compatibility symlinks. Older versions, the binary is just "mupdf".
 # Separate -curl binary exists in 1.5 but not 1.4.
 ln -s $PRGNAM-x11 $PKG/usr/bin/$PRGNAM
@@ -101,26 +176,20 @@ for i in x11 x11-curl gl; do
     ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-$i.1.gz
 done
 
-# Installed permissions are atrocious (everything 755).
-find $PKG -type f | xargs chmod 644
-chmod 755 $PKG/usr/bin/*
-if [ "$STATIC" != "yes" ]; then
-  chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/lib*.so.*.*
-fi
-
 # .desktop taken from debian and modified:
 # - make it validate.
 # - add mime types for cbz and xps.
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-# Icon converted from platform/x11/mupdf.ico, with icotool.
-mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+# Use shipped PNG and SVG icons.
+mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/icons/hicolor/scalable/apps
+cat docs/logo/mupdf-icon.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat docs/logo/mupdf-logo.svg > $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
 # .pc file taken from debian and parameterized.
-PCLIBS="-l$PRGNAM -lfreetype -lharfbuzz -ljbig2dec -ljpeg -lcrypto -lopenjp2 -lz -lm"
-PCLIBS="$PCLIBS -lmupdfthird"
+# -lcrypto used to be in this list, will be again someday.
+PCLIBS="-l$PRGNAM -lfreetype -lharfbuzz -ljbig2dec -ljpeg -lopenjp2 -lz -lm"
 
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/
 sed -e "s,@LIB@,lib$LIBDIRSUFFIX,g" \
@@ -129,14 +198,12 @@ sed -e "s,@LIB@,lib$LIBDIRSUFFIX,g" \
     $CWD/$PRGNAM.pc > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc
 
 # 'make install' already installed most of the docs.
-cp -a CONTRIBUTORS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTORS docs/api $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# slack-desc will conveniently say whether javascript is built in,
-# and whether libs are shared or static.
 mkdir -p $PKG/install
-sed -e "s,@LIBTYPE@,$LIBTYPE," \
-    $CWD/slack-desc > $PKG/install/slack-desc
+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}
diff --git a/office/mupdf/mupdf.info b/office/mupdf/mupdf.info
index a53a00deb2..5865c171ae 100644
--- a/office/mupdf/mupdf.info
+++ b/office/mupdf/mupdf.info
@@ -1,8 +1,8 @@
 PRGNAM="mupdf"
-VERSION="1.16.1"
+VERSION="1.18.0"
 HOMEPAGE="https://www.mupdf.com/"
-DOWNLOAD="https://www.mupdf.com/downloads/archive/mupdf-1.16.1-source.tar.xz"
-MD5SUM="11075a1d882451b65c3739b588436d68"
+DOWNLOAD="https://www.mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz"
+MD5SUM="3135391b027cdbedf915db1787b4ea05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jbig2dec"
diff --git a/office/mupdf/mupdf.png b/office/mupdf/mupdf.png
deleted file mode 100644
index f7cf1a6e1b..0000000000
--- a/office/mupdf/mupdf.png
+++ /dev/null
diff --git a/office/mupdf/shared_libs.diff b/office/mupdf/shared_libs.diff
deleted file mode 100644
index 8d8204b67b..0000000000
--- a/office/mupdf/shared_libs.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur mupdf-1.16.1-source/Makefile mupdf-1.16.1-source.patched/Makefile
---- mupdf-1.16.1-source/Makefile	2019-08-02 10:49:26.000000000 -0400
-+++ mupdf-1.16.1-source.patched/Makefile	2020-02-17 22:15:13.596704068 -0500
-@@ -20,7 +20,7 @@
- # Do not specify CFLAGS or LIBS on the make invocation line - specify
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
--CFLAGS += $(XCFLAGS) -Iinclude
-+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
- LIBS += $(XLIBS) -lm
- 
- ifneq ($(threading),no)
-@@ -189,17 +189,21 @@
- 
- # --- Library ---
- 
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdf-third.so
-+THREAD_LIB = $(OUT)/libmupdf-threads.so
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOMAJOR) -Wl,--no-undefined $(THIRD_LIBS)
- $(THIRD_LIB) : $(THIRD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOMAJOR) -Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so.$(SOMAJOR) -Wl,--no-undefined -lpthread
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupfs-pkcs7.so.$(SOMAJOR)
- 
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
- 
- # --- Main tools and viewers ---
- 
-@@ -294,6 +298,14 @@
- 
- VERSION = $(shell git describe --tags)
- 
-+# 20180623 bkw: major/minor/micro versions for shared library.
-+# SOMAJOR is the mupdf major/minor version jammed together (e.g. 113
-+# for 1.13.0).
-+# SOMINOR is the mupdf micro version (e.g. 0 for 1.13.0).
-+SOMAJOR = $(shell echo $(VERSION) | cut -d. -f1-2 | sed 's,\.,,g' )
-+SOMINOR = $(shell echo $(VERSION) | cut -d. -f3-  | sed 's,\.,,g' )
-+SOVER = $(SOMAJOR).$(SOMINOR)
-+
- version:
- 	sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h
- 
-@@ -331,7 +343,13 @@
- 	install -m 644 include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
- 
- 	install -d $(DESTDIR)$(libdir)
--	install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir)
-+	install -s -m0755 $(INSTALL_LIBS) $(DESTDIR)$(libdir)
-+	( cd $(DESTDIR)$(libdir) ; \
-+		for i in $(INSTALL_LIBS); do \
-+			j=$$( basename $$i) ; \
-+			mv $$j $$j.$(SOVER) ; \
-+			ln -s $$j.$(SOVER) $$j ; \
-+		done )
- 
- 	install -d $(DESTDIR)$(bindir)
- 	install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
diff --git a/office/mupdf/slack-desc b/office/mupdf/slack-desc
index eac6630b9e..b2765401f2 100644
--- a/office/mupdf/slack-desc
+++ b/office/mupdf/slack-desc
@@ -15,5 +15,5 @@ mupdf: the look of a printed page on screen.
 mupdf:
 mupdf: https://www.mupdf.com/
 mupdf:
-mupdf: This package installs @LIBTYPE@ libraries.
+mupdf:
 mupdf:
diff --git a/office/notmuch/notmuch.SlackBuild b/office/notmuch/notmuch.SlackBuild
index 1076586a29..9a2c386a43 100644
--- a/office/notmuch/notmuch.SlackBuild
+++ b/office/notmuch/notmuch.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for notmuch
 
-# Copyright 2015-2018  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2015-2018  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 PRGNAM=notmuch
 VERSION=${VERSION:-0.28.2}
diff --git a/office/notmuch/notmuch.info b/office/notmuch/notmuch.info
index 5992f640bb..ff4f542f79 100644
--- a/office/notmuch/notmuch.info
+++ b/office/notmuch/notmuch.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/nts/nts.SlackBuild b/office/nts/nts.SlackBuild
index 99cca5b1cb..3c3d87fe07 100644
--- a/office/nts/nts.SlackBuild
+++ b/office/nts/nts.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nts
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 PRGNAM=nts
 VERSION=${VERSION:-82}
diff --git a/office/nts/nts.info b/office/nts/nts.info
index dbce62a787..136bf3c0d3 100644
--- a/office/nts/nts.info
+++ b/office/nts/nts.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-dateutil wxPython"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild
index e4a8d95bc4..64c8abfd6c 100644
--- a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild
+++ b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for onlyoffice-desktopeditors
 
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=onlyoffice-desktopeditors
-VERSION=${VERSION:-6.0.0}
+VERSION=${VERSION:-6.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info
index c50d51f3d1..6aba4bfbd6 100644
--- a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info
+++ b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info
@@ -1,10 +1,10 @@
 PRGNAM="onlyoffice-desktopeditors"
-VERSION="6.0.0"
+VERSION="6.2.0"
 HOMEPAGE="https://www.onlyoffice.com/apps.aspx"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/ONLYOFFICE/DesktopEditors/releases/download/ONLYOFFICE-DesktopEditors-6.0.0/onlyoffice-desktopeditors_amd64.deb"
-MD5SUM_x86_64="dd1ad064d43e82084619dab3dcf81a5d"
+DOWNLOAD_x86_64="https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v6.2.0/onlyoffice-desktopeditors_amd64.deb"
+MD5SUM_x86_64="2bb6a62e6ab85b2bcd7633431064f8a5"
 REQUIRES="gtkglext krb5 ttf-carlito"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/pandoc-bin/README b/office/pandoc-bin/README
index 37a33413ea..c9bd8189e7 100644
--- a/office/pandoc-bin/README
+++ b/office/pandoc-bin/README
@@ -1,44 +1,44 @@
-If you need to convert files from one markup format into another,
-pandoc is your swiss-army knife.
+If you need to convert files from one markup format into another, pandoc
+is your swiss-army knife.
 
 Pandoc can convert documents in (several dialects of) Markdown,
-reStructuredText, textile, HTML, DocBook, LaTeX, MediaWiki markup,
-TWiki markup, TikiWiki markup, DokuWiki markup, Creole 1.0, Vimwiki
-markup, roff man, OPML, Emacs Org-Mode, Emacs Muse, txt2tags,
-Microsoft Word docx, LibreOffice ODT, EPUB, Jupyter notebooks ipynb,
-or Haddock markup to
+reStructuredText, textile, HTML, DocBook, LaTeX, MediaWiki markup, TWiki
+markup, TikiWiki markup, DokuWiki markup, Creole 1.0, Vimwiki markup,
+roff man, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Microsoft Word
+docx, LibreOffice ODT, EPUB, Jupyter notebooks ipynb, or Haddock markup
+to
+HTML formats
+  XHTML, HTML5, and HTML slide shows using Slidy, reveal.js, Slideous,
+  S5, or DZSlides
+Word processor formats
+  Microsoft Word docx, OpenOffice/LibreOffice ODT, OpenDocument XML,
+  Microsoft PowerPoint.
+Ebooks
+  EPUB version 2 or 3, FictionBook2
+Documentation formats
+  DocBook version 4 or 5, TEI Simple, GNU TexInfo, roff man, roff ms,
+  Haddock markup
+Archival formats
+  JATS
+Page layout formats
+  InDesign ICML
+Outline formats
+  OPML
+TeX formats
+  LaTeX, ConTeXt, LaTeX Beamer slides
+PDF
+  via pdflatex, xelatex, lualatex, pdfroff, wkhtml2pdf, prince, or
+  weasyprint.
+Lightweight markup formats
+  Markdown (including CommonMark and GitHub-flavored Markdown),
+  reStructuredText, AsciiDoc, Emacs Org-Mode, Emacs Muse, Textile,
+  txt2tags, MediaWiki markup, DokuWiki markup, TikiWiki markup, TWiki
+  markup, Vimwiki markup, and ZimWiki markup.
+Interactive notebook formats
+  Jupyter notebook (ipynb)
+Custom formats
+  custom writers can be written in lua.
 
-HTML formats:
-    XHTML, HTML5, and HTML slide shows using Slidy, reveal.js,
-    Slideous, S5, or DZSlides
-Word processor formats:
-    Microsoft Word docx, OpenOffice/LibreOffice ODT, OpenDocument XML,
-    Microsoft PowerPoint.
-Ebooks:
-    EPUB version 2 or 3, FictionBook2
-Documentation formats:
-    DocBook version 4 or 5, TEI Simple, GNU TexInfo, roff man, roff
-    ms, Haddock markup
-Archival formats:
-    JATS
-Page layout formats:
-    InDesign ICML
-Outline formats:
-    OPML
-TeX formats:
-    LaTeX, ConTeXt, LaTeX Beamer slides
-PDF:
-    via pdflatex, xelatex, lualatex, pdfroff, wkhtml2pdf, prince,
-    or weasyprint.
-Lightweight markup formats:
-    Markdown (including CommonMark and GitHub-flavored Markdown),
-    reStructuredText, AsciiDoc, Emacs Org-Mode, Emacs Muse, Textile,
-    txt2tags, MediaWiki markup, DokuWiki markup, TikiWiki markup,
-    TWiki markup, Vimwiki markup, and ZimWiki markup.
-Interactive notebook formats:
-    Jupyter notebook (ipynb)
-Custom formats:
-    custom writers can be written in lua.
-
-NOTE: This slackbuild repackages the official binary from the Pandoc
-GitHub.  There are no additional dependencies.
+NOTE:
+This slackbuild repackages the official binary from the Pandoc GitHub.
+There are no additional dependencies.
diff --git a/office/pandoc-bin/pandoc-bin.SlackBuild b/office/pandoc-bin/pandoc-bin.SlackBuild
index 1a78d31d9a..e41b66d849 100644
--- a/office/pandoc-bin/pandoc-bin.SlackBuild
+++ b/office/pandoc-bin/pandoc-bin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pandoc-bin
 
-# Copyright 2019-2020 Andrew Payne, Boston MA <phalange@komputermatrix.com>
+# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,10 @@
 
 PRGNAM=pandoc-bin
 SRCNAM=pandoc
-VERSION=${VERSION:-2.11.0.2}
+VERSION=${VERSION:-2.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-set -e
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -45,31 +43,29 @@ else
   exit 1
 fi
 
+set -e
+
 TMP=${TMP:-/tmp/SBo}
 CWD=$(pwd)
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-mkdir -p $TMP $PKG $OUTPUT
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION-linux-amd64.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 \
   -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 {} \;
 
-rm -rf $PKG
-mkdir -p $PKG/usr/
 cp -r bin $PKG/usr/
 cp -r share/man $PKG/usr/
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/ -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-bin.SlackBuild
 
diff --git a/office/pandoc-bin/pandoc-bin.info b/office/pandoc-bin/pandoc-bin.info
index 35b8337cec..465f946965 100644
--- a/office/pandoc-bin/pandoc-bin.info
+++ b/office/pandoc-bin/pandoc-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="pandoc-bin"
-VERSION="2.11.0.2"
+VERSION="2.13"
 HOMEPAGE="https://github.com/jgm/pandoc"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/jgm/pandoc/releases/download/2.11.0.2/pandoc-2.11.0.2-linux-amd64.tar.gz"
-MD5SUM_x86_64="f7009b8114a0ff9b96534fc935ea7e24"
+DOWNLOAD_x86_64="https://github.com/jgm/pandoc/releases/download/2.13/pandoc-2.13-linux-amd64.tar.gz"
+MD5SUM_x86_64="4453baf7a3880c9f08c623d017761346"
 REQUIRES=""
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/office/pdfjam/README b/office/pdfjam/README
deleted file mode 100644
index 7d3d58266c..0000000000
--- a/office/pdfjam/README
+++ /dev/null
@@ -1,4 +0,0 @@
-PDFjam is a collection of shell scripts providing a simple interface
-to functionality of the pdfpages package for pdfLaTeX. PDFjam can
-rotate pages, join PDFs, n-up several pages onto one page, generate a
-printer spread for books, and much much more.
diff --git a/office/pdfjam/pdfjam.SlackBuild b/office/pdfjam/pdfjam.SlackBuild
deleted file mode 100644
index 79a862e459..0000000000
--- a/office/pdfjam/pdfjam.SlackBuild
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pdfjam
-# Copyright 2016  Klaatu klaatu@member.fsf.org
-#
-# GNU All-Permissive License
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-
-PRGNAM=pdfjam
-VERSION=${VERSION:-2.08}
-VERTAR=${VERTAR:-latest}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH='noarch'
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/"$PRGNAM"_"$VERTAR".tgz
-cd $PRGNAM
-chown -R root:root .
-find -L . \
- \( -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 {} \;
-
-# already in PRGNAM
-mkdir $PKG/usr
-mv bin $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-mkdir $PKG/etc
-mv pdfjam.conf $PKG/etc
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-
-for i in man1/* ; do gzip -9c "$i" > $PKG/usr/man/"$i".gz ; done
-
-cp -a COPYING VERSION tests.zip PDFjam-README.html pdfdroplets.png \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/pdfjam/pdfjam.info b/office/pdfjam/pdfjam.info
deleted file mode 100644
index d97fbbdeed..0000000000
--- a/office/pdfjam/pdfjam.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pdfjam"
-VERSION="2.08"
-HOMEPAGE="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic-research/firth/software/pdfjam"
-DOWNLOAD="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_latest.tgz"
-MD5SUM="7df075df7f129091f826275ce8c1f374"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Klaatu"
-EMAIL="klaatu@member.fsf.org"
diff --git a/office/pdfstudio/pdfstudio.SlackBuild b/office/pdfstudio/pdfstudio.SlackBuild
index 43688fe99a..27f10fc1cf 100644
--- a/office/pdfstudio/pdfstudio.SlackBuild
+++ b/office/pdfstudio/pdfstudio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pdfstudio
 
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdfstudio
-VERSION=${VERSION:-2020.1.1}
+VERSION=${VERSION:-2020.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 YEAR=${VERSION:0:4}
diff --git a/office/pdfstudio/pdfstudio.info b/office/pdfstudio/pdfstudio.info
index 63a604d2bd..c037064411 100644
--- a/office/pdfstudio/pdfstudio.info
+++ b/office/pdfstudio/pdfstudio.info
@@ -1,10 +1,10 @@
 PRGNAM="pdfstudio"
-VERSION="2020.1.1"
+VERSION="2020.4.0"
 HOMEPAGE="https://www.qoppa.com/pdfstudio/"
-DOWNLOAD="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_1_1_linux.deb"
-MD5SUM="d39d37f6fc9eab86c2d7bef207abbe8d"
-DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_1_1_linux64.deb"
-MD5SUM_x86_64="0a180eed919ddb4d228295d4f477a160"
+DOWNLOAD="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_4_0_linux.deb"
+MD5SUM="54b767608e88afdeeeb7292c278624c2"
+DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v2020/PDFStudio_v2020_4_0_linux64.deb"
+MD5SUM_x86_64="d4b8f062f90d191a7fca0b003101e772"
 REQUIRES="jdk"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/pdfstudioviewer/pdfstudioviewer.SlackBuild b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
index dc9920656a..07ddfd8dfc 100644
--- a/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
+++ b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pdfstudioviewer
 
-# Copyright 2019-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdfstudioviewer
-VERSION=${VERSION:-2020.1.1}
+VERSION=${VERSION:-2020.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 YEAR=${VERSION:0:4}
diff --git a/office/pdfstudioviewer/pdfstudioviewer.info b/office/pdfstudioviewer/pdfstudioviewer.info
index b82858e187..2099167cae 100644
--- a/office/pdfstudioviewer/pdfstudioviewer.info
+++ b/office/pdfstudioviewer/pdfstudioviewer.info
@@ -1,10 +1,10 @@
 PRGNAM="pdfstudioviewer"
-VERSION="2020.1.1"
+VERSION="2020.4.0"
 HOMEPAGE="https://www.qoppa.com/pdfstudioviewer/"
-DOWNLOAD="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_1_1_linux.deb"
-MD5SUM="af136c888bc5adb8335ece9de2c32c32"
-DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_1_1_linux64.deb"
-MD5SUM_x86_64="f1763dfa066f279448e827a091d4d7fb"
+DOWNLOAD="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_4_0_linux.deb"
+MD5SUM="b00266ac215c57010652919cf5ecd997"
+DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudioviewer/v2020/PDFStudioViewer_v2020_4_0_linux64.deb"
+MD5SUM_x86_64="915bf1db64f138d75c5bb314b44c6c07"
 REQUIRES="jdk"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/sc-im/sc-im.SlackBuild b/office/sc-im/sc-im.SlackBuild
index 25e318343e..b7d25c2915 100644
--- a/office/sc-im/sc-im.SlackBuild
+++ b/office/sc-im/sc-im.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sc-im
 
-# Copyright 2016-2018  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016-2018  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/office/sc-im/sc-im.info b/office/sc-im/sc-im.info
index 69ea4bfb9b..ffae38a071 100644
--- a/office/sc-im/sc-im.info
+++ b/office/sc-im/sc-im.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxls libxlsxwriter"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/smoffice2021/smoffice2021.SlackBuild b/office/smoffice2021/smoffice2021.SlackBuild
index 63199591cc..86a7395e3f 100644
--- a/office/smoffice2021/smoffice2021.SlackBuild
+++ b/office/smoffice2021/smoffice2021.SlackBuild
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=smoffice2021
-VERSION=${VERSION:-2021_1020}
+VERSION=${VERSION:-2021_1024}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/smoffice2021/smoffice2021.info b/office/smoffice2021/smoffice2021.info
index df07fd77d8..43812124a4 100644
--- a/office/smoffice2021/smoffice2021.info
+++ b/office/smoffice2021/smoffice2021.info
@@ -1,10 +1,10 @@
 PRGNAM="smoffice2021"
-VERSION="2021_1020"
+VERSION="2021_1024"
 HOMEPAGE="https://www.softmaker.com/en/softmaker-office-linux"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-office-2021-1020-amd64.tgz"
-MD5SUM_x86_64="70e213521cd7bd1718cbc2b425f6aa1a"
+DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-office-2021-1024-amd64.tgz"
+MD5SUM_x86_64="4fd374951ac0a4671a91acdca475d90b"
 REQUIRES=""
 MAINTAINER="Donald Cooley"
 EMAIL="chytraeu@sdf.org"
diff --git a/office/task/README b/office/task/README
index 492df083fc..8c4fafc6fa 100644
--- a/office/task/README
+++ b/office/task/README
@@ -1,4 +1,6 @@
-task (a.k.a taskwarrior) is an advanced task manager for the console with an
-extensive set of features. task manages your TODO list from the command line.
-It is flexible, fast, and unobtrusive. It does its job then gets out of your
-way.
+task (a.k.a taskwarrior) is an advanced task manager for the console
+with an extensive set of features. task manages your TODO list from the
+command line.
+
+It is flexible, fast, and unobtrusive. It does its job then gets out of
+your way.
diff --git a/office/task/task.SlackBuild b/office/task/task.SlackBuild
index 672c63caef..6ae935d172 100644
--- a/office/task/task.SlackBuild
+++ b/office/task/task.SlackBuild
@@ -2,10 +2,30 @@
 
 # Slackware build script for task
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2018-2021 by Jostein Berntsen <jvbernts@online.no>
+
+# 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=task
-VERSION=${VERSION:-2.5.1}
+VERSION=${VERSION:-2.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +91,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CMakeLists.txt COPYING ChangeLog DEVELOPER EXPOSITION INSTALL LICENSE NEWS README.md \
+cp -a AUTHORS CMakeLists.txt COPYING ChangeLog INSTALL LICENSE NEWS README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/office/task/task.info b/office/task/task.info
index a92e20c587..bf3728e4a3 100644
--- a/office/task/task.info
+++ b/office/task/task.info
@@ -1,10 +1,10 @@
 PRGNAM="task"
-VERSION="2.5.1"
+VERSION="2.5.3"
 HOMEPAGE="http://www.taskwarrior.org"
-DOWNLOAD="https://taskwarrior.org/download/task-2.5.1.tar.gz"
-MD5SUM="bcd984a00d6d1eb6b40faf567419f784"
+DOWNLOAD="https://taskwarrior.org/download/task-2.5.3.tar.gz"
+MD5SUM="41fa2b61f4de729e867b185ceac0a1a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/taskjuggler/taskjuggler.SlackBuild b/office/taskjuggler/taskjuggler.SlackBuild
index 9621a82a0c..a2d89411ed 100644
--- a/office/taskjuggler/taskjuggler.SlackBuild
+++ b/office/taskjuggler/taskjuggler.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for taskjuggler
 
-# Copyright 2015-2020 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2015-2020 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/office/taskjuggler/taskjuggler.info b/office/taskjuggler/taskjuggler.info
index e1eb85ea27..633e382ec2 100644
--- a/office/taskjuggler/taskjuggler.info
+++ b/office/taskjuggler/taskjuggler.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-term-ansicolor rubygem-mail"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/taskopen/README b/office/taskopen/README
index 2d0a23f73e..1f1320ebf6 100644
--- a/office/taskopen/README
+++ b/office/taskopen/README
@@ -1 +1,6 @@
-Script for taking notes and open urls with taskwarrior
+Taskopen allows you to link almost any file, webpage or command
+to a taskwarrior task by adding a filepath, web-link or uri as an
+annotation. Text notes, images, PDF files, web addresses, spreadsheets and
+many other types of links can then be filtered, listed and opened by using
+taskopen. Some actions are sane defaults, others can be custom-configured,
+and everything else will use your systems mime-types to open the link.
diff --git a/office/taskopen/taskopen.SlackBuild b/office/taskopen/taskopen.SlackBuild
index 70541c62b0..2d2cb24b9e 100644
--- a/office/taskopen/taskopen.SlackBuild
+++ b/office/taskopen/taskopen.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for taskopen
 
-# Copyright 2017  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2021  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=taskopen
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/taskopen/taskopen.info b/office/taskopen/taskopen.info
index b3d6e7b45b..abbc667d5c 100644
--- a/office/taskopen/taskopen.info
+++ b/office/taskopen/taskopen.info
@@ -1,10 +1,10 @@
 PRGNAM="taskopen"
-VERSION="1.1.4"
+VERSION="1.1.5"
 HOMEPAGE="https://github.com/ValiValpas/taskopen"
-DOWNLOAD="https://github.com/ValiValpas/taskopen/archive/v1.1.4/taskopen-1.1.4.tar.gz"
-MD5SUM="30180c36eef119a5f9e62c1eea75ce3c"
+DOWNLOAD="https://github.com/ValiValpas/taskopen/archive/v1.1.5/taskopen-1.1.5.tar.gz"
+MD5SUM="78a6eb6b823af85c457fedff79417953"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-JSON"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/teapot/README b/office/teapot/README
index c53540a1cb..c9c1b0c735 100644
--- a/office/teapot/README
+++ b/office/teapot/README
@@ -1,11 +1,12 @@
-Teapot is a compact spreadsheet software originally written by Michael Haardt.
-It features a (n)curses-based text terminal interface, and recently also a
-FLTK-based GUI.
+Teapot is a compact spreadsheet software originally written by Michael
+Haardt.  It features a (n)curses-based text terminal interface, and
+recently also a FLTK-based GUI.
 
-Another interesting feature is its modern approach to spread sheet theory: It
-sports true three-dimensional tables and iterative expressions. And since it
-breaks compatibility with the usual notions of big spreadsheet packages, it
-can also throw old syntactic cruft over board which many spreadsheets still
-inherit from the days of VisiCalc on ancient CP/M systems.
+Another interesting feature is its modern approach to spread
+sheet theory: It sports true three-dimensional tables and iterative
+expressions. And since it breaks compatibility with the usual notions
+of big spreadsheet packages, it can also throw old syntactic cruft
+over board which many spreadsheets still inherit from the days of
+VisiCalc on ancient CP/M systems.
 
 Optional dependency: fltk
diff --git a/office/teapot/fix_fltk_build.diff b/office/teapot/fix_fltk_build.diff
new file mode 100644
index 0000000000..3f4e2e3ed4
--- /dev/null
+++ b/office/teapot/fix_fltk_build.diff
@@ -0,0 +1,41 @@
+diff -Naur teapot-2.3.0/CMakeLists.txt teapot-2.3.0.patched/CMakeLists.txt
+--- teapot-2.3.0/CMakeLists.txt	2020-11-19 00:18:02.217657446 -0500
++++ teapot-2.3.0.patched/CMakeLists.txt	2020-11-19 00:22:05.201635357 -0500
+@@ -40,7 +40,7 @@
+ 	install(TARGETS teapot DESTINATION bin)
+ endif ()
+ 
+-find_package(FLTK NO_MODULE)
++find_package(FLTK)
+ if (FLTK_FOUND)
+ 	include("${FLTK_USE_FILE}")
+ 
+@@ -52,13 +52,13 @@
+ 		if (ENABLE_STATIC)
+ 			target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR})
+ 		else ()
+-			target_link_libraries(fteapot teapotlib fltk_SHARED fltk_images_SHARED ${LIB_PORTABLEXDR})
++			target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR})
+ 		endif ()
+ 	else ()
+ 		if (ENABLE_STATIC)
+ 			target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR})
+ 		else ()
+-			target_link_libraries(fteapot teapotlib fltk_SHARED ${LIB_PORTABLEXDR})
++			target_link_libraries(fteapot teapotlib fltk fltk_images ${LIB_PORTABLEXDR})
+ 		endif ()
+ 	endif ()
+ 	install(TARGETS fteapot DESTINATION bin)
+diff -Naur teapot-2.3.0/fteapot.fl teapot-2.3.0.patched/fteapot.fl
+--- teapot-2.3.0/fteapot.fl	2020-11-19 00:15:47.506669691 -0500
++++ teapot-2.3.0.patched/fteapot.fl	2020-11-19 00:16:05.569668049 -0500
+@@ -11,6 +11,9 @@
+ decl {\#include <fcntl.h>} {private global
+ }
+ 
++decl {\#include <unistd.h>} {private global
++}
++
+ decl {\#define shadow _shadow} {private global
+ }
+ 
diff --git a/office/teapot/fix_mbslen_warning.diff b/office/teapot/fix_mbslen_warning.diff
new file mode 100644
index 0000000000..47b3539b8c
--- /dev/null
+++ b/office/teapot/fix_mbslen_warning.diff
@@ -0,0 +1,11 @@
+diff -Naur teapot-2.3.0/scanner.c teapot-2.3.0.patched/scanner.c
+--- teapot-2.3.0/scanner.c	2012-02-06 06:30:53.000000000 -0500
++++ teapot-2.3.0.patched/scanner.c	2020-11-19 00:24:24.289622714 -0500
+@@ -25,6 +25,7 @@
+ #include "main.h"
+ #include "misc.h"
+ #include "scanner.h"
++#include "utf8.h"
+ /*}}}*/
+ 
+ /* identcode  -- return number of identifier */ /*{{{*/
diff --git a/office/teapot/teapot.SlackBuild b/office/teapot/teapot.SlackBuild
index 85d8f4e7d6..8eb69bb072 100644
--- a/office/teapot/teapot.SlackBuild
+++ b/office/teapot/teapot.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for teapot
 
-# Copyright 2016 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201122 bkw: Grr. Forgot to git add the diffs.
+# 20201119 bkw: modified by SlackBuilds.org:
+# - BUILD=2.
+# - Fix fltk builds.
+# - Shut up a compiler warning.
+# - Restore original homepage/download, since the site is back up.
+# - Fix README to comply with 72-column limit.
+# - Fix doubleplus ungood refs undirectory /usr/share/doc in man page.
+# - Since the man page says there's a manual, actually install the
+#   manual as part of the package. To avoid a dependency on lyx (and
+#   consequently qt5!), pull the prebuilt docs out of upstream's
+#   binary package.
+
 PRGNAM=teapot
 VERSION=${VERSION:-2.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,6 +75,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+# Extract *only* the docs from the binary package:
+tar xvf $CWD/Teapot-$VERSION-Linux-i386.tar.gz --wildcards '*/share/doc/*'
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,6 +84,17 @@ 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 {} \;
 
+# 20201119 bkw: README says fltk is an optional dep, but it wasn't
+# being picked up by cmake.
+patch -p1 < $CWD/fix_fltk_build.diff
+
+# 20201119 bkw: While we're in a patching state of mind, fix a
+# compiler warning.
+patch -p1 < $CWD/fix_mbslen_warning.diff
+
+# 20201119 bkw: No such thing as /usr/share/doc/teapot.
+sed -i "s,/usr/share/doc/$PRGNAM,/usr/doc/$PRGNAM-$VERSION,g" $PRGNAM.1
+
 mkdir -p build
 cd build
   cmake \
@@ -90,9 +116,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 rm -rf $PKG/usr/share
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20201119 bkw: Install the PDF and HTML docs.
+cd Teapot-$VERSION-Linux/share/doc/$PRGNAM
+mv html *.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/office/teapot/teapot.info b/office/teapot/teapot.info
index fc3da8e61d..3753609c61 100644
--- a/office/teapot/teapot.info
+++ b/office/teapot/teapot.info
@@ -1,10 +1,12 @@
 PRGNAM="teapot"
 VERSION="2.3.0"
-HOMEPAGE="https://web.archive.org/web/20171230003025/http://www.syntax-k.de/projekte/teapot/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/teapot-2.3.0.tar.gz"
-MD5SUM="ae59f90a5f70971703abccf0991dbd58"
+HOMEPAGE="https://www.syntax-k.de/projekte/teapot/"
+DOWNLOAD="https://www.syntax-k.de/projekte/teapot/teapot-2.3.0.tar.gz \
+          https://www.syntax-k.de/projekte/teapot/Teapot-2.3.0-Linux-i386.tar.gz"
+MD5SUM="ae59f90a5f70971703abccf0991dbd58 \
+        17ecda70a8478043e4a8b622e178bc55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/texmacs/texmacs.SlackBuild b/office/texmacs/texmacs.SlackBuild
index 2309845211..f8991c36b1 100644
--- a/office/texmacs/texmacs.SlackBuild
+++ b/office/texmacs/texmacs.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texmacs
-VERSION=${VERSION:-1.99.13}
+VERSION=${VERSION:-1.99.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
+rm -rf $SRCNAM-$VERSION-src
 tar xvf $CWD/$SRCNAM-$VERSION-src.tar.gz
-cd $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION-src
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/office/texmacs/texmacs.info b/office/texmacs/texmacs.info
index 6f3a504f8b..34499bcafc 100644
--- a/office/texmacs/texmacs.info
+++ b/office/texmacs/texmacs.info
@@ -1,8 +1,8 @@
 PRGNAM="texmacs"
-VERSION="1.99.13"
+VERSION="1.99.17"
 HOMEPAGE="http://www.texmacs.org"
-DOWNLOAD="https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.99.13-src.tar.gz"
-MD5SUM="960313d2acef78038082cf1463f5a32e"
+DOWNLOAD="https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.99.17-src.tar.gz"
+MD5SUM="d04afa1984339e6db7872ea82e13370c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="guile1.8"
diff --git a/office/timetrap/timetrap.SlackBuild b/office/timetrap/timetrap.SlackBuild
index 3751674657..eec7389ba8 100644
--- a/office/timetrap/timetrap.SlackBuild
+++ b/office/timetrap/timetrap.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for timetrap
 
-# Copyright 2013-2016 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2013-2021 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=timetrap
-VERSION=${VERSION:-1.15.1}
+VERSION=${VERSION:-1.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/timetrap/timetrap.info b/office/timetrap/timetrap.info
index 0a31d07137..2541e17922 100644
--- a/office/timetrap/timetrap.info
+++ b/office/timetrap/timetrap.info
@@ -1,10 +1,10 @@
 PRGNAM="timetrap"
-VERSION="1.15.1"
+VERSION="1.15.2"
 HOMEPAGE="https://github.com/samg/timetrap"
-DOWNLOAD="http://rubygems.org/downloads/timetrap-1.15.1.gem"
-MD5SUM="9774a155ed5a6f454739e397929b51dd"
+DOWNLOAD="http://rubygems.org/downloads/timetrap-1.15.2.gem"
+MD5SUM="c7c84dc593201b1764268ca46dc06c2c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="sequel4 sqlite3 chronic"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/tnote/tnote.SlackBuild b/office/tnote/tnote.SlackBuild
index bda3da73ed..f653f6f51e 100644
--- a/office/tnote/tnote.SlackBuild
+++ b/office/tnote/tnote.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tnote
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 
 PRGNAM=tnote
diff --git a/office/tnote/tnote.info b/office/tnote/tnote.info
index 31b030c351..006934824a 100644
--- a/office/tnote/tnote.info
+++ b/office/tnote/tnote.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/todo.txt-cli/README b/office/todo.txt-cli/README
new file mode 100644
index 0000000000..5dbb331bc2
--- /dev/null
+++ b/office/todo.txt-cli/README
@@ -0,0 +1,13 @@
+A simple and extensible shell script for managing your todo.txt file.
+
+After installing the package, copy the default config file to your home
+directory and adjust it accordingly, otherwise todo.txt-cli will
+misbehave:
+
+$ mkdir ~/.todo
+$ cp /etc/todo.cfg ~/.todo/config
+$ mkdir ~/todo
+
+Then edit ~/.todo/config:
+
+export TODO_DIR=/home/$USER/todo
diff --git a/office/todo.txt-cli/slack-desc b/office/todo.txt-cli/slack-desc
new file mode 100644
index 0000000000..ca569b6708
--- /dev/null
+++ b/office/todo.txt-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+todo.txt-cli: todo.txt-cli (CLI frontend for todo.txt)
+todo.txt-cli:
+todo.txt-cli: A simple and extensible shell script for managing your todo.txt file.
+todo.txt-cli:
+todo.txt-cli:
+todo.txt-cli:
+todo.txt-cli:
+todo.txt-cli:
+todo.txt-cli:
+todo.txt-cli:
+todo.txt-cli:
diff --git a/office/todo.txt-cli/todo.txt-cli.SlackBuild b/office/todo.txt-cli/todo.txt-cli.SlackBuild
new file mode 100644
index 0000000000..84b762ba9b
--- /dev/null
+++ b/office/todo.txt-cli/todo.txt-cli.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for todo.txt-cli
+
+# Copyright 2021 toolonely <lonely_@tutanota.com>
+# 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=todo.txt-cli
+VERSION=${VERSION:-2.12.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+install -D -m 0644 todo.cfg $PKG/etc/todo.cfg
+install -D -m 0755 todo.sh $PKG/usr/bin/todo.sh
+install -D -m 0644 todo_completion $PKG/usr/share/bash-completion/completions/todo_completion
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG.md LICENSE README.md USAGE.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/todo.txt-cli/todo.txt-cli.info b/office/todo.txt-cli/todo.txt-cli.info
new file mode 100644
index 0000000000..aafacea2f3
--- /dev/null
+++ b/office/todo.txt-cli/todo.txt-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="todo.txt-cli"
+VERSION="2.12.0"
+HOMEPAGE="https://github.com/todotxt/todo.txt-cli/"
+DOWNLOAD="https://github.com/todotxt/todo.txt-cli/archive/v2.12.0/todo.txt-cli-2.12.0.tar.gz"
+MD5SUM="e8d4edd8214b0d1df68667caa449a28c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/office/tpp/tpp.SlackBuild b/office/tpp/tpp.SlackBuild
index ca39ac7d10..b7daafc0cf 100644
--- a/office/tpp/tpp.SlackBuild
+++ b/office/tpp/tpp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tpp
 
-# Copyright 2016  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/office/tpp/tpp.info b/office/tpp/tpp.info
index e37db1ec65..1802c0e903 100644
--- a/office/tpp/tpp.info
+++ b/office/tpp/tpp.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ncurses-ruby"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/trello-cli/README b/office/trello-cli/README
new file mode 100644
index 0000000000..1b35c117da
--- /dev/null
+++ b/office/trello-cli/README
@@ -0,0 +1 @@
+trello-cli is a CLI tool for [Trello]
diff --git a/office/trello-cli/slack-desc b/office/trello-cli/slack-desc
new file mode 100644
index 0000000000..1263125f61
--- /dev/null
+++ b/office/trello-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+trello-cli: trello-cli (cli tool for trello)
+trello-cli:
+trello-cli:
+trello-cli: trello-cli is a CLI tool for Trello
+trello-cli:
+trello-cli:
+trello-cli:
+trello-cli:
+trello-cli:
+trello-cli:
+trello-cli:
diff --git a/office/trello-cli/trello-cli.SlackBuild b/office/trello-cli/trello-cli.SlackBuild
new file mode 100644
index 0000000000..28ac7ca532
--- /dev/null
+++ b/office/trello-cli/trello-cli.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for trello-cli
+
+# Copyright 2020 Tonus
+# 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=trello-cli
+VERSION=${VERSION:-0.3.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+DESTDIR=$PKG npm install -g $CWD/$PRGNAM-$VERSION.tar.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/trello-cli/trello-cli.info b/office/trello-cli/trello-cli.info
new file mode 100644
index 0000000000..de6fc99a45
--- /dev/null
+++ b/office/trello-cli/trello-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="trello-cli"
+VERSION="0.3.2"
+HOMEPAGE="https://github.com/mheap/trello-cli/"
+DOWNLOAD="https://github.com/mheap/trello-cli/archive/v0.3.2/trello-cli-0.3.2.tar.gz"
+MD5SUM="9e64954b61533d03f8184eddce836145"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Tonus"
+EMAIL="tonus1@gmail.com"
diff --git a/office/tudu/tudu.SlackBuild b/office/tudu/tudu.SlackBuild
index 947b42762a..93a828683c 100644
--- a/office/tudu/tudu.SlackBuild
+++ b/office/tudu/tudu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tudu
 
-# Copyright 2016 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/office/tudu/tudu.info b/office/tudu/tudu.info
index 6441844fc8..cfeaa7bedb 100644
--- a/office/tudu/tudu.info
+++ b/office/tudu/tudu.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/uncsv/README b/office/uncsv/README
new file mode 100644
index 0000000000..ae0a234860
--- /dev/null
+++ b/office/uncsv/README
@@ -0,0 +1,11 @@
+uncsv (convert to or from CSV streams)
+
+uncsv is a filter command converting the lines of a CSV file into
+non-escaped, non-quoted delimited file (pipe by default). This program
+will error out if it encounters a character matching the delimiter, it
+will also replace the carriage return and new-line characters found in
+quoted values allowing you to use awk to play with your CSVs.
+
+csv is the opposite of this command. It takes an unquoted stream of
+values, separated by the delimiter of your choice (default: pipe '|')
+and produces a "standard" CSV file.
diff --git a/office/uncsv/slack-desc b/office/uncsv/slack-desc
new file mode 100644
index 0000000000..f53a93d44b
--- /dev/null
+++ b/office/uncsv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+uncsv: uncsv (convert to or from CSV streams)
+uncsv:
+uncsv: uncsv is a filter command converting the lines of a CSV file into
+uncsv: non-escaped, non-quoted delimited file (pipe by default). This program
+uncsv: will error out if it encounters a character matching the delimiter, it
+uncsv: will also replace the carriage return and new-line characters found in
+uncsv: quoted values allowing you to use awk to play with your CSVs.
+uncsv:
+uncsv: csv is the opposite of this command. It takes an unquoted stream of
+uncsv: values, separated by the delimiter of your choice (default: pipe '|')
+uncsv: and produces a "standard" CSV file.
diff --git a/office/uncsv/uncsv.SlackBuild b/office/uncsv/uncsv.SlackBuild
new file mode 100644
index 0000000000..d78743520b
--- /dev/null
+++ b/office/uncsv/uncsv.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Slackware build script for uncsv
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=uncsv
+VERSION=${VERSION:-0.9.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+sed -i "s|-O2|$SLKCFLAGS|" configure
+
+# NOT a standard autoconf configure script, doesn't take all args.
+./configure
+make PREFIX=/usr LDFLAGS=-s
+make PREFIX=$PKG/usr MANDEST=man install
+
+# same man page gets installed under 2 names
+rm -f $PKG/usr/man/man1/csv.1
+gzip -9 $PKG/usr/man/man?/*.?
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/csv.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog* LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/uncsv/uncsv.info b/office/uncsv/uncsv.info
new file mode 100644
index 0000000000..c940515871
--- /dev/null
+++ b/office/uncsv/uncsv.info
@@ -0,0 +1,10 @@
+PRGNAM="uncsv"
+VERSION="0.9.1"
+HOMEPAGE="https://tamentis.com/projects/uncsv/"
+DOWNLOAD="https://tamentis.com/projects/uncsv/files/uncsv-0.9.1.tar.gz"
+MD5SUM="35e68764e9933754a70ebc233e42c07f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/office/watson/watson.SlackBuild b/office/watson/watson.SlackBuild
index 73b817e3f6..189bc9072a 100644
--- a/office/watson/watson.SlackBuild
+++ b/office/watson/watson.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for watson
 
-# Copyright 2017-2019  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2019  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 PRGNAM=watson
 SRCNAM=Watson
diff --git a/office/watson/watson.info b/office/watson/watson.info
index 11d8ab6907..e710e56d13 100644
--- a/office/watson/watson.info
+++ b/office/watson/watson.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="arrow click"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/office/wps-office/wps-office.SlackBuild b/office/wps-office/wps-office.SlackBuild
index 2debdcc9d9..878b6f3996 100644
--- a/office/wps-office/wps-office.SlackBuild
+++ b/office/wps-office/wps-office.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wps-office
-VERSION=${VERSION:-11.1.0.9126.XA}
+VERSION=${VERSION:-11.1.0.9719.XA}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/wps-office/wps-office.info b/office/wps-office/wps-office.info
index acb66d42dd..c4ac2d04b9 100644
--- a/office/wps-office/wps-office.info
+++ b/office/wps-office/wps-office.info
@@ -1,10 +1,10 @@
 PRGNAM="wps-office"
-VERSION="11.1.0.9126.XA"
+VERSION="11.1.0.9719.XA"
 HOMEPAGE="https://linux.wps.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9126/wps-office_11.1.0.9126.XA_amd64.deb"
-MD5SUM_x86_64="960a4ceedaa5ad568b0a471190f1ab1c"
+DOWNLOAD_x86_64="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/wps-office_11.1.0.9719.XA_amd64.deb"
+MD5SUM_x86_64="d53605b66a112f549ab87565547c0117"
 REQUIRES=""
 MAINTAINER="Andre Fernando"
 EMAIL="ando344@gmail.com"
diff --git a/office/x_x/README b/office/x_x/README
new file mode 100644
index 0000000000..847f2f0e6f
--- /dev/null
+++ b/office/x_x/README
@@ -0,0 +1,12 @@
+x_x (view Excel or CSV files in the terminal)
+
+x_x (The Dead Guy CLI) is a command line reader that displays either
+Excel files or CSVs in your terminal. The purpose of this is to not
+break the workflow of people who live on the command line and need to
+access a spreadsheet generated using Microsoft Excel.
+
+By default, x_x is built for python2. If you have python3 installed
+and would prefer to use it, run the script with 'export PYVER=3' in
+the environment. There's apparently no functional difference in x_x
+between the python 2 and 3 builds, although the python2 version emits
+warnings about unicode_literals.
diff --git a/office/x_x/git2tarxz.sh b/office/x_x/git2tarxz.sh
new file mode 100644
index 0000000000..3fc5993f69
--- /dev/null
+++ b/office/x_x/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=x_x
+CLONE_URL=https://github.com/krockode/x_x
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/office/x_x/slack-desc b/office/x_x/slack-desc
new file mode 100644
index 0000000000..233f66cba1
--- /dev/null
+++ b/office/x_x/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+x_x: x_x (view Excel or CSV files in the terminal)
+x_x:
+x_x: x_x (The Dead Guy CLI) is a command line reader that displays either
+x_x: Excel files or CSVs in your terminal. The purpose of this is to not
+x_x: break the workflow of people who live on the command line and need to
+x_x: access a spreadsheet generated using Microsoft Excel.
+x_x:
+x_x:
+x_x:
+x_x:
+x_x:
diff --git a/office/x_x/x_x.1 b/office/x_x/x_x.1
new file mode 100644
index 0000000000..fb7529c462
--- /dev/null
+++ b/office/x_x/x_x.1
@@ -0,0 +1,184 @@
+.\" Man page generated from reStructuredText.
+.
+.TH X_X 1 "2020-11-15" "20150330_d236f8f" "SlackBuilds.org"
+.SH NAME
+x_x \- display Excel and CSV files on a terminal
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for x_x(1) man page. Convert with:
+.
+.\" rst2man.py x_x.rst > x_x.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.\" converting from pod:
+.
+.\" s/B<\([^>]*\)>/**\1**/g
+.
+.\" s/I<\([^>]*\)>/*\1*/g
+.
+.SH SYNOPSIS
+.sp
+x_x [\fB\-h\fP \fIrow\fP] [\fB\-f\fP \fIcsv|excel\fP] [\fB\-d\fP \fIdelimiter\fP] [\fB\-q\fP \fIquotechar\fP] [\fB\-e\fP \fIencoding\fP]
+.SH DESCRIPTION
+.sp
+x_x (the Dead Guy CLI) is a command line reader that displays either
+Excel files or CSVs in your terminal. The purpose of this is to not
+break the workflow of people who live on the command line and need to
+access a spreadsheet generated using Microsoft Excel.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \fB\-h\fP, \fB\-\-heading\fP \fIrow\fP
+Row number containing the headings (default: none). Note: the first row is
+numbered 0, not 1!
+.TP
+.B \fB\-f\fP, \fB\-\-file\-type\fP \fIcsv|excel\fP
+Override autodetection of input file type.
+.TP
+.B \fB\-d\fP, \fB\-\-delimiter\fP \fIcharacter\fP
+Delimiter (only applicable to CSV files) [default: \(aq,\(aq].
+.TP
+.B \fB\-q\fP, \fB\-\-quotechar\fP
+Quote character (only applicable to CSV files) [default: \(aq"\(aq].
+.TP
+.B \fB\-e\fP, \fB\-\-encoding\fP \fIencoding\fP
+Encoding [default: UTF\-8].
+.TP
+.B \fB\-\-version\fP
+Show the version and exit.
+.TP
+.B \fB\-\-help\fP
+Show built\-in help and exit.
+.UNINDENT
+.SH EXAMPLES
+.sp
+So, for example:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ x_x dead_guys.xlsx
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| A             | B            |
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| Person        | Age at Death |
+| Harrold Holt  | 59.0         |
+| Harry Houdini | 52.0         |
+| Howard Hughes | 70.0         |
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Or to specify a specific row as the header which will be visible on each page:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ x_x \-h 0 dead_guys.xlsx
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| Person        | Age at Death |
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| Harrold Holt  | 59.0         |
+| Harry Houdini | 52.0         |
+| Howard Hughes | 70.0         |
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Weird CSVs? No problem!
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ cat dead_guys.csv
+person;age_at_death
+Harrold Holt;59
+Harry Houdini;52
+Howard Hughes;70
+|Not some guy, but just a string with ; in it|;0
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ x_x \-h 0 \-\-delimiter=\(aq;\(aq \-\-quotechar=\(aq|\(aq dead_guys.csv
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| person                                       | age_at_death |
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| Harrold Holt                                 | 59           |
+| Harry Houdini                                | 52           |
+| Howard Hughes                                | 70           |
+| Not some guy, but just a string with ; in it | 0            |
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Does your CSV file not end in "csv"? Again, no problem:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ mv dead_guys.csv dead_guys.some_other_extension
+$ x_x \-h 0 \-\-file\-type=csv \-\-delimiter=\(aq;\(aq \-\-quotechar=\(aq|\(aq dead_guys.some_other_extension
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| person                                       | age_at_death |
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+| Harrold Holt                                 | 59           |
+| Harry Houdini                                | 52           |
+| Howard Hughes                                | 70           |
+| Not some guy, but just a string with ; in it | 0            |
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/x_x\-20150330_d236f8f/LICENSE for license information.
+.SH AUTHORS
+.sp
+x_x was written by krockode.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The x_x homepage: \fI\%https://github.com/krockode/x_x\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/office/x_x/x_x.SlackBuild b/office/x_x/x_x.SlackBuild
new file mode 100644
index 0000000000..9d1079939b
--- /dev/null
+++ b/office/x_x/x_x.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for x_x
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=x_x
+VERSION=${VERSION:-20150330_d236f8f}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20201115 bkw: at some point, Slackware's /usr/bin/python will be python3.
+# This stuff can go away then.
+case "${PYVER:-auto}" in
+  2|3)  ;; # use as-is
+  auto) PYVER=2; python3 -c 'import sys' 2>/dev/null && PYVER=3 ;;
+esac
+
+python$PYVER setup.py install --root=$PKG
+
+# man page manually converted from README.rst by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/x_x/x_x.info b/office/x_x/x_x.info
new file mode 100644
index 0000000000..44ad3a8e67
--- /dev/null
+++ b/office/x_x/x_x.info
@@ -0,0 +1,10 @@
+PRGNAM="x_x"
+VERSION="20150330_d236f8f"
+HOMEPAGE="https://github.com/krockode/x_x"
+DOWNLOAD="https://slackware.uk/~urchlay/src/x_x-20150330_d236f8f.tar.xz"
+MD5SUM="ebde396990ac5197e59f658eafdecb76"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="six click python-xlrd python-unicodecsv"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/office/x_x/x_x.rst b/office/x_x/x_x.rst
new file mode 100644
index 0000000000..8ff6e18a9b
--- /dev/null
+++ b/office/x_x/x_x.rst
@@ -0,0 +1,143 @@
+.. RST source for x_x(1) man page. Convert with:
+..   rst2man.py x_x.rst > x_x.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20150330_d236f8f
+.. |date| date::
+
+.. converting from pod:
+.. s/B<\([^>]*\)>/**\1**/g
+.. s/I<\([^>]*\)>/*\1*/g
+
+===
+x_x
+===
+
+-----------------------------------------
+display Excel and CSV files on a terminal
+-----------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+x_x [**-h** *row*] [**-f** *csv|excel*] [**-d** *delimiter*] [**-q** *quotechar*] [**-e** *encoding*]
+
+DESCRIPTION
+===========
+
+x_x (the Dead Guy CLI) is a command line reader that displays either
+Excel files or CSVs in your terminal. The purpose of this is to not
+break the workflow of people who live on the command line and need to
+access a spreadsheet generated using Microsoft Excel.
+
+OPTIONS
+=======
+
+**-h**, **--heading** *row*
+  Row number containing the headings (default: none). Note: the first row is
+  numbered 0, not 1!
+
+**-f**, **--file-type** *csv|excel*
+  Override autodetection of input file type.
+
+**-d**, **--delimiter** *character*
+  Delimiter (only applicable to CSV files) [default: ','].
+
+**-q**, **--quotechar**
+  Quote character (only applicable to CSV files) [default: '"'].
+
+**-e**, **--encoding** *encoding*
+  Encoding [default: UTF-8].
+
+**--version**
+  Show the version and exit.
+
+**--help**
+  Show built-in help and exit.
+
+EXAMPLES
+========
+
+So, for example:
+
+::
+
+  $ x_x dead_guys.xlsx
+  +---------------+--------------+
+  | A             | B            |
+  +---------------+--------------+
+  | Person        | Age at Death |
+  | Harrold Holt  | 59.0         |
+  | Harry Houdini | 52.0         |
+  | Howard Hughes | 70.0         |
+
+Or to specify a specific row as the header which will be visible on each page:
+
+::
+
+  $ x_x -h 0 dead_guys.xlsx
+  +---------------+--------------+
+  | Person        | Age at Death |
+  +---------------+--------------+
+  | Harrold Holt  | 59.0         |
+  | Harry Houdini | 52.0         |
+  | Howard Hughes | 70.0         |
+
+Weird CSVs? No problem!
+
+::
+
+    $ cat dead_guys.csv
+    person;age_at_death
+    Harrold Holt;59
+    Harry Houdini;52
+    Howard Hughes;70
+    |Not some guy, but just a string with ; in it|;0
+
+::
+
+    $ x_x -h 0 --delimiter=';' --quotechar='|' dead_guys.csv
+    +----------------------------------------------+--------------+
+    | person                                       | age_at_death |
+    +----------------------------------------------+--------------+
+    | Harrold Holt                                 | 59           |
+    | Harry Houdini                                | 52           |
+    | Howard Hughes                                | 70           |
+    | Not some guy, but just a string with ; in it | 0            |
+
+Does your CSV file not end in "csv"? Again, no problem:
+
+::
+
+    $ mv dead_guys.csv dead_guys.some_other_extension
+    $ x_x -h 0 --file-type=csv --delimiter=';' --quotechar='|' dead_guys.some_other_extension
+    +----------------------------------------------+--------------+
+    | person                                       | age_at_death |
+    +----------------------------------------------+--------------+
+    | Harrold Holt                                 | 59           |
+    | Harry Houdini                                | 52           |
+    | Howard Hughes                                | 70           |
+    | Not some guy, but just a string with ; in it | 0            |
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/x_x-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+x_x was written by krockode.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The x_x homepage: https://github.com/krockode/x_x
diff --git a/office/xournalpp/xournalpp.SlackBuild b/office/xournalpp/xournalpp.SlackBuild
index 3b4cd9f6b0..c53c6c6626 100644
--- a/office/xournalpp/xournalpp.SlackBuild
+++ b/office/xournalpp/xournalpp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xournalpp
-VERSION=${VERSION:-1.0.18}
+VERSION=${VERSION:-1.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/xournalpp/xournalpp.info b/office/xournalpp/xournalpp.info
index dd0ef60647..912713d561 100644
--- a/office/xournalpp/xournalpp.info
+++ b/office/xournalpp/xournalpp.info
@@ -1,8 +1,8 @@
 PRGNAM="xournalpp"
-VERSION="1.0.18"
+VERSION="1.0.20"
 HOMEPAGE="https://github.com/xournalpp/xournalpp"
-DOWNLOAD="https://github.com/xournalpp/xournalpp/archive/1.0.18/xournalpp-1.0.18.tar.gz"
-MD5SUM="869189e78eac754860bee97611abe541"
+DOWNLOAD="https://github.com/xournalpp/xournalpp/archive/1.0.20/xournalpp-1.0.20.tar.gz"
+MD5SUM="88376d2584dda7ba9c46733b706139bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="graphviz lua portaudio"
diff --git a/office/zim/README.Plugins b/office/zim/README.Plugins
deleted file mode 100644
index c372fc051a..0000000000
--- a/office/zim/README.Plugins
+++ /dev/null
@@ -1,10 +0,0 @@
-This file lists Zim plugins that require optional dependencies to
-function.  Plugins that work out of the box with Slackware are not
-listed.  Plugins that require a dependency unavailable from
-SlackBuilds.org are not listed either.
-
-* Insert Diagram: Graphviz
-* Insert Score: lilypond
-* Link Map: Graphviz
-* Source View: pygtksourceview
-* Spell Checker: pygtkspell
diff --git a/office/zim/zim.SlackBuild b/office/zim/zim.SlackBuild
index d02f14f191..ef669825e0 100644
--- a/office/zim/zim.SlackBuild
+++ b/office/zim/zim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for zim
 
-# Copyright 2019-2020 Andrew Payne <phalange@komputermatrix.com>
+# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2015-2017 Brenton Earl <brent@exitstatusone.com>
 # Copyright 2013 Michael Ren <micron33@gmail.com>
 # All rights reserved.
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zim
-VERSION=${VERSION:-0.73.2}
+VERSION=${VERSION:-0.73.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/zim/zim.info b/office/zim/zim.info
index f50851290a..1fc455a0c7 100644
--- a/office/zim/zim.info
+++ b/office/zim/zim.info
@@ -1,10 +1,10 @@
 PRGNAM="zim"
-VERSION="0.73.2"
+VERSION="0.73.5"
 HOMEPAGE="http://zim-wiki.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://zim-wiki.org/downloads/zim-0.73.2.tar.gz"
-MD5SUM_x86_64="36709453c4b1858bce30e2b3a705ef3d"
+DOWNLOAD_x86_64="https://zim-wiki.org/downloads/zim-0.73.5.tar.gz"
+MD5SUM_x86_64="fa76ceb8ac7d7354fb0e2bc5607e9faa"
 REQUIRES="pygobject3-python3"
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/perl/MoarVM/MoarVM.SlackBuild b/perl/MoarVM/MoarVM.SlackBuild
index e86718374d..c8ac7a7c3c 100644
--- a/perl/MoarVM/MoarVM.SlackBuild
+++ b/perl/MoarVM/MoarVM.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for MoarVM
 
+# Copyright 2020- Michel Begue <mab974@gmail.com>
 # Copyright 2018-2020 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=MoarVM
-VERSION=${VERSION:-2020.09}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/MoarVM/MoarVM.info b/perl/MoarVM/MoarVM.info
index cbfd5ec42c..d0f99d6a71 100644
--- a/perl/MoarVM/MoarVM.info
+++ b/perl/MoarVM/MoarVM.info
@@ -1,10 +1,10 @@
 PRGNAM="MoarVM"
-VERSION="2020.09"
+VERSION="2021.03"
 HOMEPAGE="https://moarvm.org/"
-DOWNLOAD="https://moarvm.org/releases/MoarVM-2020.09.tar.gz"
-MD5SUM="0134981fb0b5318ae7c27b4ff88cbb88"
+DOWNLOAD="https://moarvm.org/releases/MoarVM-2021.03.tar.gz"
+MD5SUM="6356797ffb300acb74abe46ab8576df9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libtommath libuv"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/perl/nqp/nqp.SlackBuild b/perl/nqp/nqp.SlackBuild
index 3634782d6a..dd36d05e47 100644
--- a/perl/nqp/nqp.SlackBuild
+++ b/perl/nqp/nqp.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for nqp
 
+# Copyright 2020- Michel Begue <mab974@gmail.com>
 # Copyright 2018-2020 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=nqp
-VERSION=${VERSION:-2020.09}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/nqp/nqp.info b/perl/nqp/nqp.info
index 379c4230a5..b4b8435c7f 100644
--- a/perl/nqp/nqp.info
+++ b/perl/nqp/nqp.info
@@ -1,10 +1,10 @@
 PRGNAM="nqp"
-VERSION="2020.09"
+VERSION="2021.03"
 HOMEPAGE="https://rakudo.org"
-DOWNLOAD="https://github.com/Raku/nqp/releases/download/2020.09/nqp-2020.09.tar.gz"
-MD5SUM="4e14d34e95bd2117860ba26492b2da7d"
+DOWNLOAD="https://github.com/Raku/nqp/releases/download/2021.03/nqp-2021.03.tar.gz"
+MD5SUM="da691c02a904f960c8b1cedb7a96da8a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="MoarVM"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/perl/perl-Archive-Extract/perl-Archive-Extract.info b/perl/perl-Archive-Extract/perl-Archive-Extract.info
index 1c3edc4479..0afda6717b 100644
--- a/perl/perl-Archive-Extract/perl-Archive-Extract.info
+++ b/perl/perl-Archive-Extract/perl-Archive-Extract.info
@@ -6,5 +6,5 @@ MD5SUM="f586017fb17bec26b56c7ff7ea0307fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/perl/perl-CPANPLUS-Dist-Build/perl-CPANPLUS-Dist-Build.info b/perl/perl-CPANPLUS-Dist-Build/perl-CPANPLUS-Dist-Build.info
index cf7ff09478..01880237ec 100644
--- a/perl/perl-CPANPLUS-Dist-Build/perl-CPANPLUS-Dist-Build.info
+++ b/perl/perl-CPANPLUS-Dist-Build/perl-CPANPLUS-Dist-Build.info
@@ -6,5 +6,5 @@ MD5SUM="1fbf2c087bbe10a4c1536b415e45c960"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-CPANPLUS perl-Module-Build"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
index 6ac3025a95..7ea4320a3f 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
+++ b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
@@ -6,5 +6,5 @@ MD5SUM="9b9f82c2f98cf7193f22a692b71cd737"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fakeroot perl-CPANPLUS perl-CPANPLUS-Dist-Build perl-Module-Pluggable"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild b/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild
index 6555507a07..2ca2a30a22 100644
--- a/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild
+++ b/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-CPANPLUS
-VERSION=${VERSION:-0.9908}
+VERSION=${VERSION:-0.9910}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-CPANPLUS/perl-CPANPLUS.info b/perl/perl-CPANPLUS/perl-CPANPLUS.info
index de0620c1fe..bc68bc01be 100644
--- a/perl/perl-CPANPLUS/perl-CPANPLUS.info
+++ b/perl/perl-CPANPLUS/perl-CPANPLUS.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-CPANPLUS"
-VERSION="0.9908"
+VERSION="0.9910"
 HOMEPAGE="https://metacpan.org/pod/CPANPLUS"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz"
-MD5SUM="a6d9b7ccd29ff1ecb987d3ecdf31f1bd"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/CPANPLUS-0.9910.tar.gz"
+MD5SUM="2f80c70ca7464083c22351a401d55f69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Archive-Extract perl-DBD-SQLite perl-DBIx-Simple perl-Log-Message perl-Module-Pluggable perl-Object-Accessor perl-Package-Constants perl-Term-ReadLine-Gnu perl-Term-UI"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/perl/perl-Cairo-GObject/perl-Cairo-GObject.SlackBuild b/perl/perl-Cairo-GObject/perl-Cairo-GObject.SlackBuild
index d75924fd40..6604ac2b9b 100644
--- a/perl/perl-Cairo-GObject/perl-Cairo-GObject.SlackBuild
+++ b/perl/perl-Cairo-GObject/perl-Cairo-GObject.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Cairo-GObject
-VERSION=${VERSION:-1.004}
+VERSION=${VERSION:-1.005}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Cairo-GObject/perl-Cairo-GObject.info b/perl/perl-Cairo-GObject/perl-Cairo-GObject.info
index 9d68ce7b28..e57820373f 100644
--- a/perl/perl-Cairo-GObject/perl-Cairo-GObject.info
+++ b/perl/perl-Cairo-GObject/perl-Cairo-GObject.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Cairo-GObject"
-VERSION="1.004"
+VERSION="1.005"
 HOMEPAGE="https://metacpan.org/pod/Cairo::GObject"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Cairo-GObject-1.004.tar.gz"
-MD5SUM="cf8767c05a6797783e666db839d5d97a"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz"
+MD5SUM="a58c749a7d1bc6920499be0ac2dc7ee8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-glib perl-cairo"
diff --git a/perl/perl-Coro/README b/perl/perl-Coro/README
index 829b494763..22b7805e1e 100644
--- a/perl/perl-Coro/README
+++ b/perl/perl-Coro/README
@@ -1,29 +1,29 @@
-This module collection manages continuations in general, most often in 
+This module collection manages continuations in general, most often in
 the form of cooperative threads (also called coros, or simply "coro" in
 the documentation). They are similar to kernel threads but don't (in
 general) run in parallel at the same time even on SMP machines. The
 specific flavor of thread offered by this module also guarantees you
 that it will not switch between threads unless necessary, at
 easily-identified points in your program, so locking and parallel access
-are rarely an issue, making thread programming much safer and easier than
-using other thread models.
+are rarely an issue, making thread programming much safer and easier
+than using other thread models.
 
 Unlike the so-called "Perl threads" (which are not actually real threads
-but only the windows process emulation (see section of same name for more
-details) ported to UNIX, and as such act as processes), Coro provides a
-full shared address space, which makes communication between threads very
-easy. And coro threads are fast, too: disabling the Windows process
-emulation code in your perl and using Coro can easily result in a two to
-four times speed increase for your programs. A parallel matrix
+but only the windows process emulation (see section of same name for
+more details) ported to UNIX, and as such act as processes), Coro
+provides a full shared address space, which makes communication between
+threads very easy. And coro threads are fast, too: disabling the Windows
+process emulation code in your perl and using Coro can easily result in
+a two to four times speed increase for your programs. A parallel matrix
 multiplication benchmark (very communication-intensive) runs over 300
 times faster on a single core than perls pseudo-threads on a quad core
 using all four cores.
 
-Coro achieves that by supporting multiple running interpreters that share
-data, which is especially useful to code pseudo-parallel processes and for
-event-based programming, such as multiple HTTP-GET requests running
-concurrently. See Coro::AnyEvent to learn more on how to integrate Coro
-into an event-based environment.
+Coro achieves that by supporting multiple running interpreters that
+share data, which is especially useful to code pseudo-parallel processes
+and for event-based programming, such as multiple HTTP-GET requests
+running concurrently. See Coro::AnyEvent to learn more on how to
+integrate Coro into an event-based environment.
 
 In this module, a thread is defined as "callchain + lexical variables +
 some package variables + C stack), that is, a thread has its own
diff --git a/perl/perl-Coro/perl-Coro.SlackBuild b/perl/perl-Coro/perl-Coro.SlackBuild
index 13b208d433..06c5197b13 100644
--- a/perl/perl-Coro/perl-Coro.SlackBuild
+++ b/perl/perl-Coro/perl-Coro.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Coro
-VERSION=${VERSION:-6.55}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-6.57}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
@@ -78,14 +78,15 @@ perl Makefile.PL \
   INSTALLDIRS=vendor \
   INSTALLVENDORMAN1DIR=/usr/man/man1 \
   INSTALLVENDORMAN3DIR=/usr/man/man3
+
 make
 make test
 make install DESTDIR=$PKG
 
 find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
 find $PKG -depth -type d -empty -delete || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changes COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/perl/perl-Coro/perl-Coro.info b/perl/perl-Coro/perl-Coro.info
index 668619546c..2bfadf6747 100644
--- a/perl/perl-Coro/perl-Coro.info
+++ b/perl/perl-Coro/perl-Coro.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Coro"
-VERSION="6.55"
+VERSION="6.57"
 HOMEPAGE="https://metacpan.org/pod/Coro"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz"
-MD5SUM="db97217f32ebcbc571ae8219cd08931d"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz"
+MD5SUM="fa5970a2a2f3df9d68d4369c7dde1a55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-EV perl-AnyEvent perl-common-sense perl-Guard perl-event"
diff --git a/perl/perl-DBIx-Simple/perl-DBIx-Simple.info b/perl/perl-DBIx-Simple/perl-DBIx-Simple.info
index 7dafb1c53b..6a9aeeb5de 100644
--- a/perl/perl-DBIx-Simple/perl-DBIx-Simple.info
+++ b/perl/perl-DBIx-Simple/perl-DBIx-Simple.info
@@ -6,5 +6,5 @@ MD5SUM="eb53ef4a93be7ebf043cd49075e81913"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
index 003d052e63..9f571bdab5 100644
--- a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
+++ b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for perl-Date-Manip
 
 # Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com>
-# Copyright 2014-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Date-Manip
-VERSION=${VERSION:-6.82}
+VERSION=${VERSION:-6.85}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Date-Manip/perl-Date-Manip.info b/perl/perl-Date-Manip/perl-Date-Manip.info
index 6a00d8c240..c8cba30565 100644
--- a/perl/perl-Date-Manip/perl-Date-Manip.info
+++ b/perl/perl-Date-Manip/perl-Date-Manip.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Date-Manip"
-VERSION="6.82"
+VERSION="6.85"
 HOMEPAGE="https://metacpan.org/pod/distribution/Date-Manip/lib/Date/Manip.pod"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz"
-MD5SUM="13c7600ff8a33d585b753874df85e4ea"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.85.tar.gz"
+MD5SUM="ce3447409d83d16e6dd7bea0a18f24b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Test-Inter perl-Test-Pod perl-Test-Pod-Coverage perl-YAML-Syck"
diff --git a/perl/perl-Devel-Cycle/README b/perl/perl-Devel-Cycle/README
new file mode 100644
index 0000000000..015ffa1efa
--- /dev/null
+++ b/perl/perl-Devel-Cycle/README
@@ -0,0 +1 @@
+ perl-Devel-Cycle - Find memory cycles in objects.
diff --git a/perl/perl-Devel-Cycle/perl-Devel-Cycle.SlackBuild b/perl/perl-Devel-Cycle/perl-Devel-Cycle.SlackBuild
new file mode 100644
index 0000000000..9fa8534a1f
--- /dev/null
+++ b/perl/perl-Devel-Cycle/perl-Devel-Cycle.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for perl-Devel-Cycle
+
+# Copyright 2020 M.A.Begue mab974@gmail.com
+# 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=perl-Devel-Cycle
+VERSION=${VERSION:-1.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+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
+
+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
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  Changes README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Devel-Cycle/perl-Devel-Cycle.info b/perl/perl-Devel-Cycle/perl-Devel-Cycle.info
new file mode 100644
index 0000000000..451f50c8ec
--- /dev/null
+++ b/perl/perl-Devel-Cycle/perl-Devel-Cycle.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Devel-Cycle"
+VERSION="1.12"
+HOMEPAGE="https://metacpan.org/pod/Devel::Cycle"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz"
+MD5SUM="3d9a963da87b17398fab9acbef63f277"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Michel A. BEGUE"
+EMAIL="mab974@gmail.com"
diff --git a/perl/perl-Devel-Cycle/slack-desc b/perl/perl-Devel-Cycle/slack-desc
new file mode 100644
index 0000000000..08ab477771
--- /dev/null
+++ b/perl/perl-Devel-Cycle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+perl-Devel-Cycle: perl-Devel-Cycle (find memory cycles in objects)
+perl-Devel-Cycle:
+perl-Devel-Cycle: homepage : https://metacpan.org/pod/Devel::Cycle
+perl-Devel-Cycle:
+perl-Devel-Cycle:
+perl-Devel-Cycle:
+perl-Devel-Cycle:
+perl-Devel-Cycle:
+perl-Devel-Cycle:
+perl-Devel-Cycle:
+perl-Devel-Cycle:
diff --git a/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild
index 9f609a6275..55a8a3b0d0 100644
--- a/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild
+++ b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-ExtUtils-Install
-VERSION=${VERSION:-2.14}
+VERSION=${VERSION:-2.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info
index 3f14495167..32509e9e83 100644
--- a/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info
+++ b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-ExtUtils-Install"
-VERSION="2.14"
+VERSION="2.20"
 HOMEPAGE="https://metacpan.org/pod/ExtUtils::Install"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz"
-MD5SUM="ae6af2689daa6f8c2d01d04a28ab0ef0"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-Install-2.20.tar.gz"
+MD5SUM="8e28404be69b47b2350eb09b21474de2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-File-Remove/perl-File-Remove.SlackBuild b/perl/perl-File-Remove/perl-File-Remove.SlackBuild
index a5a5103c14..77b1dda17f 100644
--- a/perl/perl-File-Remove/perl-File-Remove.SlackBuild
+++ b/perl/perl-File-Remove/perl-File-Remove.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-File-Remove
-VERSION=${VERSION:-1.58}
+VERSION=${VERSION:-1.60}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-File-Remove/perl-File-Remove.info b/perl/perl-File-Remove/perl-File-Remove.info
index f3b783e377..197cd98815 100644
--- a/perl/perl-File-Remove/perl-File-Remove.info
+++ b/perl/perl-File-Remove/perl-File-Remove.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-File-Remove"
-VERSION="1.58"
+VERSION="1.60"
 HOMEPAGE="https://metacpan.org/pod/File::Remove"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz"
-MD5SUM="f2d3959c7a8982bbdd03bb27f8b76891"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Remove-1.60.tar.gz"
+MD5SUM="34f46f9a07b2ad6fc80061d266f387b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Module-Build"
diff --git a/perl/perl-Gtk3/perl-Gtk3.SlackBuild b/perl/perl-Gtk3/perl-Gtk3.SlackBuild
index e819cf607b..27b16e402e 100644
--- a/perl/perl-Gtk3/perl-Gtk3.SlackBuild
+++ b/perl/perl-Gtk3/perl-Gtk3.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Gtk3
-VERSION=${VERSION:-0.035}
+VERSION=${VERSION:-0.038}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Gtk3/perl-Gtk3.info b/perl/perl-Gtk3/perl-Gtk3.info
index 48763e4275..49e4d819c4 100644
--- a/perl/perl-Gtk3/perl-Gtk3.info
+++ b/perl/perl-Gtk3/perl-Gtk3.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Gtk3"
-VERSION="0.035"
+VERSION="0.038"
 HOMEPAGE="https://metacpan.org/pod/Gtk3"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Gtk3-0.035.tar.gz"
-MD5SUM="9532a7939f21ece4e47d77a2e2fc44cc"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Gtk3-0.038.tar.gz"
+MD5SUM="c4f13880b5a95855cbdf3bcd6ada5661"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Glib-Object-Introspection perl-Cairo-GObject"
diff --git a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
index f8cbb62874..137494054c 100644
--- a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
+++ b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for perl-IO-Socket-SSL
 
 # Copyright 2009-2012 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-IO-Socket-SSL
-VERSION=${VERSION:-2.068}
+VERSION=${VERSION:-2.070}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
index f212fa761a..212108fe79 100644
--- a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
+++ b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-IO-Socket-SSL"
-VERSION="2.068"
+VERSION="2.070"
 HOMEPAGE="https://metacpan.org/pod/IO::Socket::SSL"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz"
-MD5SUM="4230c829c8875889848093b2b46a7284"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-2.070.tar.gz"
+MD5SUM="3c8df96b5249c02025e2eb48596c213b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Net-SSLeay perl-Net-LibIDN"
diff --git a/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild b/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild
index 710f38f8f3..21ab034939 100644
--- a/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild
+++ b/perl/perl-Image-Sane/perl-Image-Sane.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Image-Sane
-VERSION=${VERSION:-0.14}
+VERSION=${VERSION:-5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Image-Sane/perl-Image-Sane.info b/perl/perl-Image-Sane/perl-Image-Sane.info
index e168f13939..54d554fa14 100644
--- a/perl/perl-Image-Sane/perl-Image-Sane.info
+++ b/perl/perl-Image-Sane/perl-Image-Sane.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Image-Sane"
-VERSION="0.14"
+VERSION="5"
 HOMEPAGE="https://metacpan.org/pod/Image::Sane"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RA/RATCLIFFE/Image-Sane-0.14.tar.gz"
-MD5SUM="5a8687379630a272cacbcb52d66ae65a"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RA/RATCLIFFE/Image-Sane-5.tar.gz"
+MD5SUM="ea37bae44f50a8e916f5d584383b2cab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-extutils-depends perl-extutils-pkgconfig perl-Exception-Class perl-Test-Requires perl-Class-Data-Inheritable perl-Devel-StackTrace perl-Readonly perl-Try-Tiny"
diff --git a/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.SlackBuild b/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.SlackBuild
index f515287f96..885881af1c 100644
--- a/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.SlackBuild
+++ b/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-LWP-Protocol-https
 
-# Copyright 2013,2019 Chris Walker Kempner, TX
+# Copyright 2013,2019,2021 Chris Walker Kempner, TX
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-LWP-Protocol-https
-VERSION=${VERSION:-6.07}
+VERSION=${VERSION:-6.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,7 +77,7 @@ find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  Changes README \
+  Changes Install LICENSE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.info b/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.info
index edddd2eae2..edd167a02e 100644
--- a/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.info
+++ b/perl/perl-LWP-Protocol-https/perl-LWP-Protocol-https.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-LWP-Protocol-https"
-VERSION="6.07"
+VERSION="6.10"
 HOMEPAGE="https://metacpan.org/pod/LWP::Protocol::https"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz"
-MD5SUM="b8943dfb7d187af63c36fc18ab15947d"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.10.tar.gz"
+MD5SUM="cf64e4bc57a9266ac4343cdf0808c5c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwww-perl perl-Mozilla-CA perl-IO-Socket-SSL perl-Test-RequiresInternet"
diff --git a/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.SlackBuild b/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.SlackBuild
index f740fe7006..b65a2117d8 100644
--- a/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.SlackBuild
+++ b/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-List-MoreUtils-XS
 
-# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-List-MoreUtils-XS
-VERSION=${VERSION:-0.428}
+VERSION=${VERSION:-0.430}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.info b/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.info
index 1f7d265277..29ee0edce9 100644
--- a/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.info
+++ b/perl/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-List-MoreUtils-XS"
-VERSION="0.428"
+VERSION="0.430"
 HOMEPAGE="https://metacpan.org/pod/List::MoreUtils::XS"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz"
-MD5SUM="79939a9c2deb83ea2fa7fcbd3ad9c5c9"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz"
+MD5SUM="e77113e55b046906aecfb4ddb4f0c662"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Log-Message-Simple/perl-Log-Message-Simple.info b/perl/perl-Log-Message-Simple/perl-Log-Message-Simple.info
index 41417942b5..0e089081d1 100644
--- a/perl/perl-Log-Message-Simple/perl-Log-Message-Simple.info
+++ b/perl/perl-Log-Message-Simple/perl-Log-Message-Simple.info
@@ -6,5 +6,5 @@ MD5SUM="0a0f9df6bc1148cc2aae4cb2882c0664"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Log-Message"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Log-Message/perl-Log-Message.info b/perl/perl-Log-Message/perl-Log-Message.info
index 17194e890b..201783b9d1 100644
--- a/perl/perl-Log-Message/perl-Log-Message.info
+++ b/perl/perl-Log-Message/perl-Log-Message.info
@@ -6,5 +6,5 @@ MD5SUM="406fe7d1e37980afa105b663c436c4af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Math-GMPq/perl-Math-GMPq.SlackBuild b/perl/perl-Math-GMPq/perl-Math-GMPq.SlackBuild
index 350270f39f..9d6b24b745 100644
--- a/perl/perl-Math-GMPq/perl-Math-GMPq.SlackBuild
+++ b/perl/perl-Math-GMPq/perl-Math-GMPq.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Math-GMPq
-VERSION=${VERSION:-0.45}
+VERSION=${VERSION:-0.46}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Math-GMPq/perl-Math-GMPq.info b/perl/perl-Math-GMPq/perl-Math-GMPq.info
index 34989da3fa..cd403cf83c 100644
--- a/perl/perl-Math-GMPq/perl-Math-GMPq.info
+++ b/perl/perl-Math-GMPq/perl-Math-GMPq.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Math-GMPq"
-VERSION="0.45"
+VERSION="0.46"
 HOMEPAGE="https://metacpan.org/pod/Math::GMPq"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-GMPq-0.45.tar.gz"
-MD5SUM="6088853d8eb6b25d7a47c14dfb41b029"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-GMPq-0.46.tar.gz"
+MD5SUM="6f53ce25f379bb355fda19b10543cd9a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild b/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild
index c2db2ce3d3..985f2a87f9 100644
--- a/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild
+++ b/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Math-GMPz
-VERSION=${VERSION:-0.48}
+VERSION=${VERSION:-0.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Math-GMPz/perl-Math-GMPz.info b/perl/perl-Math-GMPz/perl-Math-GMPz.info
index 48930041c6..2d25752a1a 100644
--- a/perl/perl-Math-GMPz/perl-Math-GMPz.info
+++ b/perl/perl-Math-GMPz/perl-Math-GMPz.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Math-GMPz"
-VERSION="0.48"
+VERSION="0.50"
 HOMEPAGE="https://metacpan.org/pod/Math::GMPz"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-GMPz-0.48.tar.gz"
-MD5SUM="9c25f3e60bb0a094395227d85391bc04"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-GMPz-0.50.tar.gz"
+MD5SUM="ee9853d2721682d9faea7b366abebad4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Math-MPFR/perl-Math-MPFR.SlackBuild b/perl/perl-Math-MPFR/perl-Math-MPFR.SlackBuild
index e9db40bf0c..03a7196402 100644
--- a/perl/perl-Math-MPFR/perl-Math-MPFR.SlackBuild
+++ b/perl/perl-Math-MPFR/perl-Math-MPFR.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Math-MPFR
-VERSION=${VERSION:-4.14}
+VERSION=${VERSION:-4.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Math-MPFR/perl-Math-MPFR.info b/perl/perl-Math-MPFR/perl-Math-MPFR.info
index bb34c908ca..300b0034af 100644
--- a/perl/perl-Math-MPFR/perl-Math-MPFR.info
+++ b/perl/perl-Math-MPFR/perl-Math-MPFR.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Math-MPFR"
-VERSION="4.14"
+VERSION="4.16"
 HOMEPAGE="https://metacpan.org/pod/Math::MPFR"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-MPFR-4.14.tar.gz"
-MD5SUM="465103aa90da3e44e52e67dc6632a7c5"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-MPFR-4.16.tar.gz"
+MD5SUM="a8522ce0657ee7822edfdfa4000f5231"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Math-GMPq perl-Math-GMPz"
diff --git a/perl/perl-Module-Pluggable/perl-Module-Pluggable.info b/perl/perl-Module-Pluggable/perl-Module-Pluggable.info
index ca07688f70..d0564e7483 100644
--- a/perl/perl-Module-Pluggable/perl-Module-Pluggable.info
+++ b/perl/perl-Module-Pluggable/perl-Module-Pluggable.info
@@ -6,5 +6,5 @@ MD5SUM="87ce2971662efd0b69a81bb4dc9ea76c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Moo/perl-Moo.SlackBuild b/perl/perl-Moo/perl-Moo.SlackBuild
index c04ac290a5..29fc859cf4 100644
--- a/perl/perl-Moo/perl-Moo.SlackBuild
+++ b/perl/perl-Moo/perl-Moo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Moo
 
-# Copyright 2013-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Moo
-VERSION=${VERSION:-2.004000}
+VERSION=${VERSION:-2.004004}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Moo/perl-Moo.info b/perl/perl-Moo/perl-Moo.info
index 156b4d9d1a..eb23e3ec3c 100644
--- a/perl/perl-Moo/perl-Moo.info
+++ b/perl/perl-Moo/perl-Moo.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Moo"
-VERSION="2.004000"
+VERSION="2.004004"
 HOMEPAGE="https://metacpan.org/pod/Moo"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz"
-MD5SUM="e542104553d616b15631b5c66ccee904"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.004004.tar.gz"
+MD5SUM="51f3732e043a1e856ab6cdc260d2814c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Role-Tiny perl-strictures perl-Dist-CheckConflicts perl-Class-Method-Modifiers perl-Devel-GlobalDestruction perl-Module-Runtime perl-Import-Into perl-Sub-Quote"
diff --git a/perl/perl-Mozilla-CA/perl-Mozilla-CA.SlackBuild b/perl/perl-Mozilla-CA/perl-Mozilla-CA.SlackBuild
index b820555537..29158c5588 100644
--- a/perl/perl-Mozilla-CA/perl-Mozilla-CA.SlackBuild
+++ b/perl/perl-Mozilla-CA/perl-Mozilla-CA.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Mozilla-CA
-VERSION=${VERSION:-20130114}
+VERSION=${VERSION:-20200520}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Mozilla-CA/perl-Mozilla-CA.info b/perl/perl-Mozilla-CA/perl-Mozilla-CA.info
index 4c90c74f65..8ebc4966d1 100644
--- a/perl/perl-Mozilla-CA/perl-Mozilla-CA.info
+++ b/perl/perl-Mozilla-CA/perl-Mozilla-CA.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Mozilla-CA"
-VERSION="20130114"
+VERSION="20200520"
 HOMEPAGE="https://metacpan.org/pod/Mozilla::CA"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-20130114.tar.gz"
-MD5SUM="45a42082dbd68cf25869ceb2aa49d5b2"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz"
+MD5SUM="8ac3fe1a83c45da3f468f78ab8133ea6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Christopher Walker"
+MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"
diff --git a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
index 165d37e22c..b9cb93e001 100644
--- a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
+++ b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
@@ -6,5 +6,5 @@ MD5SUM="6579d43d270c965563f84fd5ffe0dde5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Didier Spaier"
+EMAIL="didier at slint dot fr"
diff --git a/perl/perl-Object-Accessor/perl-Object-Accessor.info b/perl/perl-Object-Accessor/perl-Object-Accessor.info
index 481a329383..38e5ab1b4d 100644
--- a/perl/perl-Object-Accessor/perl-Object-Accessor.info
+++ b/perl/perl-Object-Accessor/perl-Object-Accessor.info
@@ -6,5 +6,5 @@ MD5SUM="46a3ce50d8817938cecbb8e02eda9500"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-PAR-Dist/README b/perl/perl-PAR-Dist/README
index 2a904fb7b4..5e4a309c94 100644
--- a/perl/perl-PAR-Dist/README
+++ b/perl/perl-PAR-Dist/README
@@ -2,7 +2,7 @@ perl-PAR-Dist (Create and manipulate PAR distributions)
 
 This module creates and manipulates PAR distributions.  They are
 architecture-specific PAR files, containing everything under blib/ of
-CPAN distributions after their make or Build stage, a META.yml describing
-metadata of the original CPAN distribution, and a MANIFEST detailing all
-files within it. Digitally signed PAR distributions will also contain
-a SIGNATURE file.
+CPAN distributions after their make or Build stage, a META.yml
+describing metadata of the original CPAN distribution, and a MANIFEST
+detailing all files within it. Digitally signed PAR distributions will
+also contain a SIGNATURE file.
diff --git a/perl/perl-PAR-Dist/perl-PAR-Dist.SlackBuild b/perl/perl-PAR-Dist/perl-PAR-Dist.SlackBuild
index 933dbdef99..dce932d56c 100644
--- a/perl/perl-PAR-Dist/perl-PAR-Dist.SlackBuild
+++ b/perl/perl-PAR-Dist/perl-PAR-Dist.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
-# Slackware build script for perl-PAR-Dist
+#
+# Slackware build script for perl-PAR-Dist.
 
-# Copyright 2015 Edinaldo P. Silva  <edps.mundognu@gmail.com>
+# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-PAR-Dist
-VERSION=${VERSION:-0.49}
+VERSION=${VERSION:-0.51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -39,8 +42,8 @@ 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"
@@ -55,8 +58,6 @@ fi
 
 set -e
 
-SRCNAM=PAR-Dist
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
diff --git a/perl/perl-PAR-Dist/perl-PAR-Dist.info b/perl/perl-PAR-Dist/perl-PAR-Dist.info
index a190b832a9..3dfab4e2e3 100644
--- a/perl/perl-PAR-Dist/perl-PAR-Dist.info
+++ b/perl/perl-PAR-Dist/perl-PAR-Dist.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-PAR-Dist"
-VERSION="0.49"
+VERSION="0.51"
 HOMEPAGE="https://metacpan.org/pod/PAR::Dist"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz"
-MD5SUM="bd852113974544f3c8c107ab4055cf8c"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/PAR-Dist-0.51.tar.gz"
+MD5SUM="9231ef7cb0f46c6c183e91962e2a766c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-PAR/perl-PAR.SlackBuild b/perl/perl-PAR/perl-PAR.SlackBuild
index 627ca19789..c3ede9764d 100644
--- a/perl/perl-PAR/perl-PAR.SlackBuild
+++ b/perl/perl-PAR/perl-PAR.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for perl-PAR.
 #
-# Copyright 2015-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-PAR
-VERSION=${VERSION:-1.016}
+VERSION=${VERSION:-1.017}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-PAR/perl-PAR.info b/perl/perl-PAR/perl-PAR.info
index 3eb2f89f4f..982dd01d4c 100644
--- a/perl/perl-PAR/perl-PAR.info
+++ b/perl/perl-PAR/perl-PAR.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-PAR"
-VERSION="1.016"
+VERSION="1.017"
 HOMEPAGE="https://metacpan.org/pod/PAR"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/PAR-1.016.tar.gz"
-MD5SUM="37045dc980d56561272f285269427458"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/PAR-1.017.tar.gz"
+MD5SUM="a8f06d64d14354f0cf6fbfa06179ed17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-PAR-Dist perl-Archive-Zip"
diff --git a/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild b/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild
index 06ba52d50b..e084133418 100644
--- a/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild
+++ b/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-PDF-API2
-VERSION=${VERSION:-2.033}
+VERSION=${VERSION:-2.038}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-PDF-API2/perl-PDF-API2.info b/perl/perl-PDF-API2/perl-PDF-API2.info
index 681c7ed704..c54df2e261 100644
--- a/perl/perl-PDF-API2/perl-PDF-API2.info
+++ b/perl/perl-PDF-API2/perl-PDF-API2.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-PDF-API2"
-VERSION="2.033"
+VERSION="2.038"
 HOMEPAGE="https://metacpan.org/pod/PDF::API2"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SS/SSIMMS/PDF-API2-2.033.tar.gz"
-MD5SUM="4223a38add42741f996bd67d5f2f8e5b"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz"
+MD5SUM="2d6683d01b95f554ec5bb2e29f31ff03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Font-TTF"
diff --git a/perl/perl-PDF-Builder/README b/perl/perl-PDF-Builder/README
new file mode 100644
index 0000000000..7a6a791666
--- /dev/null
+++ b/perl/perl-PDF-Builder/README
@@ -0,0 +1,2 @@
+ perl-PDF-Builder - Facilitates the creation and modification of PDF
+ files.
diff --git a/perl/perl-PDF-Builder/perl-PDF-Builder.SlackBuild b/perl/perl-PDF-Builder/perl-PDF-Builder.SlackBuild
new file mode 100644
index 0000000000..ee4095ee54
--- /dev/null
+++ b/perl/perl-PDF-Builder/perl-PDF-Builder.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for perl-PDF-Builder
+
+# Copyright 2020 M.A.Begue mab974@gmail.com
+# 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=perl-PDF-Builder
+VERSION=${VERSION:-3.021}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}	
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}	
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+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
+mv $PKG/usr/local/share/man $PKG/usr
+mv $PKG/usr/local/share $PKG/usr
+
+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
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+    CONTRIBUTING Changes MANIFEST README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-PDF-Builder/perl-PDF-Builder.info b/perl/perl-PDF-Builder/perl-PDF-Builder.info
new file mode 100644
index 0000000000..66106ffba9
--- /dev/null
+++ b/perl/perl-PDF-Builder/perl-PDF-Builder.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-PDF-Builder"
+VERSION="3.021"
+HOMEPAGE="https://metacpan.org/pod/PDF::Builder"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz"
+MD5SUM="79e35db8ecd21b97bd0078456ca3494f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Font-TTF perl-Test-Memory-Cycle perl-Test-Exception"
+MAINTAINER="Michel A. BEGUE"
+EMAIL="mab974@gmail.com"
diff --git a/perl/perl-PDF-Builder/slack-desc b/perl/perl-PDF-Builder/slack-desc
new file mode 100644
index 0000000000..fe43cbb6ca
--- /dev/null
+++ b/perl/perl-PDF-Builder/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+perl-PDF-Builder: perl-PDF-Builder (facilitates the creation and modification of PDFs)
+perl-PDF-Builder:
+perl-PDF-Builder: homepage : https://metacpan.org/pod/PDF::Builder
+perl-PDF-Builder:
+perl-PDF-Builder:
+perl-PDF-Builder:
+perl-PDF-Builder:
+perl-PDF-Builder:
+perl-PDF-Builder:
+perl-PDF-Builder:
+perl-PDF-Builder:
diff --git a/perl/perl-Package-Constants/perl-Package-Constants.info b/perl/perl-Package-Constants/perl-Package-Constants.info
index a05eb4fbd3..3bf136e30f 100644
--- a/perl/perl-Package-Constants/perl-Package-Constants.info
+++ b/perl/perl-Package-Constants/perl-Package-Constants.info
@@ -6,5 +6,5 @@ MD5SUM="e608e8eb260ee6226943c67eba1015ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild b/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild
index 30fce399e2..d0b305c91c 100644
--- a/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild
+++ b/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Path-Tiny
 
-# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Path-Tiny
-VERSION=${VERSION:-0.114}
+VERSION=${VERSION:-0.118}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Path-Tiny/perl-Path-Tiny.info b/perl/perl-Path-Tiny/perl-Path-Tiny.info
index 41cf80d845..580ae7ccb2 100644
--- a/perl/perl-Path-Tiny/perl-Path-Tiny.info
+++ b/perl/perl-Path-Tiny/perl-Path-Tiny.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Path-Tiny"
-VERSION="0.114"
+VERSION="0.118"
 HOMEPAGE="https://metacpan.org/pod/Path::Tiny"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz"
-MD5SUM="dd6092293f8766fb87d003dceebe4263"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.118.tar.gz"
+MD5SUM="cb34fd356725ec12b78e88ddac37db08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.info b/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.info
index 57a883ba60..545991fbe7 100644
--- a/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.info
+++ b/perl/perl-Razor2-Client-Agent/perl-Razor2-Client-Agent.info
@@ -6,5 +6,5 @@ MD5SUM="d7f9c7b6fe1c8b93425a01334bd6c3ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-digest-sha1 perl-net-dns"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild b/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild
index 80733c95e2..b6e9e5057c 100644
--- a/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild
+++ b/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Role-Tiny
 
-# Copyright 2013-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Role-Tiny
-VERSION=${VERSION:-2.001004}
+VERSION=${VERSION:-2.002004}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Role-Tiny/perl-Role-Tiny.info b/perl/perl-Role-Tiny/perl-Role-Tiny.info
index 08d44ab5e9..9c5d7bd060 100644
--- a/perl/perl-Role-Tiny/perl-Role-Tiny.info
+++ b/perl/perl-Role-Tiny/perl-Role-Tiny.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Role-Tiny"
-VERSION="2.001004"
+VERSION="2.002004"
 HOMEPAGE="https://metacpan.org/pod/Role::Tiny"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz"
-MD5SUM="98446826608b1e943e65c1f6e35942fe"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.002004.tar.gz"
+MD5SUM="9ee45591befa3d0b1094ac75d282b6ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Test-Fatal"
diff --git a/perl/perl-Sidef/perl-Sidef.SlackBuild b/perl/perl-Sidef/perl-Sidef.SlackBuild
index 638d048f04..51d2eef2ee 100644
--- a/perl/perl-Sidef/perl-Sidef.SlackBuild
+++ b/perl/perl-Sidef/perl-Sidef.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Sidef
-VERSION=${VERSION:-3.96}
+VERSION=${VERSION:-3.98}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Sidef/perl-Sidef.info b/perl/perl-Sidef/perl-Sidef.info
index 8ffd4c2379..a7b76cf17f 100644
--- a/perl/perl-Sidef/perl-Sidef.info
+++ b/perl/perl-Sidef/perl-Sidef.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Sidef"
-VERSION="3.96"
+VERSION="3.98"
 HOMEPAGE="https://github.com/trizen/sidef"
-DOWNLOAD="https://github.com/trizen/sidef/archive/3.96/sidef-3.96.tar.gz"
-MD5SUM="b2ce73500c19ee80f557a078effb47a6"
+DOWNLOAD="https://github.com/trizen/sidef/archive/3.98/sidef-3.98.tar.gz"
+MD5SUM="3d17c75d3b298f1322bcbbccddba6d06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-Module-Build perl-Math-MPC perl-Math-Prime-Util-GMP perl-Algorithm-Combinatorics perl-Algorithm-Loops perl-Math-Prime-Util"
diff --git a/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild b/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild
index 2e81ec3d9e..fb764c6130 100644
--- a/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild
+++ b/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Thomas Morper <thomas@beingboiled.info>
 
 PRGNAM=perl-Template-Toolkit
-VERSION=${VERSION:-3.008}
+VERSION=${VERSION:-3.009}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Template-Toolkit/perl-Template-Toolkit.info b/perl/perl-Template-Toolkit/perl-Template-Toolkit.info
index 3ff76989ab..0ef0548766 100644
--- a/perl/perl-Template-Toolkit/perl-Template-Toolkit.info
+++ b/perl/perl-Template-Toolkit/perl-Template-Toolkit.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Template-Toolkit"
-VERSION="3.008"
+VERSION="3.009"
 HOMEPAGE="https://metacpan.org/release/Template-Toolkit"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.008.tar.gz"
-MD5SUM="c225fce951e0813e8d2ad08341115ed2"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz"
+MD5SUM="f1c401067b728337a8a8c0d4ae642af8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-AppConfig"
diff --git a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild
index d82cc2399a..7095920e6a 100644
--- a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild
+++ b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Term-ReadLine-Gnu
 
-# Copyright 2013-2019 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2013-2020 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-Term-ReadLine-Gnu
-VERSION=${VERSION:-1.36}
+VERSION=${VERSION:-1.37}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info
index 8111cc3ce4..405d6a0b9b 100644
--- a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info
+++ b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Term-ReadLine-Gnu"
-VERSION="1.36"
+VERSION="1.37"
 HOMEPAGE="https://metacpan.org/pod/Term::ReadLine::Gnu"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz"
-MD5SUM="f8636c8e17b3266f3a686521a0c06886"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.37.tar.gz"
+MD5SUM="3d85d964624dd2ead132b7e0f861a939"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Term-UI/perl-Term-UI.info b/perl/perl-Term-UI/perl-Term-UI.info
index e28121c45b..0563fa4205 100644
--- a/perl/perl-Term-UI/perl-Term-UI.info
+++ b/perl/perl-Term-UI/perl-Term-UI.info
@@ -6,5 +6,5 @@ MD5SUM="eaa9240bc44e18dfe558286eb1f3c592"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Log-Message-Simple"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/perl/perl-Test-Memory-Cycle/README b/perl/perl-Test-Memory-Cycle/README
new file mode 100644
index 0000000000..105855f2e7
--- /dev/null
+++ b/perl/perl-Test-Memory-Cycle/README
@@ -0,0 +1,2 @@
+ perl-Test-Memory-Cycle - Check for memory leaks and circular memory
+ references.
diff --git a/perl/perl-Test-Memory-Cycle/perl-Test-Memory-Cycle.SlackBuild b/perl/perl-Test-Memory-Cycle/perl-Test-Memory-Cycle.SlackBuild
new file mode 100644
index 0000000000..e4e5c7856a
--- /dev/null
+++ b/perl/perl-Test-Memory-Cycle/perl-Test-Memory-Cycle.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for perl-Test-Memory-Cycle
+
+# Copyright 2020 M.A.Begue mab974@gmail.com
+# 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=perl-Test-Memory-Cycle
+VERSION=${VERSION:-1.06}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+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
+
+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
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  Changes LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Test-Memory-Cycle/perl-Test-Memory-Cycle.info b/perl/perl-Test-Memory-Cycle/perl-Test-Memory-Cycle.info
new file mode 100644
index 0000000000..ab796a726c
--- /dev/null
+++ b/perl/perl-Test-Memory-Cycle/perl-Test-Memory-Cycle.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Test-Memory-Cycle"
+VERSION="1.06"
+HOMEPAGE="https://metacpan.org/pod/Test::Memory::Cycle"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz"
+MD5SUM="397e709ba33d3883b5fb2bc49e3a70b0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Devel-Cycle"
+MAINTAINER="Michel A. BEGUE"
+EMAIL="mab974@gmail.com"
diff --git a/perl/perl-Test-Memory-Cycle/slack-desc b/perl/perl-Test-Memory-Cycle/slack-desc
new file mode 100644
index 0000000000..2683907d83
--- /dev/null
+++ b/perl/perl-Test-Memory-Cycle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+perl-Test-Memory-Cycle: perl-Test-Memory-Cycle  (Check for memory leaks/circular memory refs)
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle: homepage : https://metacpan.org/pod/Test::Memory::Cycle
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
+perl-Test-Memory-Cycle:
diff --git a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild
index 9688476878..0ae3b97ba6 100644
--- a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild
+++ b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Unicode-LineBreak
-VERSION=${VERSION:-2015.07.16}
+VERSION=${VERSION:-2019.001}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info
index 0dd6661434..1919eab456 100644
--- a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info
+++ b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Unicode-LineBreak"
-VERSION="2015.07.16"
-HOMEPAGE="https://metacpan.org/release/NEZUMI/Unicode-LineBreak-2015.07.16"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2015.07.16.tar.gz"
-MD5SUM="8e811b9b9c47fdc7fa3a5c55e1a9c0ea"
+VERSION="2019.001"
+HOMEPAGE="https://metacpan.org/release/NEZUMI/Unicode-LineBreak-2019.001"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz"
+MD5SUM="003d6da7a13700e069afed9238c864b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-MIME-Charset"
diff --git a/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info b/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info
index c5495f9c23..bdcf85acdc 100644
--- a/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info
+++ b/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info
@@ -6,5 +6,5 @@ MD5SUM="69cd2eae86c5b6ac360a1f829e784239"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Mojolicious"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Didier Spaier"
+EMAIL="didier at slint dot fr"
diff --git a/perl/perl-YAML-Syck/perl-YAML-Syck.SlackBuild b/perl/perl-YAML-Syck/perl-YAML-Syck.SlackBuild
index d0b03006cb..261ba5cacc 100644
--- a/perl/perl-YAML-Syck/perl-YAML-Syck.SlackBuild
+++ b/perl/perl-YAML-Syck/perl-YAML-Syck.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-YAML-Syck
-VERSION=${VERSION:-1.32}
+VERSION=${VERSION:-1.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-YAML-Syck/perl-YAML-Syck.info b/perl/perl-YAML-Syck/perl-YAML-Syck.info
index f3d17bcec9..d98862e2c5 100644
--- a/perl/perl-YAML-Syck/perl-YAML-Syck.info
+++ b/perl/perl-YAML-Syck/perl-YAML-Syck.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-YAML-Syck"
-VERSION="1.32"
+VERSION="1.34"
 HOMEPAGE="https://metacpan.org/pod/YAML::Syck"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"
-MD5SUM="4d76594ccb19541610f82779071695c6"
+DOWNLOAD="http://cpan.metacpan.org/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"
+MD5SUM="4aae72f5c06dccd6ed6ea9b029104183"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-yaml"
diff --git a/perl/perl-cairo/perl-cairo.SlackBuild b/perl/perl-cairo/perl-cairo.SlackBuild
index ad42e9740b..9e3a6c6317 100644
--- a/perl/perl-cairo/perl-cairo.SlackBuild
+++ b/perl/perl-cairo/perl-cairo.SlackBuild
@@ -5,7 +5,7 @@
 # (C) 2007 Michael Wagner <lapinours@web.de>
 # Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
 # Adopted 2014-2017 Glenn Becker <burningc@sdf.org>
-# Copyright 2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 #
 # All rights reserved.
 #
@@ -27,7 +27,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-cairo
-VERSION=${VERSION:-1.107}
+VERSION=${VERSION:-1.109}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,7 +81,7 @@ perl Makefile.PL \
   INSTALLDIRS=vendor \
   INSTALLVENDORMAN3DIR=/usr/man/man3
 make
-make test
+#make test
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/perl/perl-cairo/perl-cairo.info b/perl/perl-cairo/perl-cairo.info
index 7110aabd10..24970e133f 100644
--- a/perl/perl-cairo/perl-cairo.info
+++ b/perl/perl-cairo/perl-cairo.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-cairo"
-VERSION="1.107"
+VERSION="1.109"
 HOMEPAGE="https://metacpan.org/pod/Cairo"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz"
-MD5SUM="fdb959699794dd82031ea9d8ac12db0b"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Cairo-1.109.tar.gz"
+MD5SUM="8f7cd2260014e4f9fb42dfb28cd55d66"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-extutils-depends perl-extutils-pkgconfig"
diff --git a/perl/perl-file-libmagic/README b/perl/perl-file-libmagic/README
index 54485e1a8e..30a285d487 100644
--- a/perl/perl-file-libmagic/README
+++ b/perl/perl-file-libmagic/README
@@ -1,6 +1,7 @@
-perl-file-libmagic (determine MIME types of data or files using libmagic)
+perl-file-libmagic (determine MIME types of data or files with libmagic)
 
-File::LibMagic is a simple perl interface to libmagic from the file package.
+File::LibMagic is a simple perl interface to libmagic from the file
+package.
 
 perl-Test-Fatal is an optional build-time dependency, required
 for running "make test".
diff --git a/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild b/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
index 5ec6184957..6ca91ab63c 100644
--- a/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
+++ b/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
@@ -6,9 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201025 bkw: update for v1.23.
+
 PRGNAM=perl-file-libmagic
 TARNAM=File-LibMagic
-VERSION=${VERSION:-1.16}
+VERSION=${VERSION:-1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,11 +50,18 @@ rm -rf $TARNAM-$VERSION
 tar xvf $CWD/$TARNAM-$VERSION.tar.gz
 cd $TARNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20201025 bkw: previous versions shipped a private copy of
+# Config::AutoConf with the source. Upstream removed it, so it would
+# have to be installed separately. Since it's only used at build time,
+# and doesn't affect the package built by this script, I don't want to
+# create and maintain yet another perl SlackBuild for it. So I've made
+# it a 2nd download file, and this stanza makes Makefile.PL use it:
+mkdir -p inc/Config
+cp $CWD/AutoConf.pm inc/Config
+export PERL5LIB=inc
 
 perl Makefile.PL \
   PREFIX=/usr \
@@ -73,8 +82,7 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes LICENSE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes LICENSE 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/perl/perl-file-libmagic/perl-file-libmagic.info b/perl/perl-file-libmagic/perl-file-libmagic.info
index 4764d2f5d2..c52c122dcf 100644
--- a/perl/perl-file-libmagic/perl-file-libmagic.info
+++ b/perl/perl-file-libmagic/perl-file-libmagic.info
@@ -1,8 +1,10 @@
 PRGNAM="perl-file-libmagic"
-VERSION="1.16"
+VERSION="1.23"
 HOMEPAGE="https://metacpan.org/pod/File::LibMagic"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz"
-MD5SUM="de0cc720d1599428be01a7fa50a5cc5b"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/File-LibMagic-1.23.tar.gz \
+          https://fastapi.metacpan.org/source/REHSACK/Config-AutoConf-0.313/lib/Config/AutoConf.pm"
+MD5SUM="7782e6f80a67c931a2682145eca6e832 \
+        233a630ea2ce0e7fdb2adcbb72896002"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-file-mimeinfo/README b/perl/perl-file-mimeinfo/README
index 48be226d50..1ed76a8265 100644
--- a/perl/perl-file-mimeinfo/README
+++ b/perl/perl-file-mimeinfo/README
@@ -1,4 +1,5 @@
 perl-file-mimeinfo (File::MimeInfo - Determine file type)
 
 This module can be used to determine the mime type of a file.
-It tries to implement the freedesktop specification for a shared MIME database.
+It tries to implement the freedesktop specification for a shared MIME
+database.
diff --git a/perl/perl-file-mimeinfo/perl-file-mimeinfo.SlackBuild b/perl/perl-file-mimeinfo/perl-file-mimeinfo.SlackBuild
index 03ae8f7826..b8bfe6ef47 100644
--- a/perl/perl-file-mimeinfo/perl-file-mimeinfo.SlackBuild
+++ b/perl/perl-file-mimeinfo/perl-file-mimeinfo.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for perl-file-mimeinfo.
 #
-# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-file-mimeinfo
-VERSION=${VERSION:-0.29}
+VERSION=${VERSION:-0.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-file-mimeinfo/perl-file-mimeinfo.info b/perl/perl-file-mimeinfo/perl-file-mimeinfo.info
index 110526b995..2e027e9852 100644
--- a/perl/perl-file-mimeinfo/perl-file-mimeinfo.info
+++ b/perl/perl-file-mimeinfo/perl-file-mimeinfo.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-file-mimeinfo"
-VERSION="0.29"
+VERSION="0.30"
 HOMEPAGE="https://metacpan.org/pod/File::MimeInfo"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz"
-MD5SUM="cbd870b04c528eee2ad36706cd2d12d5"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/File-MimeInfo-0.30.tar.gz"
+MD5SUM="5301ab7b93af7875aa09836b96ab5f3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-file-basedir perl-file-desktopentry"
+REQUIRES="perl-file-basedir perl-file-desktopentry perl-encode-locale"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/perl/raku-Readline/raku-Readline.SlackBuild b/perl/raku-Readline/raku-Readline.SlackBuild
index 88b94d7d9e..298a0d4db2 100644
--- a/perl/raku-Readline/raku-Readline.SlackBuild
+++ b/perl/raku-Readline/raku-Readline.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for raku-Readline
 
+# Copyright 2020- Michel Begue <mab974@gmail.com>
 # Copyright 2018-2019 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=raku-Readline
-VERSION=${VERSION:-0.1.5}
+VERSION=${VERSION:-0.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/raku-Readline/raku-Readline.info b/perl/raku-Readline/raku-Readline.info
index 8ff53f35f2..f3c1c361df 100644
--- a/perl/raku-Readline/raku-Readline.info
+++ b/perl/raku-Readline/raku-Readline.info
@@ -1,10 +1,10 @@
 PRGNAM="raku-Readline"
-VERSION="0.1.5"
-HOMEPAGE="https://github.com/drforr/perl6-readline"
-DOWNLOAD="https://github.com/drforr/perl6-readline/archive/0.1.5/perl6-readline-0.1.5.tar.gz"
-MD5SUM="9156baa1cd931798a258bf44508006c6"
+VERSION="0.1.6"
+HOMEPAGE="https://github.com/fooist/perl6-readline"
+DOWNLOAD="https://github.com/fooist/perl6-readline/archive/0.1.6/perl6-readline-0.1.6.tar.gz"
+MD5SUM="6347e5c3cada706a0cdefca375e5d324"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rakudo"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/perl/raku-Readline/slack-desc b/perl/raku-Readline/slack-desc
index 8c7d9bd3fa..b9a8be1c7d 100644
--- a/perl/raku-Readline/slack-desc
+++ b/perl/raku-Readline/slack-desc
@@ -13,7 +13,7 @@ raku-Readline: programming language.
 raku-Readline:
 raku-Readline: This module adds command line editing to the Rakudo interpreter.
 raku-Readline:
-raku-Readline: Homepage: https://github.com/drforr/perl6-readline
+raku-Readline: Homepage: https://github.com/fooist/perl6-readline
 raku-Readline:
 raku-Readline:
 raku-Readline:
diff --git a/perl/rakudo/rakudo.SlackBuild b/perl/rakudo/rakudo.SlackBuild
index 1081731f3b..5fdff142a9 100644
--- a/perl/rakudo/rakudo.SlackBuild
+++ b/perl/rakudo/rakudo.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for rakudo
 
+# Copyright 2020- Michel Begue <mab974@gmail.com>
 # Copyright 2018-2020 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=rakudo
-VERSION=${VERSION:-2020.09}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/rakudo/rakudo.info b/perl/rakudo/rakudo.info
index 527c3d7dda..5830a8a4d9 100644
--- a/perl/rakudo/rakudo.info
+++ b/perl/rakudo/rakudo.info
@@ -1,10 +1,10 @@
 PRGNAM="rakudo"
-VERSION="2020.09"
+VERSION="2021.03"
 HOMEPAGE="https://rakudo.org/"
-DOWNLOAD="https://github.com/rakudo/rakudo/releases/download/2020.09/rakudo-2020.09.tar.gz"
-MD5SUM="1fdccad8fe4f0c1bab492b7600c0a6a7"
+DOWNLOAD="https://github.com/rakudo/rakudo/releases/download/2021.03/rakudo-2021.03.tar.gz"
+MD5SUM="8c7841bcb8e1fc35709458cc99433d9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nqp"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/perl/zef/zef.SlackBuild b/perl/zef/zef.SlackBuild
index d9ebd9b7af..d2be20b9f8 100644
--- a/perl/zef/zef.SlackBuild
+++ b/perl/zef/zef.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for zef
 
+# Copyright 2020- Michel Begue <mab974@gmail.com>
 # Copyright 2018-2020 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=zef
-VERSION=${VERSION:-0.8.5}
+VERSION=${VERSION:-0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/zef/zef.info b/perl/zef/zef.info
index b6c59d8692..1588a46f6d 100644
--- a/perl/zef/zef.info
+++ b/perl/zef/zef.info
@@ -1,10 +1,10 @@
 PRGNAM="zef"
-VERSION="0.8.5"
+VERSION="0.9.4"
 HOMEPAGE="https://github.com/ugexe/zef"
-DOWNLOAD="https://github.com/ugexe/zef/archive/v0.8.5/zef-0.8.5.tar.gz"
-MD5SUM="5de55a1f92335d4149759653855c85d5"
+DOWNLOAD="https://github.com/ugexe/zef/archive/v0.9.4/zef-0.9.4.tar.gz"
+MD5SUM="4512b49b7c7039b4df6265116097f48c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rakudo"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/python/BeautifulSoup4/BeautifulSoup4.SlackBuild b/python/BeautifulSoup4/BeautifulSoup4.SlackBuild
index d082584c74..6793e1369a 100644
--- a/python/BeautifulSoup4/BeautifulSoup4.SlackBuild
+++ b/python/BeautifulSoup4/BeautifulSoup4.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for BeautifulSoup4
 
 # Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=BeautifulSoup4
-VERSION=${VERSION:-4.9.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.9.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=beautifulsoup4
@@ -72,12 +72,17 @@ 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 {} \;
 
+# Python 2 support (requires python-soupsieve)
 if $(python2 -c 'import soupsieve' 2>/dev/null); then
   python setup.py install --root=$PKG
 fi
 
 # Python 3 support (requires python3-soupsieve)
-if $(python3 -c 'import soupsieve' 2>/dev/null); then
+# shaypal5 provided an example package check:
+# https://gist.github.com/shaypal5/d505af9953cd86f59c750fa600ee4ba6
+if $(python3 -c 'import pkgutil; exit(not pkgutil.find_loader("soupsieve"))'); then
+
+  # Prepare another source tarball before building for Python 3
   cd $TMP
   rm -rf $SRCNAM-$VERSION
   tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
@@ -88,6 +93,8 @@ if $(python3 -c 'import soupsieve' 2>/dev/null); then
     -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 for Python 3 
   sed -i "s/-rfI/-rf/" convert-py3k
   sh convert-py3k
   python3 setup.py install --root=$PKG
diff --git a/python/BeautifulSoup4/BeautifulSoup4.info b/python/BeautifulSoup4/BeautifulSoup4.info
index 90f2bc9616..124eda5d4b 100644
--- a/python/BeautifulSoup4/BeautifulSoup4.info
+++ b/python/BeautifulSoup4/BeautifulSoup4.info
@@ -1,8 +1,8 @@
 PRGNAM="BeautifulSoup4"
-VERSION="4.9.1"
+VERSION="4.9.3"
 HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/"
-DOWNLOAD="https://www.crummy.com/software/BeautifulSoup/bs4/download/4.9/beautifulsoup4-4.9.1.tar.gz"
-MD5SUM="57502b5b34ccfd97b180260071f5799a"
+DOWNLOAD="https://www.crummy.com/software/BeautifulSoup/bs4/download/4.9/beautifulsoup4-4.9.3.tar.gz"
+MD5SUM="57fd468ae3eb055f6871106e8f7813e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-soupsieve"
diff --git a/python/BeautifulSoup4/README b/python/BeautifulSoup4/README
index e0e102b270..9e5e23a850 100644
--- a/python/BeautifulSoup4/README
+++ b/python/BeautifulSoup4/README
@@ -1,32 +1,6 @@
 Beautiful Soup is a Python HTML/XML parser designed for quick
-turnaround projects like screen-scraping. Three features make it
-powerful:
+turnaround projects like screen-scraping. It commonly saves
+programmers hours or days of work.
 
-1. Beautiful Soup won't choke if you give it bad markup. It yields a
-parse tree that makes approximately as much sense as your original
-document. This is usually good enough to collect the data you need
-and run away.
-
-2. Beautiful Soup provides a few simple methods and Pythonic idioms for
-navigating, searching, and modifying a parse tree: a toolkit for
-dissecting a document and extracting what you need. You don't have to
-create a custom parser for each application.
-
-3. Beautiful Soup automatically converts incoming documents to Unicode
-and outgoing documents to UTF-8. You don't have to think about
-encodings, unless the document doesn't specify an encoding and
-Beautiful Soup can't autodetect one. Then you just have to specify
-the original encoding.
-
-Beautiful Soup parses anything you give it, and does the tree traversal
-stuff for you. You can tell it "Find all the links", or "Find all the
-links of class externalLink", or "Find all the links whose urls match
-"foo.com", or "Find the table heading that's got bold text, then give
-me that text."
-
-Valuable data that was once locked up in poorly-designed websites is 
-now within your reach. Projects that would have taken hours take only 
-minutes with Beautiful Soup.
-
-If python3-soupsieve is installed, then this will also build for 
+If python3-soupsieve is installed, then this will also build for
 Python 3.
diff --git a/python/BeautifulSoup4/slack-desc b/python/BeautifulSoup4/slack-desc
index 2aa7bc4813..fda61011b6 100644
--- a/python/BeautifulSoup4/slack-desc
+++ b/python/BeautifulSoup4/slack-desc
@@ -9,7 +9,7 @@
 BeautifulSoup4: BeautifulSoup4 (Python HTML/XML parser)
 BeautifulSoup4:
 BeautifulSoup4: BeautifulSoup is a Python HTML/XML parser designed for quick
-BeautifulSoup4: turnaround projects like screen-scraping
+BeautifulSoup4: turnaround projects like screen-scraping.
 BeautifulSoup4:
 BeautifulSoup4: Homepage: http://www.crummy.com/software/BeautifulSoup/
 BeautifulSoup4:
diff --git a/python/PyGreSQL/PyGreSQL.SlackBuild b/python/PyGreSQL/PyGreSQL.SlackBuild
index 719d46aace..5f47869196 100644
--- a/python/PyGreSQL/PyGreSQL.SlackBuild
+++ b/python/PyGreSQL/PyGreSQL.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for PyGreSQL
 
-# Copyright 2013-2020, Christoph Willing,  Brisbane Australia
+# Copyright 2013-2021, Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=PyGreSQL
-VERSION=${VERSION:-5.2.1}
+VERSION=${VERSION:-5.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/PyGreSQL/PyGreSQL.info b/python/PyGreSQL/PyGreSQL.info
index 2f074e37b1..622e51a294 100644
--- a/python/PyGreSQL/PyGreSQL.info
+++ b/python/PyGreSQL/PyGreSQL.info
@@ -1,8 +1,8 @@
 PRGNAM="PyGreSQL"
-VERSION="5.2.1"
+VERSION="5.2.2"
 HOMEPAGE="http://www.pygresql.org"
-DOWNLOAD="https://github.com/PyGreSQL/PyGreSQL/archive/5.2.1/PyGreSQL-5.2.1.tar.gz"
-MD5SUM="57a58fa43d0e73101c049be26de4a715"
+DOWNLOAD="https://github.com/PyGreSQL/PyGreSQL/archive/5.2.2/PyGreSQL-5.2.2.tar.gz"
+MD5SUM="96f5a18492be4ad9aa5cf95fe7c1cae6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql"
diff --git a/python/Pygments/Pygments.SlackBuild b/python/Pygments/Pygments.SlackBuild
index cfeea2b0be..86ad345b0e 100644
--- a/python/Pygments/Pygments.SlackBuild
+++ b/python/Pygments/Pygments.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2009 Grissiom <chaos.proton@gmail.com>
 # Copyright 2009-2015 LukenShiro, Italy
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Pygments
-VERSION=${VERSION:-2.5.2}
+VERSION=${VERSION:-2.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/Pygments/Pygments.info b/python/Pygments/Pygments.info
index 8727823497..0db6100174 100644
--- a/python/Pygments/Pygments.info
+++ b/python/Pygments/Pygments.info
@@ -1,8 +1,8 @@
 PRGNAM="Pygments"
-VERSION="2.5.2"
+VERSION="2.8.1"
 HOMEPAGE="https://pygments.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.5.2.tar.gz"
-MD5SUM="465a35559863089d959d783a69f79b9f"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.8.1.tar.gz"
+MD5SUM="54b958b3eb6a59e778396eccc7158fff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/apprise/README b/python/apprise/README
new file mode 100644
index 0000000000..372f95c5f4
--- /dev/null
+++ b/python/apprise/README
@@ -0,0 +1,13 @@
+Apprise allows you to send a notification to almost all of the most
+popular notification services available to us today such as:
+Telegram, Discord, Slack, Amazon SNS, Gotify, etc.
+
+  * One notification library to rule them all.
+  * A common and intuitive notification syntax.
+  * Supports the handling of images and attachments
+    (to the notification services that will accept them).
+  * It's incredibly lightweight.
+  * Amazing response times because all messages sent asynchronously.
+
+NOTE: babel and pytest-runner are build requirements, but neither
+are runtime deps.
diff --git a/python/apprise/apprise.SlackBuild b/python/apprise/apprise.SlackBuild
new file mode 100644
index 0000000000..fc5943a8c8
--- /dev/null
+++ b/python/apprise/apprise.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for apprise
+
+# Copyright 2021 Justin Teague <arcadellama@posteo.net>
+# 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=apprise
+VERSION=${VERSION:-0.9.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+export PYTHONHASHSEED=0
+python setup.py install --root=$PKG
+
+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,README.md} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/apprise/apprise.info b/python/apprise/apprise.info
new file mode 100644
index 0000000000..ef752681a2
--- /dev/null
+++ b/python/apprise/apprise.info
@@ -0,0 +1,10 @@
+PRGNAM="apprise"
+VERSION="0.9.1"
+HOMEPAGE="https://github.com/caronc/apprise"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/a/apprise/apprise-0.9.1.tar.gz"
+MD5SUM="a40e7ddf76f31d5b5a386cf9a0d9b9c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 click decorator Markdown python-oauthlib python-requests requests-oauthlib six python-urllib3 PyYAML babel pytest-runner"
+MAINTAINER="Justin Teague"
+EMAIL="arcadellama@posteo.net"
diff --git a/python/apprise/slack-desc b/python/apprise/slack-desc
new file mode 100644
index 0000000000..71d06082de
--- /dev/null
+++ b/python/apprise/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+apprise: apprise (Multiplatform Push Notifications)
+apprise:
+apprise: Apprise allows you to send a notification to almost all of the most
+apprise: popular notification services available to us today such as:
+apprise: Telegram, Discord, Slack, Amazon SNS, Gotify, etc.
+apprise:
+apprise:
+apprise:
+apprise: Homepage: <https://github.com/caronc/apprise>
+apprise:
+apprise:
diff --git a/python/argon2-cffi/README b/python/argon2-cffi/README
new file mode 100644
index 0000000000..436ed532f2
--- /dev/null
+++ b/python/argon2-cffi/README
@@ -0,0 +1,3 @@
+Python implementation of the Argon2 secure password hashing algorithm.
+
+cffi must be built with Python 3 support.
diff --git a/python/argon2-cffi/argon2-cffi.SlackBuild b/python/argon2-cffi/argon2-cffi.SlackBuild
new file mode 100644
index 0000000000..0a7c55e808
--- /dev/null
+++ b/python/argon2-cffi/argon2-cffi.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for argon2-cffi
+
+# Copyright 2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# 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=argon2-cffi
+VERSION=${VERSION:-20.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+ARGON2_CFFI_USE_SYSTEM=1 python3 setup.py install --root=$PKG
+
+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 \
+  AUTHORS.rst CHANGELOG.rst FAQ.rst LICENSE README.rst SECURITY.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/argon2-cffi/argon2-cffi.info b/python/argon2-cffi/argon2-cffi.info
new file mode 100644
index 0000000000..5862e38054
--- /dev/null
+++ b/python/argon2-cffi/argon2-cffi.info
@@ -0,0 +1,10 @@
+PRGNAM="argon2-cffi"
+VERSION="20.1.0"
+HOMEPAGE="https://argon2-cffi.readthedocs.io/"
+DOWNLOAD="https://github.com/hynek/argon2-cffi/archive/20.1.0/argon2-cffi-20.1.0.tar.gz"
+MD5SUM="71b3bb567cad3de787275c5e2fca18f2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="argon2 cffi python3"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/argon2-cffi/slack-desc b/python/argon2-cffi/slack-desc
new file mode 100644
index 0000000000..004b4bbcaa
--- /dev/null
+++ b/python/argon2-cffi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+argon2-cffi: argon2-cffi (Python implementation of Argon2)
+argon2-cffi:
+argon2-cffi: Python implementation of the Argon2 secure password hashing algorithm.
+argon2-cffi:
+argon2-cffi:
+argon2-cffi:
+argon2-cffi:
+argon2-cffi:
+argon2-cffi:
+argon2-cffi:
+argon2-cffi:
diff --git a/python/arrow/README b/python/arrow/README
index eff6722e05..bbe263c707 100644
--- a/python/arrow/README
+++ b/python/arrow/README
@@ -1,6 +1,6 @@
-Arrow is a Python library that offers a sensible, human-friendly approach to
-creating, manipulating, formatting and converting dates, times, and
-timestamps. It implements and updates the datetime type, plugging gaps in
-functionality, and provides an intelligent module API that supports many
-common creation scenarios. Simply put, it helps you work with dates and times
-with fewer imports and a lot less code.
+Arrow is a Python library that offers a sensible, human-friendly approach
+to creating, manipulating, formatting and converting dates, times, and
+timestamps. It implements and updates the datetime type, plugging gaps
+in functionality, and provides an intelligent module API that supports
+many common creation scenarios. Simply put, it helps you work with dates
+and times with fewer imports and a lot less code.
diff --git a/python/arrow/arrow.SlackBuild b/python/arrow/arrow.SlackBuild
index f074f422d7..824ca2dc80 100644
--- a/python/arrow/arrow.SlackBuild
+++ b/python/arrow/arrow.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for arrow
 
-# Copyright 2018-2019  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2018-2021  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@onlne.no>
 
 PRGNAM=arrow
-VERSION=${VERSION:-0.15.2}
+VERSION=${VERSION:-0.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/arrow/arrow.info b/python/arrow/arrow.info
index 3feb0f1089..cdb8d13ca9 100644
--- a/python/arrow/arrow.info
+++ b/python/arrow/arrow.info
@@ -1,10 +1,10 @@
 PRGNAM="arrow"
-VERSION="0.15.2"
+VERSION="0.17.0"
 HOMEPAGE="https://github.com/crsmithdev/arrow"
-DOWNLOAD="https://github.com/crsmithdev/arrow/archive/0.15.2/arrow-0.15.2.tar.gz"
-MD5SUM="33bc3e0628cc3dfaa6b3817998b1f9b2"
+DOWNLOAD="https://github.com/crsmithdev/arrow/archive/0.17.0/arrow-0.17.0.tar.gz"
+MD5SUM="a8795efc47828c59d0a9724dcefc3e44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="functools-lru-cache"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/python/async_generator/README b/python/async_generator/README
new file mode 100644
index 0000000000..f7a5e23464
--- /dev/null
+++ b/python/async_generator/README
@@ -0,0 +1 @@
+async_generator makes it easy to write async iterators in Python 3.
diff --git a/python/async_generator/async_generator.SlackBuild b/python/async_generator/async_generator.SlackBuild
new file mode 100644
index 0000000000..bafbc7f6c7
--- /dev/null
+++ b/python/async_generator/async_generator.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for async_generator
+
+# Copyright 2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# 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=async_generator
+VERSION=${VERSION:-1.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python3 setup.py install --root=$PKG
+
+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 \
+  CONTRIBUTING.md LICENSE README.rst \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/async_generator/async_generator.info b/python/async_generator/async_generator.info
new file mode 100644
index 0000000000..8a2f511b02
--- /dev/null
+++ b/python/async_generator/async_generator.info
@@ -0,0 +1,10 @@
+PRGNAM="async_generator"
+VERSION="1.10"
+HOMEPAGE="https://github.com/python-trio/async_generator"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/a/async_generator/async_generator-1.10.tar.gz"
+MD5SUM="078a29b4afb3d7f38c097a530f042a55"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python3-certifi/slack-desc b/python/async_generator/slack-desc
index cc79fa4126..6392c33396 100644
--- a/python/python3-certifi/slack-desc
+++ b/python/async_generator/slack-desc
@@ -6,14 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                |-----handy-ruler------------------------------------------------------|
-python3-certifi: python3-certifi (Python SSL Certificates)
-python3-certifi:
-python3-certifi: This installable Python package contains a python3-certifi: CA
-python3-certifi: Bundle that you can reference in your Python code.
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
-python3-certifi:
+async_generator: async_generator (async iterators)
+async_generator:
+async_generator: async_generator makes it easy to write async iterators in Python 3.
+async_generator: 
+async_generator:
+async_generator:
+async_generator:
+async_generator:
+async_generator:
+async_generator:
diff --git a/python/backcall/backcall.SlackBuild b/python/backcall/backcall.SlackBuild
index bfde1381e4..8e69a0fe56 100644
--- a/python/backcall/backcall.SlackBuild
+++ b/python/backcall/backcall.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for backcall
 
-# Copyright 2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=backcall
-VERSION=${VERSION:-0.1.0}
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,6 @@ 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 {} \;
 
-python setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/backcall/backcall.info b/python/backcall/backcall.info
index 989b462454..abfb4a3da7 100644
--- a/python/backcall/backcall.info
+++ b/python/backcall/backcall.info
@@ -1,8 +1,8 @@
 PRGNAM="backcall"
-VERSION="0.1.0"
+VERSION="0.2.0"
 HOMEPAGE="https://github.com/takluyver/backcall"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/b/backcall/backcall-0.1.0.tar.gz"
-MD5SUM="87ce0c7839808e6a3427d57df6a792e7"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/b/backcall/backcall-0.2.0.tar.gz"
+MD5SUM="1f4c9a370c78743406296f48e56e8821"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/bleach/bleach.SlackBuild b/python/bleach/bleach.SlackBuild
index c66f712d93..60208954df 100644
--- a/python/bleach/bleach.SlackBuild
+++ b/python/bleach/bleach.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bleach
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bleach
-VERSION=${VERSION:-3.1.5}
+VERSION=${VERSION:-3.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/bleach/bleach.info b/python/bleach/bleach.info
index bb0366079a..db8204f141 100644
--- a/python/bleach/bleach.info
+++ b/python/bleach/bleach.info
@@ -1,8 +1,8 @@
 PRGNAM="bleach"
-VERSION="3.1.5"
+VERSION="3.3.0"
 HOMEPAGE="https://github.com/mozilla/bleach"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/b/bleach/bleach-3.1.5.tar.gz"
-MD5SUM="63cae08551307156ec636465aff5183e"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/b/bleach/bleach-3.3.0.tar.gz"
+MD5SUM="0a9d302444b252e7adb2fda175be22d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-webencodings packaging python3-packaging"
diff --git a/python/cheetah3/cheetah3.SlackBuild b/python/cheetah3/cheetah3.SlackBuild
index e958dd3a99..045e0e4826 100644
--- a/python/cheetah3/cheetah3.SlackBuild
+++ b/python/cheetah3/cheetah3.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="cheetah3"
-VERSION=${VERSION:-3.2.5}
+VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ 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"
@@ -85,5 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/cheetah3/cheetah3.info b/python/cheetah3/cheetah3.info
index 9bb6b51e3d..87dbcbd122 100644
--- a/python/cheetah3/cheetah3.info
+++ b/python/cheetah3/cheetah3.info
@@ -1,8 +1,8 @@
 PRGNAM="cheetah3"
-VERSION="3.2.5"
+VERSION="3.2.6"
 HOMEPAGE="https://www.cheetahtemplate.org/"
-DOWNLOAD="https://github.com/CheetahTemplate3/cheetah3/archive/3.2.5/cheetah3-3.2.5.tar.gz"
-MD5SUM="dbbcaa0396c528ae14c7a172799fd08c"
+DOWNLOAD="https://github.com/CheetahTemplate3/cheetah3/archive/3.2.6/cheetah3-3.2.6.tar.gz"
+MD5SUM="04e16c7abcca12017ef8df5bc4700ce9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/cheetah3/slack-desc b/python/cheetah3/slack-desc
index 55debe1e6a..f37d35ce21 100644
--- a/python/cheetah3/slack-desc
+++ b/python/cheetah3/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-cheetah3: cheetah3 (Python3 template engine and code-generation tool)
+cheetah3: Cheetah3 (Python3 template engine and code-generation tool)
 cheetah3:
 cheetah3: Cheetah3 is a free and open source template engine and code-
 cheetah3: generation tool written in Python. Cheetah can be used unto itself,
diff --git a/python/click-didyoumean/README b/python/click-didyoumean/README
new file mode 100644
index 0000000000..0c6cd35470
--- /dev/null
+++ b/python/click-didyoumean/README
@@ -0,0 +1,6 @@
+Enable git-like did-you-mean feature in click.
+For Python2 and Python3.
+
+OPTIONAL:
+
+python3
diff --git a/python/click-didyoumean/click-didyoumean.SlackBuild b/python/click-didyoumean/click-didyoumean.SlackBuild
new file mode 100644
index 0000000000..2fe92160b6
--- /dev/null
+++ b/python/click-didyoumean/click-didyoumean.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# SlackBuild build script for click-didyoumean
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=click-didyoumean
+SRCPKG=${SRCPKG-click-didyoumean}
+VERSION=${VERSION:-0.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG | cut -d- -f1-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+#set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/click-didyoumean/click-didyoumean.info b/python/click-didyoumean/click-didyoumean.info
new file mode 100644
index 0000000000..76299c5fe8
--- /dev/null
+++ b/python/click-didyoumean/click-didyoumean.info
@@ -0,0 +1,10 @@
+PRGNAM="click-didyoumean"
+VERSION="0.0.3"
+HOMEPAGE="https://pypi.org/project/click-didyoumean/"
+DOWNLOAD="https://files.pythonhosted.org/packages/9f/79/d265d783dd022541b744d002745d9e55d84c04a41930e35d8795934f6526/click-didyoumean-0.0.3.tar.gz"
+MD5SUM="08ac34aa0355f58ffc43ee57f1969ffb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/click-didyoumean/slack-desc b/python/click-didyoumean/slack-desc
new file mode 100644
index 0000000000..c3cd09ad2b
--- /dev/null
+++ b/python/click-didyoumean/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+click-didyoumean: click-didyoumean (Enable git-like did-you-mean feature in click.)
+click-didyoumean:
+click-didyoumean: Use specific did-you-mean group class for your cli:
+click-didyoumean: Or you it in a CommandCollection:
+click-didyoumean:
+click-didyoumean: max_suggestions int 3 Maximal number of did-you-mean suggestions
+click-didyoumean: There are two configuration for the DYMGroup and DYMCommandCollection:
+click-didyoumean: cutoff float 0.5 Possibilities that don’t score at least that similar
+click-didyoumean: to word are ignored.
+click-didyoumean:
+click-didyoumean: Homepage: https://pypi.org/project/click-didyoumean/
diff --git a/python/click-repl/README b/python/click-repl/README
new file mode 100644
index 0000000000..89e6ffaa86
--- /dev/null
+++ b/python/click-repl/README
@@ -0,0 +1,6 @@
+REPL plugin for Click
+For Python2 and Python3.
+
+OPTIONAL:
+
+python3
diff --git a/python/click-repl/click-repl.SlackBuild b/python/click-repl/click-repl.SlackBuild
new file mode 100644
index 0000000000..c2b00b984f
--- /dev/null
+++ b/python/click-repl/click-repl.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# SlackBuild build script for click-repl
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=click-repl
+SRCPKG=${SRCPKG-click-repl}
+VERSION=${VERSION:-0.1.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG | cut -d- -f1-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/click-repl/click-repl.info b/python/click-repl/click-repl.info
new file mode 100644
index 0000000000..f04702a1fa
--- /dev/null
+++ b/python/click-repl/click-repl.info
@@ -0,0 +1,10 @@
+PRGNAM="click-repl"
+VERSION="0.1.6"
+HOMEPAGE="https://pypi.org/project/click-repl/"
+DOWNLOAD="https://files.pythonhosted.org/packages/51/99/6a722e232f92fdc21c46fd042fea63e7c2fcda3086ff5db62edd595d3f49/click-repl-0.1.6.tar.gz"
+MD5SUM="2d5f4d42cbd1da9a50a49dff4d6087ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/click-repl/slack-desc b/python/click-repl/slack-desc
new file mode 100644
index 0000000000..512820ba1f
--- /dev/null
+++ b/python/click-repl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |----------------------------------------------------------------------|
+click-repl: click-repl (REPL plugin for Click)
+click-repl:
+click-repl:
+click-repl:
+click-repl:
+click-repl:
+click-repl: Homepage: https://pypi.org/project/click-repl/
+click-repl:
+click-repl:
+click-repl:
+click-repl:
diff --git a/python/cloudscraper/cloudscraper.info b/python/cloudscraper/cloudscraper.info
index 36f12b31dd..986aa684e0 100644
--- a/python/cloudscraper/cloudscraper.info
+++ b/python/cloudscraper/cloudscraper.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/VeNoMouS/cloudscraper/archive/1.2.20/cloudscraper-1
 MD5SUM="1c48f66c34dc53588ef56d7e662cab67"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-certifi python-requests"
+REQUIRES="python-certifi python-requests"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/python/cssselect2/README b/python/cssselect2/README
new file mode 100644
index 0000000000..1d03bffc5b
--- /dev/null
+++ b/python/cssselect2/README
@@ -0,0 +1,7 @@
+select2 is a straightforward implementation of CSS3 Selectors for markup
+documents (HTML, XML, etc.) that can be read by ElementTree-like parsers
+(including cElementTree, lxml, html5lib, etc.)
+
+OPTIONAL:
+
+python3
diff --git a/python/cssselect2/cssselect2.SlackBuild b/python/cssselect2/cssselect2.SlackBuild
new file mode 100644
index 0000000000..8c23b15dd9
--- /dev/null
+++ b/python/cssselect2/cssselect2.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for cssselect2
+
+# Copyright 2021 Dimitris Zlatanidis Orestiada, Greece
+# 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=cssselect2
+VERSION=${VERSION:-0.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python setup.py install --root=$PKG
+
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+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 PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/cssselect2/cssselect2.info b/python/cssselect2/cssselect2.info
new file mode 100644
index 0000000000..eb16825923
--- /dev/null
+++ b/python/cssselect2/cssselect2.info
@@ -0,0 +1,10 @@
+PRGNAM="cssselect2"
+VERSION="0.4.1"
+HOMEPAGE="https://doc.courtbouillon.org/cssselect2/latest/"
+DOWNLOAD="https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0/cssselect2-0.4.1.tar.gz"
+MD5SUM="6dfd5963c8a5d85f2634d1650b1ddfe1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="tinycss2"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/cssselect2/slack-desc b/python/cssselect2/slack-desc
new file mode 100644
index 0000000000..ebd37032a8
--- /dev/null
+++ b/python/cssselect2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+cssselect2: cssselect2 (cssselect2 is a straightforward implementation of CSS3)
+cssselect2:
+cssselect2: cssselect2 is a straightforward implementation of CSS3  Selectors
+cssselect2: for markup documents (HTML, XML, etc.) that can be read by
+cssselect2: ElementTree-like parsers (including cElementTree, lxml,
+cssselect2: html5lib, etc.)
+cssselect2:
+cssselect2: Homepage: https://doc.courtbouillon.org/cssselect2/latest/
+cssselect2:
+cssselect2:
+cssselect2:
diff --git a/python/curtsies/README b/python/curtsies/README
index 02f1d5f73d..262cdfd755 100644
--- a/python/curtsies/README
+++ b/python/curtsies/README
@@ -1,4 +1,2 @@
 Curses-like terminal wrapper with a display based on compositing
 2d arrays of text.
-
-Optional dependency: python3
diff --git a/python/curtsies/curtsies.SlackBuild b/python/curtsies/curtsies.SlackBuild
index 8e0f82e29c..65197ae163 100644
--- a/python/curtsies/curtsies.SlackBuild
+++ b/python/curtsies/curtsies.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for curtsies
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=curtsies
-VERSION=${VERSION:-0.3.0}
+VERSION=${VERSION:-0.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,16 +69,11 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/python/curtsies/curtsies.info b/python/curtsies/curtsies.info
index 78ba063494..d4cbd06399 100644
--- a/python/curtsies/curtsies.info
+++ b/python/curtsies/curtsies.info
@@ -1,10 +1,10 @@
 PRGNAM="curtsies"
-VERSION="0.3.0"
+VERSION="0.3.5"
 HOMEPAGE="https://github.com/thomasballinger/curtsies"
-DOWNLOAD="https://files.pythonhosted.org/packages/78/1e/3b69f26d9e496901e80fc90e39e479c85fb6df595c2e2935a4fd781b3c9b/curtsies-0.3.0.tar.gz"
-MD5SUM="20e7295c9592b4101915131a685725f0"
+DOWNLOAD="https://files.pythonhosted.org/packages/ee/17/9647eb1c537734adba77bd4613a2a6563a1439444827323cfe37652f9822/curtsies-0.3.5.tar.gz"
+MD5SUM="ed2c16be1b6e913d0bfff7233c33da8a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="blessings wcwidth"
+REQUIRES="python3 blessings cwcwidth"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/cwcwidth/README b/python/cwcwidth/README
new file mode 100644
index 0000000000..27da640e15
--- /dev/null
+++ b/python/cwcwidth/README
@@ -0,0 +1,2 @@
+cwcwidth provides Python bindings for wcwidth and wcswidth functions
+defined in POSIX.1-2001 and POSIX.1-2008 based on Cython.
diff --git a/python/cwcwidth/cwcwidth.SlackBuild b/python/cwcwidth/cwcwidth.SlackBuild
new file mode 100644
index 0000000000..ad631eb5b9
--- /dev/null
+++ b/python/cwcwidth/cwcwidth.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for cwcwidth
+
+# Copyright 2021 Dimitris Zlatanidis Orestiada, Greece
+# 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=cwcwidth
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python3 setup.py install --root=$PKG
+
+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.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/cwcwidth/cwcwidth.info b/python/cwcwidth/cwcwidth.info
new file mode 100644
index 0000000000..356d5fd797
--- /dev/null
+++ b/python/cwcwidth/cwcwidth.info
@@ -0,0 +1,10 @@
+PRGNAM="cwcwidth"
+VERSION="0.1.1"
+HOMEPAGE="https://github.com/sebastinas/cwcwidth"
+DOWNLOAD="https://files.pythonhosted.org/packages/77/3a/7674069b8b8a40b1e25eea33c3a228b8d57c24f3e286e6de1825e0e02437/cwcwidth-0.1.1.tar.gz"
+MD5SUM="99f8656b490f5cd8e71cdd01f2ab8f38"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/cwcwidth/slack-desc b/python/cwcwidth/slack-desc
new file mode 100644
index 0000000000..96cb9fae6b
--- /dev/null
+++ b/python/cwcwidth/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+cwcwidth: cwcwidth (Python bindings for wcwidth and wcswidth)
+cwcwidth:
+cwcwidth: cwcwidth provides Python bindings for wcwidth and wcswidth functions
+cwcwidth: defined in POSIX.1-2001 and POSIX.1-2008 based on Cython.
+cwcwidth: These functions compute the printable length of a unicode characters
+cwcwidth: The module provides the same functions as wcwidth and its behavior
+cwcwidth: is compatible.
+cwcwidth:
+cwcwidth: Homepage: https://github.com/sebastinas/cwcwidth
+cwcwidth:
+cwcwidth:
diff --git a/python/decorator/decorator.SlackBuild b/python/decorator/decorator.SlackBuild
index b3ff9d4f45..f734e04f93 100644
--- a/python/decorator/decorator.SlackBuild
+++ b/python/decorator/decorator.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for decorator
 
 # Copyright 2013 Mikko Värri, Finland
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=decorator
-VERSION=${VERSION:-4.4.2}
+VERSION=${VERSION:-5.0.7}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/python/decorator/decorator.info b/python/decorator/decorator.info
index d292bcfceb..6d45f491b2 100644
--- a/python/decorator/decorator.info
+++ b/python/decorator/decorator.info
@@ -1,8 +1,8 @@
 PRGNAM="decorator"
-VERSION="4.4.2"
+VERSION="5.0.7"
 HOMEPAGE="https://pypi.python.org/pypi/decorator"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/d/decorator/decorator-4.4.2.tar.gz"
-MD5SUM="d83c624cce93e6bdfab144821b526e1d"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/d/decorator/decorator-5.0.7.tar.gz"
+MD5SUM="c35b2a3446478986e91b15ad1626e152"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/defusedxml/defusedxml.SlackBuild b/python/defusedxml/defusedxml.SlackBuild
index ac016c8dd3..804bd6c467 100644
--- a/python/defusedxml/defusedxml.SlackBuild
+++ b/python/defusedxml/defusedxml.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=defusedxml
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/defusedxml/defusedxml.info b/python/defusedxml/defusedxml.info
index ebe00b33e1..458c2e9feb 100644
--- a/python/defusedxml/defusedxml.info
+++ b/python/defusedxml/defusedxml.info
@@ -1,8 +1,8 @@
 PRGNAM="defusedxml"
-VERSION="0.6.0"
+VERSION="0.7.1"
 HOMEPAGE="https://pypi.python.org/pypi/defusedxml"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/d/defusedxml/defusedxml-0.6.0.tar.gz"
-MD5SUM="a59741f675c4cba649de40a99f732897"
+DOWNLOAD="https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz"
+MD5SUM="a50e7f21aa60a741efe6b1b658dfb3f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/esptool/esptool.SlackBuild b/python/esptool/esptool.SlackBuild
index bbef07de5a..f3952f1fd1 100644
--- a/python/esptool/esptool.SlackBuild
+++ b/python/esptool/esptool.SlackBuild
@@ -23,11 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# note to self. github source tar.gz misses out typeshed directory contents,
-# so use pypi.org/project/mypy download source tar.gz instead.
+# note to self. github source tar.gz can miss out some directory contents,
+# so use pypi.org/project/esptool download source tar.gz instead.
 
 PRGNAM=esptool
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/esptool/esptool.info b/python/esptool/esptool.info
index 0a60442c31..26e5b1913b 100644
--- a/python/esptool/esptool.info
+++ b/python/esptool/esptool.info
@@ -1,8 +1,8 @@
 PRGNAM="esptool"
-VERSION="2.8"
+VERSION="3.0"
 HOMEPAGE="https://github.com/espressif/esptool"
-DOWNLOAD="https://files.pythonhosted.org/packages/68/91/08c182f66fa3f12a96e754ae8ec7762abb2d778429834638f5746f81977a/esptool-2.8.tar.gz"
-MD5SUM="d17b9293910773045b9de0d5caa0597d"
+DOWNLOAD="https://files.pythonhosted.org/packages/dd/3d/d1d4c004927e6e6807c441ce70330ed969c725d2906053fbd2ff994b4439/esptool-3.0.tar.gz"
+MD5SUM="ccd2855e14c298712aeb37ac063baad5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyserial"
diff --git a/python/hachoir/README b/python/hachoir/README
new file mode 100644
index 0000000000..bec701234a
--- /dev/null
+++ b/python/hachoir/README
@@ -0,0 +1,3 @@
+Hachoir is a Python library to view and edit a binary stream field by field.
+In other words, Hachoir allows you to browse any binary stream just like you
+browse directories and files.
diff --git a/python/hachoir/hachoir.SlackBuild b/python/hachoir/hachoir.SlackBuild
new file mode 100644
index 0000000000..186b3e1777
--- /dev/null
+++ b/python/hachoir/hachoir.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+# SlackBuild script for hachoir
+# Copyright (c) 2000-2021 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=hachoir
+VERSION=${VERSION:-3.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/hachoir/hachoir.info b/python/hachoir/hachoir.info
new file mode 100644
index 0000000000..d4c93b0dc1
--- /dev/null
+++ b/python/hachoir/hachoir.info
@@ -0,0 +1,10 @@
+PRGNAM="hachoir"
+VERSION="3.1.1"
+HOMEPAGE="https://pypi.python.org/pypi/hachoir"
+DOWNLOAD="https://files.pythonhosted.org/packages/a9/27/cec720492aba5f45161e0dd91213337a3e1f8c700f4e486f41b1d01d0552/hachoir-3.1.1.tar.gz"
+MD5SUM="880ee1744ccabb90b7e4863e95efa143"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/hachoir/slack-desc b/python/hachoir/slack-desc
new file mode 100644
index 0000000000..0a91b69423
--- /dev/null
+++ b/python/hachoir/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+hachoir: hachoir (library to view and edit binary stream field by field)
+hachoir:
+hachoir: A file is splitted in tree of fields, where smallest field is one bit.
+hachoir: Ex: fields types: integers, strings, bits, padding types, floats, etc.
+hachoir:
+hachoir: hachoir-grep: find a text pattern in a binary file
+hachoir: hachoir-metadata: get metadata from binary files
+hachoir: hachoir-strip: modify a file to remove metadata
+hachoir: hachoir-urwid: display the content of a binary file in text mode
+hachoir:
+hachoir: Homepage: https://pypi.python.org/pypi/hachoir
diff --git a/python/importlib-resources/README b/python/importlib-resources/README
new file mode 100644
index 0000000000..a03e88248d
--- /dev/null
+++ b/python/importlib-resources/README
@@ -0,0 +1,10 @@
+importlib-resources is a backport of Python standard library
+importlib.resources module for older Pythons.
+
+The key goal of this module is to replace parts of pkg_resources with a
+solution in Python's stdlib that relies on well-defined APIs. This makes
+reading resources included in packages easier, with more stable and
+consistent semantics.
+
+*NOTE*: you have to build the dependencies (python3 excluded) with
+python3 already installed.
diff --git a/python/importlib-resources/importlib-resources.SlackBuild b/python/importlib-resources/importlib-resources.SlackBuild
new file mode 100644
index 0000000000..d1f8359675
--- /dev/null
+++ b/python/importlib-resources/importlib-resources.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Slackware build script for importlib-resources
+
+# Copyright 2021- Dave Woodfall <dave@slackbuilds.org>
+# 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=importlib-resources
+SRCNAM=$( printf %s $PRGNAM | tr - _ )
+VERSION=${VERSION:-5.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i "s,^name =.*$,&\nversion = $VERSION," setup.cfg
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -r LICENSE README.rst docs $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/importlib-resources/importlib-resources.info b/python/importlib-resources/importlib-resources.info
new file mode 100644
index 0000000000..668c0c4f57
--- /dev/null
+++ b/python/importlib-resources/importlib-resources.info
@@ -0,0 +1,10 @@
+PRGNAM="importlib-resources"
+VERSION="5.1.0"
+HOMEPAGE="https://pypi.org/project/importlib-resources/"
+DOWNLOAD="https://files.pythonhosted.org/packages/e7/ef/8bf9f2469c2c0a1bf00c39b2a076f71c4e511a3014a296b50eb425a2633d/importlib_resources-5.1.0.tar.gz"
+MD5SUM="a3ca1dce486f7fba1691938124e54133"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 python-toml setuptools-scm"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/python/importlib-resources/slack-desc b/python/importlib-resources/slack-desc
new file mode 100644
index 0000000000..9f8a7c40de
--- /dev/null
+++ b/python/importlib-resources/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+importlib-resources: importlib-resources (backport of Python stdlib importlib.resources)
+importlib-resources:
+importlib-resources: importlib-resources is a backport of Python standard library
+importlib-resources: importlib.resources module for older Pythons.
+importlib-resources:
+importlib-resources: https://pypi.org/project/importlib-resources/
+importlib-resources:
+importlib-resources:
+importlib-resources:
+importlib-resources:
+importlib-resources:
diff --git a/python/internetarchive/internetarchive.SlackBuild b/python/internetarchive/internetarchive.SlackBuild
index b09b4e2dc8..d6d19e913b 100644
--- a/python/internetarchive/internetarchive.SlackBuild
+++ b/python/internetarchive/internetarchive.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=internetarchive
-VERSION=${VERSION:-1.9.4}
+VERSION=${VERSION:-2.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/internetarchive/internetarchive.info b/python/internetarchive/internetarchive.info
index 877713c229..4571deb719 100644
--- a/python/internetarchive/internetarchive.info
+++ b/python/internetarchive/internetarchive.info
@@ -1,8 +1,8 @@
 PRGNAM="internetarchive"
-VERSION="1.9.4"
+VERSION="2.0.1"
 HOMEPAGE="https://github.com/jjjake/internetarchive"
-DOWNLOAD="https://github.com/jjjake/internetarchive/archive/v1.9.4/internetarchive-1.9.4.tar.gz"
-MD5SUM="bbbd9f9bcfb81996eeb4afe2f9bea079"
+DOWNLOAD="https://github.com/jjjake/internetarchive/archive/v2.0.1/internetarchive-2.0.1.tar.gz"
+MD5SUM="cd546a46d513990d7f9b175f746ed6af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="docopt python-requests python3-six schema tqdm"
diff --git a/python/josepy/josepy.SlackBuild b/python/josepy/josepy.SlackBuild
index 43f272e218..5ba76cea36 100644
--- a/python/josepy/josepy.SlackBuild
+++ b/python/josepy/josepy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for josepy
 
-# Copyright 2018-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2018-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=josepy
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/josepy/josepy.info b/python/josepy/josepy.info
index c26a25b2d2..cc054803a0 100644
--- a/python/josepy/josepy.info
+++ b/python/josepy/josepy.info
@@ -1,8 +1,8 @@
 PRGNAM="josepy"
-VERSION="1.4.0"
+VERSION="1.8.0"
 HOMEPAGE="https://github.com/certbot/josepy"
-DOWNLOAD="https://files.pythonhosted.org/packages/0b/72/616c591e74eb5f9570dd636f91dfddd0d4613088ce43e581e80b826dc964/josepy-1.4.0.tar.gz"
-MD5SUM="3d355835ee07c243ab0960eb53f17fcc"
+DOWNLOAD="https://files.pythonhosted.org/packages/80/0d/4a2c00b8683b9e6c0fffa9b723dfa07feb3e8bcc6adcdf0890cf7501acd0/josepy-1.8.0.tar.gz"
+MD5SUM="5671731166253bc2407454fac9032089"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/mypy/mypy.SlackBuild b/python/mypy/mypy.SlackBuild
index 63f1635c35..6109b3be2b 100644
--- a/python/mypy/mypy.SlackBuild
+++ b/python/mypy/mypy.SlackBuild
@@ -27,7 +27,7 @@
 # so use pypi.org/project/mypy download source tar.gz instead.
 
 PRGNAM=mypy
-VERSION=${VERSION:-0.790}
+VERSION=${VERSION:-0.812}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/mypy/mypy.info b/python/mypy/mypy.info
index 0362d3a962..685f64fc5f 100644
--- a/python/mypy/mypy.info
+++ b/python/mypy/mypy.info
@@ -1,10 +1,10 @@
 PRGNAM="mypy"
-VERSION="0.790"
+VERSION="0.812"
 HOMEPAGE="https://github.com/python/mypy"
-DOWNLOAD="https://files.pythonhosted.org/packages/17/42/cb8f0c1d8191bee469538ccc901c07d0ba1c545a84ea85da82f45c669a41/mypy-0.790.tar.gz"
-MD5SUM="2e92a8ce0ff0dfc9cee059b4fcccdfc4"
+DOWNLOAD="https://files.pythonhosted.org/packages/78/b1/6079ca9a5afbedb663a0c3db82bd2bcba1574ccdb55acd9b9855ed79dd39/mypy-0.812.tar.gz"
+MD5SUM="ba137961f1aa570fb8af920201c62014"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="typed_ast typing-extensions %README%"
+REQUIRES="typed_ast typing-extensions mypy_extensions %README%"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/python/mypy_extensions/mypy_extensions.info b/python/mypy_extensions/mypy_extensions.info
index 6e1ee4166f..aca671871e 100644
--- a/python/mypy_extensions/mypy_extensions.info
+++ b/python/mypy_extensions/mypy_extensions.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/63/60/0582ce2eaced55f65a4406fc
 MD5SUM="4163ff73d0db8631c0a78bb55b551c84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mypy"
+REQUIRES="python3"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/python/nest_asyncio/README b/python/nest_asyncio/README
new file mode 100644
index 0000000000..212658bb31
--- /dev/null
+++ b/python/nest_asyncio/README
@@ -0,0 +1,10 @@
+By design asyncio does not allow its event loop to be nested. This presents a
+practical problem: When in an environment where the event loop is already
+running it's impossible to run tasks and wait for the result. Trying to do so
+will give the error "RuntimeError: This event loop is already running".
+
+The issue pops up in various environments, such as web servers, GUI
+applications and in Jupyter notebooks.
+
+This module patches asyncio to allow nested use of asyncio.run and
+loop.run_until_complete.
diff --git a/python/nest_asyncio/nest_asyncio.SlackBuild b/python/nest_asyncio/nest_asyncio.SlackBuild
new file mode 100644
index 0000000000..64607ec277
--- /dev/null
+++ b/python/nest_asyncio/nest_asyncio.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for nest_asyncio
+
+# Copyright 2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# 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=nest_asyncio
+VERSION=${VERSION:-1.5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python3 setup.py install --root=$PKG
+
+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 README.rst \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/nest_asyncio/nest_asyncio.info b/python/nest_asyncio/nest_asyncio.info
new file mode 100644
index 0000000000..8286b6e43b
--- /dev/null
+++ b/python/nest_asyncio/nest_asyncio.info
@@ -0,0 +1,10 @@
+PRGNAM="nest_asyncio"
+VERSION="1.5.1"
+HOMEPAGE="https://github.com/erdewit/nest_asyncio"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nest_asyncio/nest_asyncio-1.5.1.tar.gz"
+MD5SUM="6271f5e4181736c2e711657ef1eae915"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/nest_asyncio/slack-desc b/python/nest_asyncio/slack-desc
new file mode 100644
index 0000000000..4b9f869fc5
--- /dev/null
+++ b/python/nest_asyncio/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+nest_asyncio: nest_asyncio (nested async event loops)
+nest_asyncio:
+nest_asyncio: This module patches asyncio to allow nested use of asyncio.run and
+nest_asyncio: loop.run_until_complete.
+nest_asyncio:
+nest_asyncio:
+nest_asyncio:
+nest_asyncio:
+nest_asyncio:
+nest_asyncio:
diff --git a/python/npm/README b/python/npm/README
new file mode 100644
index 0000000000..b2014b2e6b
--- /dev/null
+++ b/python/npm/README
@@ -0,0 +1,4 @@
+Python bindings and utils for npm.
+Invokes npm's install command in a specified directory. 
+Install blocks the python process and will direct npm's output to
+stdout.
diff --git a/python/npm/npm.SlackBuild b/python/npm/npm.SlackBuild
new file mode 100644
index 0000000000..02e0278189
--- /dev/null
+++ b/python/npm/npm.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# SlackBuild build script for npm
+
+# Copyright (c) 2000-2020 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=npm
+SRCPKG=${SRCPKG-npm}
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+
+# Fix required version of optional-django.
+sed -i "s/optional-django==0.1.0/optional-django==0.3.0/g" setup.py
+sed -i "s/optional-django==0.1.0/optional-django==0.3.0/g" npm.egg-info/requires.txt
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/npm/npm.info b/python/npm/npm.info
new file mode 100644
index 0000000000..e1733cc4e7
--- /dev/null
+++ b/python/npm/npm.info
@@ -0,0 +1,10 @@
+PRGNAM="npm"
+VERSION="0.1.1"
+HOMEPAGE="https://pypi.org/project/npm/"
+DOWNLOAD="https://files.pythonhosted.org/packages/ca/4d/7d59d82b777f3f7a1128608195655a1b36c1de89c292363d53d52d92a807/npm-0.1.1.tar.gz"
+MD5SUM="c87635e753df39cd4a6bf626bd6e2956"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="optional-django nose"
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/npm/slack-desc b/python/npm/slack-desc
new file mode 100644
index 0000000000..45d75139fb
--- /dev/null
+++ b/python/npm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+npm: npm (Python bindings and utils for npm.)
+npm:
+npm: In short, Invokes npm's install command in a specified directory.
+npm: Install blocks the python process and will direct npm's output ...
+npm:
+npm:
+npm: Homepage: https://pypi.org/project/npm/
+npm:
+npm:
+npm:
+npm:
diff --git a/python/numexpr/numexpr.SlackBuild b/python/numexpr/numexpr.SlackBuild
index db4f95f43f..ada74e1d63 100644
--- a/python/numexpr/numexpr.SlackBuild
+++ b/python/numexpr/numexpr.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for numexpr
 
 # Copyright 2010-2015  LukenShiro, Italy
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=numexpr
-VERSION=${VERSION:-2.7.1}
+VERSION=${VERSION:-2.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/numexpr/numexpr.info b/python/numexpr/numexpr.info
index 3fc81b53c0..baeb7dc4fb 100644
--- a/python/numexpr/numexpr.info
+++ b/python/numexpr/numexpr.info
@@ -1,8 +1,8 @@
 PRGNAM="numexpr"
-VERSION="2.7.1"
+VERSION="2.7.2"
 HOMEPAGE="https://github.com/pydata/numexpr"
-DOWNLOAD="https://pypi.python.org/packages/source/n/numexpr/numexpr-2.7.1.tar.gz"
-MD5SUM="b96931414667e7772be93f9ea6280b36"
+DOWNLOAD="https://pypi.python.org/packages/source/n/numexpr/numexpr-2.7.2.tar.gz"
+MD5SUM="d41e3345b19209713b195f03ca5a3ee0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numpy3"
diff --git a/python/optional-django/README b/python/optional-django/README
new file mode 100644
index 0000000000..d36a011430
--- /dev/null
+++ b/python/optional-django/README
@@ -0,0 +1,3 @@
+Utils for providing optional support for django.
+In short, this is a grab bag of utils to shim around environments
+which may or may not include a configured version of django.
diff --git a/python/optional-django/optional-django.SlackBuild b/python/optional-django/optional-django.SlackBuild
new file mode 100644
index 0000000000..1665f3b4e7
--- /dev/null
+++ b/python/optional-django/optional-django.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# SlackBuild build script for optional-django
+
+# Copyright (c) 2000-2020 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=optional-django
+SRCPKG=${SRCPKG-optional-django}
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+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 \
+  -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 {} \;
+
+ # Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+fi
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/optional-django/optional-django.info b/python/optional-django/optional-django.info
new file mode 100644
index 0000000000..04d535efb8
--- /dev/null
+++ b/python/optional-django/optional-django.info
@@ -0,0 +1,10 @@
+PRGNAM="optional-django"
+VERSION="0.3.0"
+HOMEPAGE="https://pypi.org/project/optional-django/"
+DOWNLOAD="https://files.pythonhosted.org/packages/74/50/14da44d6d976445b19c49a03e2f3b239cfa465b2e87184c4003c1063ae4e/optional-django-0.3.0.tar.gz"
+MD5SUM="c31e774c7a035b236beb56cf2ed7e9af"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-django nose"
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/optional-django/slack-desc b/python/optional-django/slack-desc
new file mode 100644
index 0000000000..6145d39d49
--- /dev/null
+++ b/python/optional-django/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+optional-django: optional-django (Utils for providing optional support for django.)
+optional-django:
+optional-django: In short, this is a grab bag of utils to shim around environments
+optional-django: which may or may not include a configured version of django.
+optional-django:
+optional-django: Homepage: https://pypi.org/project/optional-django/
+optional-django:
+optional-django:
+optional-django:
+optional-django:
+optional-django:
diff --git a/python/pandocfilters/pandocfilters.SlackBuild b/python/pandocfilters/pandocfilters.SlackBuild
index 50fbb8e69a..d03232defa 100644
--- a/python/pandocfilters/pandocfilters.SlackBuild
+++ b/python/pandocfilters/pandocfilters.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pandocfilters
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pandocfilters
-VERSION=${VERSION:-1.4.2}
+VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pandocfilters/pandocfilters.info b/python/pandocfilters/pandocfilters.info
index da8245b0f3..2063f5cbc9 100644
--- a/python/pandocfilters/pandocfilters.info
+++ b/python/pandocfilters/pandocfilters.info
@@ -1,8 +1,8 @@
 PRGNAM="pandocfilters"
-VERSION="1.4.2"
+VERSION="1.4.3"
 HOMEPAGE="https://github.com/jgm/pandocfilters"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandocfilters/pandocfilters-1.4.2.tar.gz"
-MD5SUM="dc391791ef54c7de1572d7b46b63361f"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandocfilters/pandocfilters-1.4.3.tar.gz"
+MD5SUM="1663f8ad167897848e23c749ce668dc8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/parso/parso.SlackBuild b/python/parso/parso.SlackBuild
index 5ed3f89fa1..112487f9eb 100644
--- a/python/parso/parso.SlackBuild
+++ b/python/parso/parso.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for parso
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=parso
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/parso/parso.info b/python/parso/parso.info
index 3614775301..e92d5f867c 100644
--- a/python/parso/parso.info
+++ b/python/parso/parso.info
@@ -1,8 +1,8 @@
 PRGNAM="parso"
-VERSION="0.6.2"
+VERSION="0.8.2"
 HOMEPAGE="https://github.com/davidhalter/parso"
-DOWNLOAD="https://github.com/davidhalter/parso/archive/v0.6.2/parso-0.6.2.tar.gz"
-MD5SUM="0a3b5ea1c712b65b1761337a944acd3b"
+DOWNLOAD="https://github.com/davidhalter/parso/archive/v0.8.2/parso-0.8.2.tar.gz"
+MD5SUM="02e322f0c5b6858c97fe6ca6637c875d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/pathtools/README b/python/pathtools/README
new file mode 100644
index 0000000000..77244e0eee
--- /dev/null
+++ b/python/pathtools/README
@@ -0,0 +1 @@
+Pattern matching and various utilities for file systems paths.
diff --git a/python/pathtools/pathtools.SlackBuild b/python/pathtools/pathtools.SlackBuild
new file mode 100644
index 0000000000..6eb699a862
--- /dev/null
+++ b/python/pathtools/pathtools.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# SlackBuild build script for pathtools3
+
+# Copyright (c) 2000-2020 Prof. Horstmann <wmh (at) eipg.fr>
+# 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=pathtools
+SRCPKG=${SRCPKG-pathtools}
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+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 \
+  -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 {} \;
+
+ # Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pathtools/pathtools.info b/python/pathtools/pathtools.info
new file mode 100644
index 0000000000..4a7dc46ab8
--- /dev/null
+++ b/python/pathtools/pathtools.info
@@ -0,0 +1,10 @@
+PRGNAM="pathtools"
+VERSION="0.1.2"
+HOMEPAGE="https://pypi.org/project/pathtools/"
+DOWNLOAD="https://files.pythonhosted.org/packages/e7/7f/470d6fcdf23f9f3518f6b0b76be9df16dcc8630ad409947f8be2eb0ed13a/pathtools-0.1.2.tar.gz"
+MD5SUM="9a1af5c605768ea5804b03b734ff0f82"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/pathtools/slack-desc b/python/pathtools/slack-desc
new file mode 100644
index 0000000000..32a1da610d
--- /dev/null
+++ b/python/pathtools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pathtools: pathtools (File system general utilities)
+pathtools:
+pathtools: Pattern matching and various utilities for file systems paths.
+pathtools:
+pathtools: Watchdog needs this older version of pathtools for Python-2.7x
+pathtools: pathtools < 0.1.2. https://pypi.org/project/pathtools/
+pathtools:
+pathtools:
+pathtools:
+pathtools: Homepage: https://pypi.org/project/pathtools/
+pathtools:
diff --git a/python/pathtools3/README b/python/pathtools3/README
index acd0ffffec..77244e0eee 100644
--- a/python/pathtools3/README
+++ b/python/pathtools3/README
@@ -1,3 +1 @@
 Pattern matching and various utilities for file systems paths.
-
-Optional dependency: python3
diff --git a/python/pathtools3/pathtools3.SlackBuild b/python/pathtools3/pathtools3.SlackBuild
index e0e6e25a70..eeb0de4460 100644
--- a/python/pathtools3/pathtools3.SlackBuild
+++ b/python/pathtools3/pathtools3.SlackBuild
@@ -58,16 +58,7 @@ 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 {} \;
 
- # Python 2.7 will be droped in the future.
-if $(python2 -c 'import sys' 2>/dev/null); then
-  python2 setup.py install --root=$PKG
-  else
-  python setup.py install --root=$PKG
-fi
-# Replacement of python-2.x Python3.x check presence and build if found.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/python/pathtools3/pathtools3.info b/python/pathtools3/pathtools3.info
index d266c7db9f..28e6c93414 100644
--- a/python/pathtools3/pathtools3.info
+++ b/python/pathtools3/pathtools3.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/38/19/b8e751fe76e98a04bdd34dd9
 MD5SUM="08bb008161e305909740076c5c422159"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Prof. HORSTMANN"
 EMAIL="wmh@eipg.fr"
diff --git a/python/ptyprocess/ptyprocess.SlackBuild b/python/ptyprocess/ptyprocess.SlackBuild
index 1a6b6ecac1..98cc6c00ec 100644
--- a/python/ptyprocess/ptyprocess.SlackBuild
+++ b/python/ptyprocess/ptyprocess.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ptyprocess
 
-# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ptyprocess
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/ptyprocess/ptyprocess.info b/python/ptyprocess/ptyprocess.info
index 50670da7a8..2920d6c84a 100644
--- a/python/ptyprocess/ptyprocess.info
+++ b/python/ptyprocess/ptyprocess.info
@@ -1,8 +1,8 @@
 PRGNAM="ptyprocess"
-VERSION="0.6.0"
+VERSION="0.7.0"
 HOMEPAGE="https://pypi.python.org/pypi/ptyprocess"
-DOWNLOAD="https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0/ptyprocess-0.6.0.tar.gz"
-MD5SUM="37402d69f3b50913d4d483587bffad8f"
+DOWNLOAD="https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz"
+MD5SUM="9da200c397cb1752209a6b718b6cfc68"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/py-cpuinfo/README b/python/py-cpuinfo/README
index 5a13daab48..f69ead49ce 100644
--- a/python/py-cpuinfo/README
+++ b/python/py-cpuinfo/README
@@ -1,2 +1,2 @@
-py-cpuinfo retrieves CPU information with pure Python. It works with Python 2
-and 3, and does not require any compilation.
+py-cpuinfo retrieves CPU information with pure Python. It works with
+Python 2 and 3, and does not require any compilation.
diff --git a/python/py-cpuinfo/py-cpuinfo.SlackBuild b/python/py-cpuinfo/py-cpuinfo.SlackBuild
index fa5dca3ebb..5c9ebe097f 100644
--- a/python/py-cpuinfo/py-cpuinfo.SlackBuild
+++ b/python/py-cpuinfo/py-cpuinfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for py-cpuinfo
 
-# Copyright 2017-2020 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2017-2021 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=py-cpuinfo
-VERSION=${VERSION:-5.0.0}
+VERSION=${VERSION:-7.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/py-cpuinfo/py-cpuinfo.info b/python/py-cpuinfo/py-cpuinfo.info
index b7a244de4c..161ffa2014 100644
--- a/python/py-cpuinfo/py-cpuinfo.info
+++ b/python/py-cpuinfo/py-cpuinfo.info
@@ -1,8 +1,8 @@
 PRGNAM="py-cpuinfo"
-VERSION="5.0.0"
+VERSION="7.0.0"
 HOMEPAGE="https://github.com/workhorsy/py-cpuinfo"
-DOWNLOAD="https://github.com/workhorsy/py-cpuinfo/archive/v5.0.0/py-cpuinfo-5.0.0.tar.gz"
-MD5SUM="a8651af9aa251f146c73e69ac953746c"
+DOWNLOAD="https://github.com/workhorsy/py-cpuinfo/archive/v7.0.0/py-cpuinfo-7.0.0.tar.gz"
+MD5SUM="239d4f955578dacd84ecdb1738c52d1a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pySmartDL/pySmartDL.SlackBuild b/python/pySmartDL/pySmartDL.SlackBuild
index 0ba9ce410c..78e6fec73d 100644
--- a/python/pySmartDL/pySmartDL.SlackBuild
+++ b/python/pySmartDL/pySmartDL.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pySmartDL
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pySmartDL
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pySmartDL/pySmartDL.info b/python/pySmartDL/pySmartDL.info
index 028ff4fa28..eac308fffd 100644
--- a/python/pySmartDL/pySmartDL.info
+++ b/python/pySmartDL/pySmartDL.info
@@ -1,8 +1,8 @@
 PRGNAM="pySmartDL"
-VERSION="1.3.1"
+VERSION="1.3.4"
 HOMEPAGE="https://pypi.python.org/pypi/pySmartDL/"
-DOWNLOAD="https://files.pythonhosted.org/packages/1b/7e/233898a471054dbf3846d24d9c3dc5c56700688ca79c9ebc626e6369f55c/pySmartDL-1.3.1.tar.gz"
-MD5SUM="65fe700a7f5c391b18ff621eab969aa5"
+DOWNLOAD="https://files.pythonhosted.org/packages/5a/4c/ed073b2373f115094a4a612431abe25b58e542bebd951557dcc881999ef9/pySmartDL-1.3.4.tar.gz"
+MD5SUM="37e29b64012d714a456229643ea6957a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/pybind11/pybind11.SlackBuild b/python/pybind11/pybind11.SlackBuild
index 09b5ff9065..093db9bc54 100644
--- a/python/pybind11/pybind11.SlackBuild
+++ b/python/pybind11/pybind11.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pybind11
 
-# Copyright 2019,2020 Christoph Willing,  Brisbane, Australia
+# Copyright 2019,2021 Christoph Willing,  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=pybind11
 VERSION=${VERSION:-2.5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,19 +70,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 {} \;
 
-python setup.py install --root=$PKG
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+mkdir build && cd build
+cmake .. \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DPYBIND11_PYTHON_VERSION=$(python3 --version|cut -d' ' -f2) \
+  -DPYBIND11_TEST=OFF \
+
+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 \
-  CONTRIBUTING.md LICENSE README.md \
+  CONTRIBUTING.md LICENSE README.md docs/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/python/pyblake2/README b/python/pyblake2/README
new file mode 100644
index 0000000000..adf197ca1d
--- /dev/null
+++ b/python/pyblake2/README
@@ -0,0 +1 @@
+BLAKE2 hash function extension module
diff --git a/python/pyblake2/pyblake2.SlackBuild b/python/pyblake2/pyblake2.SlackBuild
new file mode 100644
index 0000000000..34130d56ac
--- /dev/null
+++ b/python/pyblake2/pyblake2.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+# SlackBuild script for pyblake2
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=pyblake2
+VERSION=${VERSION:-1.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "i586" ]; then
+  MOSCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  MOSCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  MOSCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  MOSCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+ # Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pyblake2/pyblake2.info b/python/pyblake2/pyblake2.info
new file mode 100644
index 0000000000..88aff82810
--- /dev/null
+++ b/python/pyblake2/pyblake2.info
@@ -0,0 +1,10 @@
+PRGNAM="pyblake2"
+VERSION="1.1.2"
+HOMEPAGE="https://pypi.org/project/pyblake2/"
+DOWNLOAD="https://files.pythonhosted.org/packages/a6/ea/559658f48713567276cabe1344a9ef918adcb34a9da417dbf0a2f7477d8e/pyblake2-1.1.2.tar.gz"
+MD5SUM="d2306b67d17274bca06d598b64ef7b38"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/pyblake2/slack-desc b/python/pyblake2/slack-desc
new file mode 100644
index 0000000000..bb2ae2f84a
--- /dev/null
+++ b/python/pyblake2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+pyblake2: pyblake2 (BLAKE2 hash function extension module)
+pyblake2:
+pyblake2: pyblake2 is an extension module for Python implementing BLAKE2 hash
+pyblake2: function.
+pyblake2:
+pyblake2: BLAKE2 is a cryptographic hash function, which offers highest
+pyblake2: security while being as fast as MD5 or SHA-1, and comes in two
+pyblake2: flavors.
+pyblake2:
+pyblake2: Homepage: https://pypi.org/project/pyblake2/
+pyblake2:
diff --git a/python/pychm/README b/python/pychm/README
index 6a4e251f36..e38bcb505d 100644
--- a/python/pychm/README
+++ b/python/pychm/README
@@ -1,4 +1,6 @@
 PyCHM is a package that provides bindings for Jed Wing's CHMLIB
-library. The chm package contains four modules, namely chm.chm, 
-chm.chmlib, chm.extra and chm._chmlib. chm.chmlib is a low level 
-wrapper module around the API provided by the C library chmlib. 
+library. The chm package contains four modules, namely chm.chm,
+chm.chmlib, chm.extra and chm._chmlib. chm.chmlib is a low level
+wrapper module around the API provided by the C library chmlib.
+The build script will build Python3 modules automatically if you
+have Python3 installed.
diff --git a/python/pychm/pychm.SlackBuild b/python/pychm/pychm.SlackBuild
index cea6426868..09eb77fa6f 100644
--- a/python/pychm/pychm.SlackBuild
+++ b/python/pychm/pychm.SlackBuild
@@ -26,7 +26,7 @@
 # THE SOFTWARE.
 
 PRGNAM=pychm
-VERSION=${VERSION:-0.8.4}
+VERSION=${VERSION:-0.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,14 +58,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py build
-python setup.py install --root $PKG
+if [ -x /usr/bin/python2 ] 
+then
+	python2 setup.py install --root $PKG
+fi
+
+if [ -x /usr/bin/python3 ] 
+then
+	python3 setup.py install --root $PKG
+fi
+
 
 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 $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog NEWS PKG-INFO README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pychm/pychm.info b/python/pychm/pychm.info
index 4ba76b3b30..1734b9f485 100644
--- a/python/pychm/pychm.info
+++ b/python/pychm/pychm.info
@@ -1,8 +1,8 @@
 PRGNAM="pychm"
-VERSION="0.8.4"
-HOMEPAGE="http://gnochm.sourceforge.net/pychm.html"
-DOWNLOAD="http://downloads.sourceforge.net/gnochm/pychm-0.8.4.tar.gz"
-MD5SUM="ff7f0baf94290c44263a1618e7e6a116"
+VERSION="0.8.6"
+HOMEPAGE="https://github.com/dottedmag/pychm/"
+DOWNLOAD="https://github.com/dottedmag/pychm/archive/v0.8.6/pychm-0.8.6.tar.gz"
+MD5SUM="31f1e83b115e687ef5c38c45bf89dbd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pycryptodomex/pycryptodomex.SlackBuild b/python/pycryptodomex/pycryptodomex.SlackBuild
index a43c995dad..453938d520 100644
--- a/python/pycryptodomex/pycryptodomex.SlackBuild
+++ b/python/pycryptodomex/pycryptodomex.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pycryptodomex
-VERSION=${VERSION:-3.9.8}
+VERSION=${VERSION:-3.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pycryptodomex/pycryptodomex.info b/python/pycryptodomex/pycryptodomex.info
index 57add9d85e..405c0cc46b 100644
--- a/python/pycryptodomex/pycryptodomex.info
+++ b/python/pycryptodomex/pycryptodomex.info
@@ -1,8 +1,8 @@
 PRGNAM="pycryptodomex"
-VERSION="3.9.8"
+VERSION="3.10.1"
 HOMEPAGE="https://github.com/Legrandin/pycryptodome"
-DOWNLOAD="https://github.com/Legrandin/pycryptodome/archive/v3.9.8x/pycryptodome-3.9.8x.tar.gz"
-MD5SUM="478dfe2bd29ef18c511c5c73ebb2b3da"
+DOWNLOAD="https://github.com/Legrandin/pycryptodome/archive/v3.10.1x/pycryptodome-3.10.1x.tar.gz"
+MD5SUM="a5c0aafa12b0a4643728309a1bae1e4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pynacl/README b/python/pynacl/README
new file mode 100644
index 0000000000..6e2ecf09ff
--- /dev/null
+++ b/python/pynacl/README
@@ -0,0 +1 @@
+Python binding to the Networking and Cryptography (NaCl) library
diff --git a/python/pynacl/pynacl.SlackBuild b/python/pynacl/pynacl.SlackBuild
new file mode 100644
index 0000000000..556c55790d
--- /dev/null
+++ b/python/pynacl/pynacl.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# SlackBuild build script for pynacl
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=pynacl
+SRCPKG=${SRCPKG-PyNaCl}
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pynacl/pynacl.info b/python/pynacl/pynacl.info
new file mode 100644
index 0000000000..ebbf3676ab
--- /dev/null
+++ b/python/pynacl/pynacl.info
@@ -0,0 +1,10 @@
+PRGNAM="pynacl"
+VERSION="1.4.0"
+HOMEPAGE="https://pypi.org/project/pynacl/"
+DOWNLOAD="https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e/PyNaCl-1.4.0.tar.gz"
+MD5SUM="8c6c57893327a694c72510fb620e4744"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=" six cffi wheel"
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/pynacl/slack-desc b/python/pynacl/slack-desc
new file mode 100644
index 0000000000..708708b537
--- /dev/null
+++ b/python/pynacl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+pynacl: pynacl (Binding to the Networking and Cryptography (NaCl) library)
+pynacl:
+pynacl: PyNaCl is a Python binding to libsodium, which is a fork of the    
+pynacl: Networking and Cryptography library. These libraries have a stated
+pynacl: goal of improving usability, security and speed. 
+pynacl: It supports Python 2.7 and 3.5+ as well as PyPy 2.6+.
+pynacl:
+pynacl:
+pynacl: Homepage: https://pypi.org/project/PyNaCl/
+pynacl:
+pynacl:
diff --git a/python/pyotp/pyotp.SlackBuild b/python/pyotp/pyotp.SlackBuild
index a8b3154bc0..d1ff8af93c 100644
--- a/python/pyotp/pyotp.SlackBuild
+++ b/python/pyotp/pyotp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyotp
 
-# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyotp
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-2.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,11 +69,7 @@ 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 {} \;
 
-python setup.py install --root=$PKG
-
-if $(python3 -c 'import sys' 2>/dev/null); then
-    python3 setup.py install --root=$PKG
-fi
+python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/python/pyotp/pyotp.info b/python/pyotp/pyotp.info
index fd4a333d59..e5c9145b6e 100644
--- a/python/pyotp/pyotp.info
+++ b/python/pyotp/pyotp.info
@@ -1,10 +1,10 @@
 PRGNAM="pyotp"
-VERSION="2.3.0"
+VERSION="2.4.1"
 HOMEPAGE="https://pypi.org/project/pyotp/"
-DOWNLOAD="https://files.pythonhosted.org/packages/f7/15/395c4945ea6bc37e8811280bb675615cb4c2b2c1cd70bdc43329da91a386/pyotp-2.3.0.tar.gz"
-MD5SUM="d445da203b0e60b5b386d07fdb431e14"
+DOWNLOAD="https://files.pythonhosted.org/packages/4f/b4/21f8c6b0b941f8bea4587088a40d8a207851b19cb07ca8fa0a1e38e27082/pyotp-2.4.1.tar.gz"
+MD5SUM="e8967efbff11497e3700ccfc150496ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Dominik Drobek"
 EMAIL="dominik.drobek (at) o2.pl"
diff --git a/python/pyserial/pyserial.SlackBuild b/python/pyserial/pyserial.SlackBuild
index e2d01887c2..2f3c348226 100644
--- a/python/pyserial/pyserial.SlackBuild
+++ b/python/pyserial/pyserial.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyserial
-VERSION=${VERSION:-3.4}
+VERSION=${VERSION:-3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pyserial/pyserial.info b/python/pyserial/pyserial.info
index c9abc630a2..2a5d2adab3 100644
--- a/python/pyserial/pyserial.info
+++ b/python/pyserial/pyserial.info
@@ -1,8 +1,8 @@
 PRGNAM="pyserial"
-VERSION="3.4"
+VERSION="3.5"
 HOMEPAGE="https://github.com/pyserial/pyserial"
-DOWNLOAD="https://github.com/pyserial/pyserial/archive/v3.4/pyserial-3.4.tar.gz"
-MD5SUM="fc00727ed9cf3a31b7a296a4d42f6afc"
+DOWNLOAD="https://github.com/pyserial/pyserial/archive/v3.5/pyserial-3.5.tar.gz"
+MD5SUM="ce1cf20f1bbf608027b14d4a97a377fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python-PySnooper/python-PySnooper.SlackBuild b/python/python-PySnooper/python-PySnooper.SlackBuild
index 394b7c6063..793312717b 100644
--- a/python/python-PySnooper/python-PySnooper.SlackBuild
+++ b/python/python-PySnooper/python-PySnooper.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-PySnooper
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-PySnooper
-VERSION=${VERSION:-0.3.0}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-PySnooper/python-PySnooper.info b/python/python-PySnooper/python-PySnooper.info
index 500f7c9beb..77c5b50541 100644
--- a/python/python-PySnooper/python-PySnooper.info
+++ b/python/python-PySnooper/python-PySnooper.info
@@ -1,8 +1,8 @@
 PRGNAM="python-PySnooper"
-VERSION="0.3.0"
+VERSION="0.4.3"
 HOMEPAGE="https://github.com/cool-RR/PySnooper"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/P/PySnooper/PySnooper-0.3.0.tar.gz"
-MD5SUM="7b6aae35f62f5f7ab76e2d9840a7d708"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/P/PySnooper/PySnooper-0.4.3.tar.gz"
+MD5SUM="a7d0b7cab4ba8dca6c2fdab6299dcac9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python-branca/python-branca.SlackBuild b/python/python-branca/python-branca.SlackBuild
index ba9c5244a5..8c8f23f0a7 100644
--- a/python/python-branca/python-branca.SlackBuild
+++ b/python/python-branca/python-branca.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-branca
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-branca
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-branca/python-branca.info b/python/python-branca/python-branca.info
index 85f305bb01..fdf65ac536 100644
--- a/python/python-branca/python-branca.info
+++ b/python/python-branca/python-branca.info
@@ -1,8 +1,8 @@
 PRGNAM="python-branca"
-VERSION="0.4.1"
+VERSION="0.4.2"
 HOMEPAGE="https://github.com/python-visualization/branca"
-DOWNLOAD="https://github.com/python-visualization/branca/archive/v0.4.1/branca-0.4.1.tar.gz"
-MD5SUM="5750f91f2332c77ace9635c5463ca0c9"
+DOWNLOAD="https://github.com/python-visualization/branca/archive/v0.4.2/branca-0.4.2.tar.gz"
+MD5SUM="fd4e5dca595444882349e0d8c31579a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Jinja2 six python3-six"
diff --git a/python/python-certifi/python-certifi.SlackBuild b/python/python-certifi/python-certifi.SlackBuild
index a5bcecac14..5f8c639a43 100644
--- a/python/python-certifi/python-certifi.SlackBuild
+++ b/python/python-certifi/python-certifi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-certifi
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=python-certifi
 SRCNAM=$(printf $PRGNAM | cut -c8-14)
-VERSION=${VERSION:-2019.9.11}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2020.12.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,6 +71,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/python/python-certifi/python-certifi.info b/python/python-certifi/python-certifi.info
index 60c1be47b2..c46903f08c 100644
--- a/python/python-certifi/python-certifi.info
+++ b/python/python-certifi/python-certifi.info
@@ -1,10 +1,10 @@
 PRGNAM="python-certifi"
-VERSION="2019.9.11"
+VERSION="2020.12.5"
 HOMEPAGE="https://certifi.io/en/latest/"
-DOWNLOAD="https://files.pythonhosted.org/packages/62/85/7585750fd65599e88df0fed59c74f5075d4ea2fe611deceb95dd1c2fb25b/certifi-2019.9.11.tar.gz"
-MD5SUM="cadd4e373fc08f649fa39b82aed9ad96"
+DOWNLOAD="https://files.pythonhosted.org/packages/06/a9/cd1fd8ee13f73a4d4f491ee219deeeae20afefa914dfb4c130cfc9dc397a/certifi-2020.12.5.tar.gz"
+MD5SUM="522f9abe26e5d603a668d812aa6accca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-emoji/python-emoji.SlackBuild b/python/python-emoji/python-emoji.SlackBuild
index ac3b6635b7..858e807645 100644
--- a/python/python-emoji/python-emoji.SlackBuild
+++ b/python/python-emoji/python-emoji.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-emoji
 
-# Copyright 2018-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-emoji
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,7 +63,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+cd $SRCNAM-v.$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,7 +71,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python-emoji/python-emoji.info b/python/python-emoji/python-emoji.info
index df72777754..49cfa43499 100644
--- a/python/python-emoji/python-emoji.info
+++ b/python/python-emoji/python-emoji.info
@@ -1,8 +1,8 @@
 PRGNAM="python-emoji"
-VERSION="0.5.4"
+VERSION="1.2.1"
 HOMEPAGE="https://github.com/carpedm20/emoji"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/e/emoji/emoji-0.5.4.tar.gz"
-MD5SUM="1739bb59b8ad7f038e11f3f717073a9e"
+DOWNLOAD="https://github.com/carpedm20/emoji/archive/v.1.2.1/emoji-1.2.1.tar.gz"
+MD5SUM="14d91dc3258e63d220d0df2a02de315a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python-evdev/README b/python/python-evdev/README
index 5df3c5270f..94244e0786 100644
--- a/python/python-evdev/README
+++ b/python/python-evdev/README
@@ -1,5 +1,5 @@
-python-evdev allows Python programs running in Linux to read and write input
-events. It provides bindings to both the generic input event interface (evdev)
-and the userspace input subsystem (Uinput).
+python-evdev allows Python programs running in Linux to read and write
+input events. It provides bindings to both the generic input event
+interface (evdev) and the userspace input subsystem (Uinput).
 
 This will automatically build for Python 3 if it's available.
diff --git a/python/python-evdev/python-evdev.SlackBuild b/python/python-evdev/python-evdev.SlackBuild
index a8c9ccd943..c3f9f546bc 100644
--- a/python/python-evdev/python-evdev.SlackBuild
+++ b/python/python-evdev/python-evdev.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for python-evdev
 
 # Copyright 2015 Dugan Chen, Canada <thedoogster@gmail.com>
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -17,18 +17,19 @@
 #  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;
+#  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=python-evdev
-SRCNAM=evdev
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=evdev
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
diff --git a/python/python-evdev/python-evdev.info b/python/python-evdev/python-evdev.info
index f11c15b90d..6cf2cdd456 100644
--- a/python/python-evdev/python-evdev.info
+++ b/python/python-evdev/python-evdev.info
@@ -1,8 +1,8 @@
 PRGNAM="python-evdev"
-VERSION="1.3.0"
+VERSION="1.4.0"
 HOMEPAGE="http://python-evdev.readthedocs.org/en/latest/"
-DOWNLOAD="https://pypi.python.org/packages/source/e/evdev/evdev-1.3.0.tar.gz"
-MD5SUM="05f9e900d6e11e1674475d2dd2668f0d"
+DOWNLOAD="https://files.pythonhosted.org/packages/4d/ec/bb298d36ed67abd94293253e3e52bdf16732153b887bf08b8d6f269eacef/evdev-1.4.0.tar.gz"
+MD5SUM="919c1107b576771cfb0c43e2a8a4a405"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild b/python/python-importlib_metadata/python-importlib_metadata.SlackBuild
index 61abc9f91f..af8c3d8f12 100644
--- a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild
+++ b/python/python-importlib_metadata/python-importlib_metadata.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-importlib_metadata
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-importlib_metadata/python-importlib_metadata.info b/python/python-importlib_metadata/python-importlib_metadata.info
index ef45911ce9..8b94ae928d 100644
--- a/python/python-importlib_metadata/python-importlib_metadata.info
+++ b/python/python-importlib_metadata/python-importlib_metadata.info
@@ -1,8 +1,8 @@
 PRGNAM="python-importlib_metadata"
-VERSION="1.6.0"
+VERSION="2.0.0"
 HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-1.6.0.tar.gz"
-MD5SUM="fd86e462c5786aac615ad50b45dd98f3"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-2.0.0.tar.gz"
+MD5SUM="3dd91821c930a3c3633e99a7025aa9c2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-zipp"
diff --git a/python/python-joblib/python-joblib.SlackBuild b/python/python-joblib/python-joblib.SlackBuild
index 4fa95f58c7..22d7d95afc 100644
--- a/python/python-joblib/python-joblib.SlackBuild
+++ b/python/python-joblib/python-joblib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-joblib
 
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-joblib
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python-joblib/python-joblib.info b/python/python-joblib/python-joblib.info
index 89775e614f..da1919edff 100644
--- a/python/python-joblib/python-joblib.info
+++ b/python/python-joblib/python-joblib.info
@@ -1,8 +1,8 @@
 PRGNAM="python-joblib"
-VERSION="0.14.1"
+VERSION="0.17.0"
 HOMEPAGE="https://joblib.readthedocs.io/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/j/joblib/joblib-0.14.1.tar.gz"
-MD5SUM="182e6bc65681ea49a12775fdc86a8e24"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/j/joblib/joblib-0.17.0.tar.gz"
+MD5SUM="ba702b6e3f6cbee942e7c442e911d523"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python-jsonrpclib/python-jsonrpclib.SlackBuild b/python/python-jsonrpclib/python-jsonrpclib.SlackBuild
index 6a1d30862a..313ca7b09c 100644
--- a/python/python-jsonrpclib/python-jsonrpclib.SlackBuild
+++ b/python/python-jsonrpclib/python-jsonrpclib.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-jsonrpclib
 SRCNAM=jsonrpclib
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-jsonrpclib/python-jsonrpclib.info b/python/python-jsonrpclib/python-jsonrpclib.info
index 2244798e38..d414e44082 100644
--- a/python/python-jsonrpclib/python-jsonrpclib.info
+++ b/python/python-jsonrpclib/python-jsonrpclib.info
@@ -1,8 +1,8 @@
 PRGNAM="python-jsonrpclib"
-VERSION="0.4.1"
+VERSION="0.4.2"
 HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
-DOWNLOAD="https://github.com/tcalmant/jsonrpclib/archive/v0.4.1/jsonrpclib-0.4.1.tar.gz"
-MD5SUM="f34a8b62d6be60418f6897008afa8ef1"
+DOWNLOAD="https://github.com/tcalmant/jsonrpclib/archive/v0.4.2/jsonrpclib-0.4.2.tar.gz"
+MD5SUM="28d188e67339a03952e411333cd77eaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-libtmux/python-libtmux.SlackBuild b/python/python-libtmux/python-libtmux.SlackBuild
index 1eb3e54253..8c4ac72e4a 100644
--- a/python/python-libtmux/python-libtmux.SlackBuild
+++ b/python/python-libtmux/python-libtmux.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-libtmux
 
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2016-2020  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-libtmux
 SRCNAM=$(echo $PRGNAM | cut -c8-14)
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/python/python-libtmux/python-libtmux.info b/python/python-libtmux/python-libtmux.info
index 03248754e9..770776e0ca 100644
--- a/python/python-libtmux/python-libtmux.info
+++ b/python/python-libtmux/python-libtmux.info
@@ -1,10 +1,10 @@
 PRGNAM="python-libtmux"
-VERSION="0.8.2"
+VERSION="0.8.5"
 HOMEPAGE="https://github.com/tony/libtmux"
-DOWNLOAD="https://files.pythonhosted.org/packages/94/cb/52c0befdd356763893b52ddddeec21f883fe284ac9b4cc65c163c4231f97/libtmux-0.8.2.tar.gz"
-MD5SUM="cee3a5b08969bb631a4b1ebee0398364"
+DOWNLOAD="https://files.pythonhosted.org/packages/b0/43/4b66181475cb78be02e69a121e4f69d72aef7d2eb5855b23fa4ff13e055c/libtmux-0.8.5.tar.gz"
+MD5SUM="638759ca08cb76610ff82e7b1a96b0ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-mysql-replication/python-mysql-replication.SlackBuild b/python/python-mysql-replication/python-mysql-replication.SlackBuild
index de9dbf2fc3..50cbf366c3 100644
--- a/python/python-mysql-replication/python-mysql-replication.SlackBuild
+++ b/python/python-mysql-replication/python-mysql-replication.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-mysql-replication
 
-# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=python-mysql-replication
 SRCNAM=mysql-replication
-VERSION=${VERSION:-0.22}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.23}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -81,9 +81,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  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/python/python-mysql-replication/python-mysql-replication.info b/python/python-mysql-replication/python-mysql-replication.info
index 33ec19a3fb..72a42becd8 100644
--- a/python/python-mysql-replication/python-mysql-replication.info
+++ b/python/python-mysql-replication/python-mysql-replication.info
@@ -1,8 +1,8 @@
 PRGNAM="python-mysql-replication"
-VERSION="0.22"
+VERSION="0.23"
 HOMEPAGE="https://github.com/noplay/python-mysql-replication"
-DOWNLOAD="https://files.pythonhosted.org/packages/4d/24/82eadb049a34e041d89f66855eaffc5979435b5fd7b0a670e1a58a9932ed/mysql-replication-0.22.tar.gz"
-MD5SUM="8f60fc85ff9ceccd031daf87febed1e9"
+DOWNLOAD="https://files.pythonhosted.org/packages/68/49/34c9b93f591c2c14991d8f49ffc2409d9d614a3fcaf572a2df2faaeb591d/mysql-replication-0.23.tar.gz"
+MD5SUM="a4979564af550370b087cb2aef980127"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pymysql"
diff --git a/python/python-neovim/python-neovim.SlackBuild b/python/python-neovim/python-neovim.SlackBuild
index 29dff88b89..e01ee18a50 100644
--- a/python/python-neovim/python-neovim.SlackBuild
+++ b/python/python-neovim/python-neovim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-neovim
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-neovim
 SRCNAM=pynvim
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-neovim/python-neovim.info b/python/python-neovim/python-neovim.info
index c39f9c9f19..f1988f3725 100644
--- a/python/python-neovim/python-neovim.info
+++ b/python/python-neovim/python-neovim.info
@@ -1,8 +1,8 @@
 PRGNAM="python-neovim"
-VERSION="0.4.1"
-HOMEPAGE="http://neovim.org/"
-DOWNLOAD="https://github.com/neovim/pynvim/archive/0.4.1/pynvim-0.4.1.tar.gz"
-MD5SUM="8d90f9f29b2cdaf6adfc78b0eda9dd20"
+VERSION="0.4.3"
+HOMEPAGE="https://neovim.io"
+DOWNLOAD="https://github.com/neovim/pynvim/archive/0.4.3/pynvim-0.4.3.tar.gz"
+MD5SUM="b7370a5b3d2177d2b97ca48695ba1ae3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="greenlet msgpack-python trollius pytest-runner"
diff --git a/python/python-precis-i18n/python-precis-i18n.SlackBuild b/python/python-precis-i18n/python-precis-i18n.SlackBuild
index 80705042e4..c702ede8a2 100644
--- a/python/python-precis-i18n/python-precis-i18n.SlackBuild
+++ b/python/python-precis-i18n/python-precis-i18n.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-precis-i18n
 
-# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-precis-i18n
 SRCNAM="$(echo "$PRGNAM" | sed 's/python-//' | tr - _)"
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-precis-i18n/python-precis-i18n.info b/python/python-precis-i18n/python-precis-i18n.info
index 5338a8ee6e..061efad12d 100644
--- a/python/python-precis-i18n/python-precis-i18n.info
+++ b/python/python-precis-i18n/python-precis-i18n.info
@@ -1,8 +1,8 @@
 PRGNAM="python-precis-i18n"
-VERSION="1.0.2"
+VERSION="1.0.3"
 HOMEPAGE="https://pypi.org/project/precis-i18n/"
-DOWNLOAD="https://files.pythonhosted.org/packages/4c/8c/053c9c7be6ad02503b4ccaf7be857af97af82ea5898120217d1d7cc7e887/precis_i18n-1.0.2.tar.gz"
-MD5SUM="0e55dec243ab761551c7a8a9f5f20560"
+DOWNLOAD="https://files.pythonhosted.org/packages/f4/20/bdb5433637beae4c3458d7a9475462c91a69bd11edf1c30b8693366dc588/precis_i18n-1.0.3.tar.gz"
+MD5SUM="f8f604f7571198fd6d869bd3dc7b3e7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python-prometheus_client/python-prometheus_client.SlackBuild b/python/python-prometheus_client/python-prometheus_client.SlackBuild
index 8c4c9192f3..da63341d8a 100644
--- a/python/python-prometheus_client/python-prometheus_client.SlackBuild
+++ b/python/python-prometheus_client/python-prometheus_client.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for prometheus_client
 
-# Copyright 2018-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-prometheus_client
 SRCNAM=client_python
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-prometheus_client/python-prometheus_client.info b/python/python-prometheus_client/python-prometheus_client.info
index 0d1dd4f6ff..dea6ab8ea1 100644
--- a/python/python-prometheus_client/python-prometheus_client.info
+++ b/python/python-prometheus_client/python-prometheus_client.info
@@ -1,8 +1,8 @@
 PRGNAM="python-prometheus_client"
-VERSION="0.7.1"
+VERSION="0.10.1"
 HOMEPAGE="https://prometheus.io/"
-DOWNLOAD="https://github.com/prometheus/client_python/archive/v0.7.1/client_python-0.7.1.tar.gz"
-MD5SUM="6b899eddd7b6034b7a77bb3064df82dc"
+DOWNLOAD="https://github.com/prometheus/client_python/archive/v0.10.1/client_python-0.10.1.tar.gz"
+MD5SUM="eebf2eb36546ae6127f48842fb230611"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python-requests/python-requests.SlackBuild b/python/python-requests/python-requests.SlackBuild
index 8ba50ef3d8..c86375ee6e 100644
--- a/python/python-requests/python-requests.SlackBuild
+++ b/python/python-requests/python-requests.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-requests
-VERSION=${VERSION:-2.24.0}
+VERSION=${VERSION:-2.25.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-requests/python-requests.info b/python/python-requests/python-requests.info
index 835df66c6d..3e86ad5698 100644
--- a/python/python-requests/python-requests.info
+++ b/python/python-requests/python-requests.info
@@ -1,8 +1,8 @@
 PRGNAM="python-requests"
-VERSION="2.24.0"
+VERSION="2.25.0"
 HOMEPAGE="https://requests.kennethreitz.org/en/master/"
-DOWNLOAD="https://github.com/kennethreitz/requests/archive/v2.24.0/requests-2.24.0.tar.gz"
-MD5SUM="0dccb8677a63d69efe93b3a000b5d41c"
+DOWNLOAD="https://github.com/kennethreitz/requests/archive/v2.25.0/requests-2.25.0.tar.gz"
+MD5SUM="17d9f83904bd2ef687d3c89e762623fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-certifi python-chardet idna python-urllib3"
diff --git a/python/python-socks/README b/python/python-socks/README
new file mode 100644
index 0000000000..a3334d1007
--- /dev/null
+++ b/python/python-socks/README
@@ -0,0 +1,2 @@
+python-socks provides a core proxy client functionality for Python.
+It is used internally by python3-aiohttp-socks.
diff --git a/network/weboob/weboob.SlackBuild b/python/python-socks/python-socks.SlackBuild
index 7652566c9d..556c855495 100644
--- a/network/weboob/weboob.SlackBuild
+++ b/python/python-socks/python-socks.SlackBuild
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-# Slackware build script for weboob
-
-# Copyright (C) 2011,  Brice Lopez <brice@lopez.banh-bao.fr>
+# Slackware build script for python-socks
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +21,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=weboob
-VERSION=${VERSION:-0.a}
+PRGNAM=python-socks
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,6 +39,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -48,30 +63,22 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
-PYTHONPATH=$PKG/usr
-sed -i -e "s|share/man|man|g" setup.py
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
 
-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 \
-  ChangeLog INSTALL MANIFEST.in README docs \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/python/python-socks/python-socks.info b/python/python-socks/python-socks.info
new file mode 100644
index 0000000000..a1e64cf602
--- /dev/null
+++ b/python/python-socks/python-socks.info
@@ -0,0 +1,10 @@
+PRGNAM="python-socks"
+VERSION="1.2.2"
+HOMEPAGE="https://github.com/romis2012/python-socks/"
+DOWNLOAD="https://github.com/romis2012/python-socks/archive/v1.2.2/python-socks-1.2.2.tar.gz"
+MD5SUM="688332177f76f56091f600c8ccc5a067"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python-socks/slack-desc b/python/python-socks/slack-desc
new file mode 100644
index 0000000000..04a47e5569
--- /dev/null
+++ b/python/python-socks/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+python-socks: python-socks (SOCKS proxy connector for aiohttp)
+python-socks:
+python-socks: python-socks provides a core proxy client functionality for Python.
+python-socks: It is used internally by python3-aiohttp-socks.
+python-socks:
+python-socks:
+python-socks:
+python-socks:
+python-socks:
+python-socks:
+python-socks:
diff --git a/python/python-toml/python-toml.SlackBuild b/python/python-toml/python-toml.SlackBuild
index 9cdcb9399d..d5299c954f 100644
--- a/python/python-toml/python-toml.SlackBuild
+++ b/python/python-toml/python-toml.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-toml
 SRCNAM=toml
-VERSION=${VERSION:-0.10.1}
+VERSION=${VERSION:-0.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-toml/python-toml.info b/python/python-toml/python-toml.info
index 3681b4b6e2..cab051c025 100644
--- a/python/python-toml/python-toml.info
+++ b/python/python-toml/python-toml.info
@@ -1,8 +1,8 @@
 PRGNAM="python-toml"
-VERSION="0.10.1"
+VERSION="0.10.2"
 HOMEPAGE="https://github.com/uiri/toml"
-DOWNLOAD="https://files.pythonhosted.org/packages/da/24/84d5c108e818ca294efe7c1ce237b42118643ce58a14d2462b3b2e3800d5/toml-0.10.1.tar.gz"
-MD5SUM="743131c431419fe42f854cff02ad3abe"
+DOWNLOAD="https://files.pythonhosted.org/packages/be/ba/1f744cdc819428fc6b5084ec34d9b30660f6f9daaf70eead706e3203ec3c/toml-0.10.2.tar.gz"
+MD5SUM="59bce5d8d67e858735ec3f399ec90253"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-uritemplate/README b/python/python-uritemplate/README
new file mode 100644
index 0000000000..5e26084706
--- /dev/null
+++ b/python/python-uritemplate/README
@@ -0,0 +1 @@
+Simple python library to deal with URI Templates.
diff --git a/python/python-uritemplate/python-uritemplate.SlackBuild b/python/python-uritemplate/python-uritemplate.SlackBuild
new file mode 100644
index 0000000000..2609e766d3
--- /dev/null
+++ b/python/python-uritemplate/python-uritemplate.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# SlackBuild build script for "python-uritemplate".
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "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 COPYRIGHT
+# OWNER OR CONTRIBUTORS 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=python-uritemplate
+SRCNAM=uritemplate
+VERSION=${VERSION:-3.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  MOSCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  MOSCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  MOSCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  MOSCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-uritemplate/python-uritemplate.info b/python/python-uritemplate/python-uritemplate.info
new file mode 100644
index 0000000000..e3273f872a
--- /dev/null
+++ b/python/python-uritemplate/python-uritemplate.info
@@ -0,0 +1,10 @@
+PRGNAM="python-uritemplate"
+VERSION="3.0.1"
+HOMEPAGE="https://github.com/uri-templates/"
+DOWNLOAD="https://files.pythonhosted.org/packages/42/da/fa9aca2d866f932f17703b3b5edb7b17114bb261122b6e535ef0d9f618f8/uritemplate-3.0.1.tar.gz"
+MD5SUM="869fb44fbd56713490db7272eb36c8ae"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/python-uritemplate/slack-desc b/python/python-uritemplate/slack-desc
new file mode 100644
index 0000000000..da1c10ebd9
--- /dev/null
+++ b/python/python-uritemplate/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+		  |-----handy-ruler------------------------------------------------------|
+python-uritemplate: python-uritemplate (A python library)
+python-uritemplate:
+python-uritemplate: Simple python library to deal with URI Templates.
+python-uritemplate:
+python-uritemplate:
+python-uritemplate:
+python-uritemplate: Homepage: https://github.com/uri-templates/
+python-uritemplate:
+python-uritemplate:
+python-uritemplate:
+python-uritemplate:
diff --git a/python/python-urllib3/python-urllib3.SlackBuild b/python/python-urllib3/python-urllib3.SlackBuild
index 06311f48e6..5aee2720b6 100644
--- a/python/python-urllib3/python-urllib3.SlackBuild
+++ b/python/python-urllib3/python-urllib3.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for python-urllib3
 
 # Copyright 2013 Thibaut Notteboom, Paris, FRANCE
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=python-urllib3
 SRCNAM=$(echo $PRGNAM | cut -c8-14)
-VERSION=${VERSION:-1.25.7}
+VERSION=${VERSION:-1.26.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-urllib3/python-urllib3.info b/python/python-urllib3/python-urllib3.info
index 77dbbca4f3..21d0de0eed 100644
--- a/python/python-urllib3/python-urllib3.info
+++ b/python/python-urllib3/python-urllib3.info
@@ -1,8 +1,8 @@
 PRGNAM="python-urllib3"
-VERSION="1.25.7"
+VERSION="1.26.2"
 HOMEPAGE="https://urllib3.readthedocs.io/en/latest/"
-DOWNLOAD="https://files.pythonhosted.org/packages/ad/fc/54d62fa4fc6e675678f9519e677dfc29b8964278d75333cf142892caf015/urllib3-1.25.7.tar.gz"
-MD5SUM="85e1e3925f8c1095172bff343f3312ed"
+DOWNLOAD="https://files.pythonhosted.org/packages/29/e6/d1a1d78c439cad688757b70f26c50a53332167c364edb0134cadd280e234/urllib3-1.26.2.tar.gz"
+MD5SUM="2233256ccfe140a915f68703f8c2cc1f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-webpack/README b/python/python-webpack/README
new file mode 100644
index 0000000000..c3f1c5d64b
--- /dev/null
+++ b/python/python-webpack/README
@@ -0,0 +1,5 @@
+python-webpack provides a high-level interface to a webpack-build
+server, enabling you to send build requests and receive an object
+describing the outcome.
+
+Pr. Horstmann will maintain python-webpack as of 21-11-2020
diff --git a/python/python-webpack/python-webpack.SlackBuild b/python/python-webpack/python-webpack.SlackBuild
new file mode 100644
index 0000000000..b5760aabcf
--- /dev/null
+++ b/python/python-webpack/python-webpack.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# SlackBuild build script for python-webpack
+
+# Copyright (c) 2000-2020 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=python-webpack
+SRCPKG=${SRCPKG-webpack}
+VERSION=${VERSION:-6.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $SRCPKG)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+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 \
+  -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 {} \;
+
+ # Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+fi
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-webpack/python-webpack.info b/python/python-webpack/python-webpack.info
new file mode 100644
index 0000000000..d0441d2d3d
--- /dev/null
+++ b/python/python-webpack/python-webpack.info
@@ -0,0 +1,10 @@
+PRGNAM="python-webpack"
+VERSION="6.0.0"
+HOMEPAGE="https://pypi.org/project/webpack/"
+DOWNLOAD="https://files.pythonhosted.org/packages/d0/82/dd58929c106d8b96ae77a4bf589d44fb28942bf435ead34d1bedce31c9f9/webpack-6.0.0.tar.gz"
+MD5SUM="65009d7d6cf6ac70f3564ec93ff1c910"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-django nose optional-django mock"
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/python-webpack/slack-desc b/python/python-webpack/slack-desc
new file mode 100644
index 0000000000..a27e6daa85
--- /dev/null
+++ b/python/python-webpack/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python-webpack: python-webpack (provides a high-level interface to a webpack server.)
+python-webpack:
+python-webpack: python-webpack provides a high-level interface to a webpack-build
+python-webpack: server enabling you to send build requests and receive an object
+python-webpack: describing the outcome.
+python-webpack:
+python-webpack: Homepage: https://pypi.org/project/webpack/
+python-webpack:
+python-webpack:
+python-webpack:
+python-webpack:
diff --git a/python/python-zipp/README b/python/python-zipp/README
index 995ffb6ef9..6498203e6d 100644
--- a/python/python-zipp/README
+++ b/python/python-zipp/README
@@ -1 +1,2 @@
-A pathlib-compatible Zipfile object wrapper. A backport of the Path object.
+A pathlib-compatible Zipfile object wrapper. A backport of the Path
+object.
diff --git a/python/python-zipp/python-zipp.SlackBuild b/python/python-zipp/python-zipp.SlackBuild
index 79c3e5f2ac..4622558c71 100644
--- a/python/python-zipp/python-zipp.SlackBuild
+++ b/python/python-zipp/python-zipp.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-zipp
 VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=zipp
@@ -71,6 +71,8 @@ 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 {} \;
 
+sed -i "s,^name =.*$,&\nversion = $VERSION," setup.cfg
+
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python3-aiohttp-socks/python3-aiohttp-socks.SlackBuild b/python/python3-aiohttp-socks/python3-aiohttp-socks.SlackBuild
index cd1291de53..d9b5616a08 100644
--- a/python/python3-aiohttp-socks/python3-aiohttp-socks.SlackBuild
+++ b/python/python3-aiohttp-socks/python3-aiohttp-socks.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for python3-aiohttp-socks
-# Copyright 2019-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-aiohttp-socks
-VERSION=${VERSION:-0.3.9}
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-aiohttp-socks/python3-aiohttp-socks.info b/python/python3-aiohttp-socks/python3-aiohttp-socks.info
index 0b930cb5c0..d020a444ec 100644
--- a/python/python3-aiohttp-socks/python3-aiohttp-socks.info
+++ b/python/python3-aiohttp-socks/python3-aiohttp-socks.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-aiohttp-socks"
-VERSION="0.3.9"
+VERSION="0.6.0"
 HOMEPAGE="https://github.com/romis2012/aiohttp-socks/"
-DOWNLOAD="https://github.com/romis2012/aiohttp-socks/archive/0.3.9/aiohttp-socks-0.3.9.tar.gz"
-MD5SUM="901d0ddeba4ce4b66693d02cbee76413"
+DOWNLOAD="https://github.com/romis2012/aiohttp-socks/archive/v0.6.0/aiohttp-socks-0.6.0.tar.gz"
+MD5SUM="ab40f2a1e38ec0d43fdbd1267389afb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-aiohttp"
+REQUIRES="python3-aiohttp python-socks"
 MAINTAINER="Isaac Yu"
 EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python3-aiohttp/python3-aiohttp.SlackBuild b/python/python3-aiohttp/python3-aiohttp.SlackBuild
index 8819ca5110..c5b8149913 100644
--- a/python/python3-aiohttp/python3-aiohttp.SlackBuild
+++ b/python/python3-aiohttp/python3-aiohttp.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for python3-aiohttp
-# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-aiohttp
-SRCNAM=aiohttp
-VERSION=${VERSION:-3.6.2}
+VERSION=${VERSION:-3.7.4.post0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=aiohttp
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
diff --git a/python/python3-aiohttp/python3-aiohttp.info b/python/python3-aiohttp/python3-aiohttp.info
index d3eb30eb5e..aba2ee4ee4 100644
--- a/python/python3-aiohttp/python3-aiohttp.info
+++ b/python/python3-aiohttp/python3-aiohttp.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-aiohttp"
-VERSION="3.6.2"
+VERSION="3.7.4.post0"
 HOMEPAGE="https://aiohttp.readthedocs.io/en/stable/"
-DOWNLOAD="https://github.com/aio-libs/aiohttp/archive/v3.6.2/aiohttp-3.6.2.tar.gz"
-MD5SUM="9db66b5263e8fc5a11676c59491df508"
+DOWNLOAD="https://github.com/aio-libs/aiohttp/archive/v3.7.4.post0/aiohttp-3.7.4.post0.tar.gz"
+MD5SUM="d643e1dcbb79acd27aaaa9af3fc1e210"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gunicorn async-timeout python3-attrs yarl"
+REQUIRES="gunicorn async-timeout python3-attrs yarl python-chardet typing-extensions"
 MAINTAINER="Isaac Yu"
 EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python3-aiorpcX-legacy/README b/python/python3-aiorpcX-legacy/README
new file mode 100644
index 0000000000..3de43160bd
--- /dev/null
+++ b/python/python3-aiorpcX-legacy/README
@@ -0,0 +1,10 @@
+aiorpcX is a generic asyncio library implementation of RPC suitable
+for an application that is a client, server or both.
+
+NOTE:
+This is an older version of the program, kept here for compatibility
+with Electrum.
+
+IMPORTANT:
+This package conflicts with python3-aiorpcX, python3-aiorpcX-legacy
+and python3-aiorpcX cannot both be installed at the same time.
diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild b/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.SlackBuild
index fbe849885f..cbaef9452d 100644
--- a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
+++ b/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.SlackBuild
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for qbittorrent-qt5
-
-# Copyright 2019-2020 Donald Cooley South Haven, Indiana USA
-# Copyright 2009-2010 David Woodfall <dave@slackbuilds.org>
+# Slackware build script for python3-aiorpcX-legacy
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2021 nomnombtc <nomnombtc@arcor.de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=qbittorrent-qt5
-SRCNAM=qBittorrent
-VERSION=${VERSION:-4.2.5}
+PRGNAM=python3-aiorpcX-legacy
+VERSION=${VERSION:-0.18.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=aiorpcX
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -61,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-release-$VERSION
-tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z*
-cd $SRCNAM-release-$VERSION
+rm -rf $SRCNAM-$VERSION
+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 \
@@ -71,55 +71,17 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++14" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install INSTALL_ROOT=$PKG
-make clean
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-gui \
-  --build=$ARCH-slackware-linux
-
-make
-mv src/qbittorrent-nox $PKG/usr/bin
+python3 setup.py install --root=$PKG
 
 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
 
-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/etc/rc.d
-cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
-    $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst docs/ LICENCE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.info b/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.info
new file mode 100644
index 0000000000..e4aca61d3c
--- /dev/null
+++ b/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-aiorpcX-legacy"
+VERSION="0.18.7"
+HOMEPAGE="https://aiorpcx.readthedocs.io/en/stable/"
+DOWNLOAD="https://github.com/kyuupichan/aiorpcX/archive/0.18.7/aiorpcX-0.18.7.tar.gz"
+MD5SUM="8349fdc8ad6bfb37174ae24b444d8485"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-attrs"
+MAINTAINER="nomnombtc"
+EMAIL="nomnombtc@arcor.de"
diff --git a/python/python3-aiorpcX-legacy/slack-desc b/python/python3-aiorpcX-legacy/slack-desc
new file mode 100644
index 0000000000..607ffe6a83
--- /dev/null
+++ b/python/python3-aiorpcX-legacy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+python3-aiorpcX-legacy: python3-aiorpcX-legacy (Generic async RPC implementation)
+python3-aiorpcX-legacy:
+python3-aiorpcX-legacy: aiorpcX is a generic asyncio library implementation of RPC suitable
+python3-aiorpcX-legacy: for an application that is a client, server or both.
+python3-aiorpcX-legacy:
+python3-aiorpcX-legacy: https://aiorpcx.readthedocs.io/en/stable/
+python3-aiorpcX-legacy:
+python3-aiorpcX-legacy:
+python3-aiorpcX-legacy:
+python3-aiorpcX-legacy:
+python3-aiorpcX-legacy:
diff --git a/python/python3-aiorpcX/python3-aiorpcX.SlackBuild b/python/python3-aiorpcX/python3-aiorpcX.SlackBuild
index 3d57e691c8..e171e14dec 100644
--- a/python/python3-aiorpcX/python3-aiorpcX.SlackBuild
+++ b/python/python3-aiorpcX/python3-aiorpcX.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for python3-aiorpcX
-# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-aiorpcX
-SRCNAM=aiorpcX
-VERSION=${VERSION:-0.18.4}
+VERSION=${VERSION:-0.21.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=aiorpcX
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
diff --git a/python/python3-aiorpcX/python3-aiorpcX.info b/python/python3-aiorpcX/python3-aiorpcX.info
index 720bdc9afc..d09398e00b 100644
--- a/python/python3-aiorpcX/python3-aiorpcX.info
+++ b/python/python3-aiorpcX/python3-aiorpcX.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-aiorpcX"
-VERSION="0.18.4"
+VERSION="0.21.0"
 HOMEPAGE="https://aiorpcx.readthedocs.io/en/stable/"
-DOWNLOAD="https://github.com/kyuupichan/aiorpcX/archive/0.18.4/aiorpcX-0.18.4.tar.gz"
-MD5SUM="6af8ff3e6013a3060c7b3fefcb68b006"
+DOWNLOAD="https://github.com/kyuupichan/aiorpcX/archive/0.21.0/aiorpcX-0.21.0.tar.gz"
+MD5SUM="d8a80c95a8e7028d8a2ef0814a4df3f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-attrs"
diff --git a/python/python3-astroid/python3-astroid.SlackBuild b/python/python3-astroid/python3-astroid.SlackBuild
index 32be2b075f..f4bc841788 100644
--- a/python/python3-astroid/python3-astroid.SlackBuild
+++ b/python/python3-astroid/python3-astroid.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-astroid
 SRCNAM=astroid
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-astroid/python3-astroid.info b/python/python3-astroid/python3-astroid.info
index edf872bc3f..299fe9a3a4 100644
--- a/python/python3-astroid/python3-astroid.info
+++ b/python/python3-astroid/python3-astroid.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-astroid"
-VERSION="2.4.2"
+VERSION="2.5.3"
 HOMEPAGE="https://github.com/PyCQA/astroid"
-DOWNLOAD="https://files.pythonhosted.org/packages/ee/25/d3f01bc7e16641e0acb9a8c12decf1d5c2f04336c1f19ba69dc8e6927dff/astroid-2.4.2.tar.gz"
-MD5SUM="b54e1325995d3a9abd84bac91d4d5867"
+DOWNLOAD="https://files.pythonhosted.org/packages/43/2d/f10df6489391a534db45e809d78d1427828c72b851824cf4aa5b7539648d/astroid-2.5.3.tar.gz"
+MD5SUM="f10e7c2a8f4100ba4ab1451c0ada6dd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-lazy-object-proxy python3-six python3-wrapt typed_ast"
+REQUIRES="python3-lazy-object-proxy python3-wrapt typed_ast"
 MAINTAINER="Markus Rinne"
 EMAIL="markus.ka.rinne@gmail.com"
diff --git a/python/python3-babel/python3-babel.SlackBuild b/python/python3-babel/python3-babel.SlackBuild
index 9d7fe28dda..afd18c17b3 100644
--- a/python/python3-babel/python3-babel.SlackBuild
+++ b/python/python3-babel/python3-babel.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for python3-babel
 #
 # Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-babel
-VERSION=${VERSION:-2.8.0}
-CLDRVER=${CLDRVER:-36}
+VERSION=${VERSION:-2.9.0}
+CLDRVER=${CLDRVER:-37}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,9 @@ 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 {} \;
 
-ln -s $CWD/core.zip cldr/cldr-core-$CLDRVER.zip
+sed -i "s/getiterator/iter/" scripts/import_cldr.py # support Python 3.9
+sed -i "s/elem.getchildren()/list(elem)/" scripts/import_cldr.py # support Python 3.9
+ln -s $CWD/cldr-common-$CLDRVER.0.zip cldr/cldr-core-$CLDRVER.zip
 python3 setup.py import_cldr
 python3 setup.py install --root=$PKG
 
diff --git a/python/python3-babel/python3-babel.info b/python/python3-babel/python3-babel.info
index ea17410570..8557597423 100644
--- a/python/python3-babel/python3-babel.info
+++ b/python/python3-babel/python3-babel.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-babel"
-VERSION="2.8.0"
+VERSION="2.9.0"
 HOMEPAGE="http://babel.pocoo.org/"
-DOWNLOAD="https://github.com/python-babel/babel/archive/v2.8.0/babel-2.8.0.tar.gz \
-          https://unicode.org/Public/cldr/36/core.zip"
-MD5SUM="3101dfefacf2fe0c6fd039760095efc9 \
-        3ce45e73229db9c69a8bc09fbebb97ba"
+DOWNLOAD="https://github.com/python-babel/babel/archive/v2.9.0/babel-2.9.0.tar.gz \
+          https://unicode.org/Public/cldr/37/cldr-common-37.0.zip"
+MD5SUM="91cd179d285e0e2e5392a8ba3443931d \
+        40c0f5fbf8e2e2ad26047ecce6f6b07f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 pytz"
diff --git a/python/python3-certifi/README b/python/python3-certifi/README
deleted file mode 100644
index c7257f4714..0000000000
--- a/python/python3-certifi/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This installable Python package contains a CA Bundle that you can reference in
-your Python code.
diff --git a/python/python3-certifi/python3-certifi.info b/python/python3-certifi/python3-certifi.info
deleted file mode 100644
index 8b1d1ea2dc..0000000000
--- a/python/python3-certifi/python3-certifi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-certifi"
-VERSION="2019.6.16"
-HOMEPAGE="https://pypi.python.org/pypi/certifi/"
-DOWNLOAD="https://pypi.python.org/packages/source/c/certifi/certifi-2019.6.16.tar.gz"
-MD5SUM="af8fea5f3df6f7f81e9c6cbc6dd7c1e8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python3-django/python3-django.SlackBuild b/python/python3-django/python3-django.SlackBuild
index b3c79e0970..4a6275cf42 100644
--- a/python/python3-django/python3-django.SlackBuild
+++ b/python/python3-django/python3-django.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-django
 SRCNAM=$(echo $PRGNAM | cut -c9-14)
-VERSION=${VERSION:-3.0.3}
+VERSION=${VERSION:-3.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-django/python3-django.info b/python/python3-django/python3-django.info
index e9fc1d32e5..b46f9fc2d5 100644
--- a/python/python3-django/python3-django.info
+++ b/python/python3-django/python3-django.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-django"
-VERSION="3.0.3"
+VERSION="3.1.4"
 HOMEPAGE="https://www.djangoproject.com/"
-DOWNLOAD="https://github.com/django/django/archive/3.0.3/django-3.0.3.tar.gz"
-MD5SUM="51b9c3579a8a389f8a3be5b1cb2bd199"
+DOWNLOAD="https://github.com/django/django/archive/3.1.4/django-3.1.4.tar.gz"
+MD5SUM="2108aa59926c8f26b34522b93bd510bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pytz sqlparse asgiref"
diff --git a/python/python3-hsaudiotag3k/README b/python/python3-hsaudiotag3k/README
new file mode 100644
index 0000000000..ce90bc30a4
--- /dev/null
+++ b/python/python3-hsaudiotag3k/README
@@ -0,0 +1,9 @@
+hsaudiotag is a pure Python library that lets you read metadata 
+(bitrate, sample rate, duration and tags) from mp3, mp4, wma, ogg, 
+flac and aiff files.
+It can only read tags, not write to them, but unlike more complete 
+libraries (like Mutagen), it is BSD licensed, making it suitable for 
+most projects. 
+It is also backed by a nifty test suite.
+
+By ~red
diff --git a/python/python3-hsaudiotag3k/python3-hsaudiotag3k.SlackBuild b/python/python3-hsaudiotag3k/python3-hsaudiotag3k.SlackBuild
new file mode 100644
index 0000000000..262c989dae
--- /dev/null
+++ b/python/python3-hsaudiotag3k/python3-hsaudiotag3k.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for python3-hsaudiotag3k
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-hsaudiotag3k
+SRCNAM=hsaudiotag3k
+VERSION=${VERSION:-1.1.3.post1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py		
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-hsaudiotag3k/python3-hsaudiotag3k.info b/python/python3-hsaudiotag3k/python3-hsaudiotag3k.info
new file mode 100644
index 0000000000..2053bd25fb
--- /dev/null
+++ b/python/python3-hsaudiotag3k/python3-hsaudiotag3k.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-hsaudiotag3k"
+VERSION="1.1.3.post1"
+HOMEPAGE="https://pypi.org/project/hsaudiotag3k/"
+DOWNLOAD="https://files.pythonhosted.org/packages/6e/4a/117ded92d098ee203391a5712a54ff87b391e7637029a08e68957e399701/hsaudiotag3k-1.1.3.post1.tar.gz"
+MD5SUM="5b8b865345e1c19bbe036164dac692b8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-hsaudiotag3k/slack-desc b/python/python3-hsaudiotag3k/slack-desc
new file mode 100644
index 0000000000..73843e4338
--- /dev/null
+++ b/python/python3-hsaudiotag3k/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+python3-hsaudiotag3k: python3-hsaudiotag3k (hsaudiotag Python3 library)
+python3-hsaudiotag3k:
+python3-hsaudiotag3k: hsaudiotag is a pure Python library that lets you read metadata
+python3-hsaudiotag3k: (bitrate, sample rate, duration and tags) from mp3, mp4, wma, ogg,
+python3-hsaudiotag3k: flac and aiff files.
+python3-hsaudiotag3k: It can only read tags, not write to them, but unlike more complete
+python3-hsaudiotag3k: libraries (like Mutagen), it is BSD licensed, making it suitable for
+python3-hsaudiotag3k: most projects.
+python3-hsaudiotag3k: It is also backed by a nifty test suite.
+python3-hsaudiotag3k:
+python3-hsaudiotag3k: Homepage: https://pypi.org/project/hsaudiotag3k/
diff --git a/python/python3-ipython/python3-ipython.SlackBuild b/python/python3-ipython/python3-ipython.SlackBuild
index 52c433b9d8..d9388b540e 100644
--- a/python/python3-ipython/python3-ipython.SlackBuild
+++ b/python/python3-ipython/python3-ipython.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild for python3-ipython
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-ipython
-VERSION=${VERSION:-7.14.0}
+VERSION=${VERSION:-7.22.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-ipython/python3-ipython.info b/python/python3-ipython/python3-ipython.info
index 40f6497612..b376e863b1 100644
--- a/python/python3-ipython/python3-ipython.info
+++ b/python/python3-ipython/python3-ipython.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-ipython"
-VERSION="7.14.0"
+VERSION="7.22.0"
 HOMEPAGE="http://ipython.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipython/ipython-7.14.0.tar.gz"
-MD5SUM="57cc2a5064d86bcd8fee1293df1ef861"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipython/ipython-7.22.0.tar.gz"
+MD5SUM="852137f493e62e5730a1245cd91e0636"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="decorator ipython_genutils python3-jedi python3-pexpect pickleshare python3-prompt_toolkit Pygments simplegeneric traitlets backcall"
diff --git a/python/python3-isort/python3-isort.SlackBuild b/python/python3-isort/python3-isort.SlackBuild
index d2ddc1ed61..e55ae6ebad 100644
--- a/python/python3-isort/python3-isort.SlackBuild
+++ b/python/python3-isort/python3-isort.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-isort
 SRCNAM=isort
-VERSION=${VERSION:-5.6.1}
+VERSION=${VERSION:-5.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,6 @@ python3 setup.py install --root=$PKG
 
 # Remove isort binary, because it is contained in Python 2 version of isort package.
 rm $PKG/usr/bin/isort
-rmdir $PKG/usr/bin
 
 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
diff --git a/python/python3-isort/python3-isort.info b/python/python3-isort/python3-isort.info
index 2a732dddb1..8d98fd1ef0 100644
--- a/python/python3-isort/python3-isort.info
+++ b/python/python3-isort/python3-isort.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-isort"
-VERSION="5.6.1"
+VERSION="5.8.0"
 HOMEPAGE="https://timothycrosley.github.io/isort/"
-DOWNLOAD="https://files.pythonhosted.org/packages/0e/83/9697b151c190c71fae8d39a2b8b84fa37f317fd7ae82d8890f3f0675c078/isort-5.6.1.tar.gz"
-MD5SUM="13061f11890cc8d0d68eef78ff7cd6bd"
+DOWNLOAD="https://files.pythonhosted.org/packages/31/8a/6f5449a7be67e4655069490f05fa3e190f5f5864e6ddee140f60fe5526dd/isort-5.8.0.tar.gz"
+MD5SUM="e8800822700fdd2dc4b8708916a8da6a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python3-isounidecode/README b/python/python3-isounidecode/README
new file mode 100644
index 0000000000..c9efde2bb3
--- /dev/null
+++ b/python/python3-isounidecode/README
@@ -0,0 +1,9 @@
+This is a package for conversion and transliteration of unicode into
+ascii or iso-8859-1 strings.
+This is mostly a port of Perl Text::Unidecode to Python with additional
+support for iso8859-1.
+It works with different agree of success for different lanugages.
+It works quite good for European languages, works ok for Russian, and
+works to some extent for Arabic, Hindi.
+
+By ~red
diff --git a/python/python3-isounidecode/python3-isounidecode.SlackBuild b/python/python3-isounidecode/python3-isounidecode.SlackBuild
new file mode 100644
index 0000000000..a0d631c230
--- /dev/null
+++ b/python/python3-isounidecode/python3-isounidecode.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-isounidecode
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-isounidecode
+SRCNAM=isounidecode
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-isounidecode/python3-isounidecode.info b/python/python3-isounidecode/python3-isounidecode.info
new file mode 100644
index 0000000000..722024ed88
--- /dev/null
+++ b/python/python3-isounidecode/python3-isounidecode.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-isounidecode"
+VERSION="0.3"
+HOMEPAGE="https://github.com/redvasily/isounidecode"
+DOWNLOAD="https://github.com/redvasily/isounidecode/releases/download/0.3/isounidecode-0.3.tar.gz"
+MD5SUM="6df94b657a9cb7c3c36fbf410da163d5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-isounidecode/slack-desc b/python/python3-isounidecode/slack-desc
new file mode 100644
index 0000000000..e670d80f2c
--- /dev/null
+++ b/python/python3-isounidecode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+python3-isounidecode: python3-isounidecode (ISOunidecode Python3 library)
+python3-isounidecode:
+python3-isounidecode: This is a package for conversion and transliteration of unicode into
+python3-isounidecode: ascii or iso-8859-1 strings.
+python3-isounidecode: This is mostly a port of Perl Text::Unidecode to Python with
+python3-isounidecode: additional support for iso8859-1.
+python3-isounidecode: It works with different agree of success for different lanugages.
+python3-isounidecode: It works quite good for European languages, works ok for Russian, and
+python3-isounidecode: works to some extent for Arabic, Hindi.
+python3-isounidecode:
+python3-isounidecode: Homepage: https://github.com/redvasily/isounidecode
diff --git a/python/python3-jedi/python3-jedi.SlackBuild b/python/python3-jedi/python3-jedi.SlackBuild
index 935e7cf899..59ac5a836d 100644
--- a/python/python3-jedi/python3-jedi.SlackBuild
+++ b/python/python3-jedi/python3-jedi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-jedi
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # Copyright 2015-2017  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-jedi
-VERSION=${VERSION:-0.16.0}
+VERSION=${VERSION:-0.18.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-jedi/python3-jedi.info b/python/python3-jedi/python3-jedi.info
index 87aa36f3d5..29d54d4f07 100644
--- a/python/python3-jedi/python3-jedi.info
+++ b/python/python3-jedi/python3-jedi.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-jedi"
-VERSION="0.16.0"
+VERSION="0.18.0"
 HOMEPAGE="https://github.com/davidhalter/jedi"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jedi/jedi-0.16.0.tar.gz"
-MD5SUM="0c5b3dd6965930c4b0fd3816a4d4719c"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jedi/jedi-0.18.0.tar.gz"
+MD5SUM="72707c00e8d6d0b190a5e5664be1cac5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="parso"
diff --git a/python/python3-jupyter-ipykernel/README b/python/python3-jupyter-ipykernel/README
deleted file mode 100644
index 7f0e2020c3..0000000000
--- a/python/python3-jupyter-ipykernel/README
+++ /dev/null
@@ -1 +0,0 @@
-IPython Kernel for Jupyter supporting Python 3.
diff --git a/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.info b/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.info
deleted file mode 100644
index 9977158f94..0000000000
--- a/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-jupyter-ipykernel"
-VERSION="5.2.1"
-HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-5.2.1.tar.gz"
-MD5SUM="2866e6370fab41e6a544d2e3ba384cce"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-ipython jupyter_client python3-tornado"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python3-jupyter-ipykernel/slack-desc b/python/python3-jupyter-ipykernel/slack-desc
deleted file mode 100644
index 2f95819fa7..0000000000
--- a/python/python3-jupyter-ipykernel/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                         |-----handy-ruler------------------------------------------------------|
-python3-jupyter-ipykernel: python3-jupyter-ipykernel (Python 3 Kernel for Jupyter)
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel: IPython Kernel for Jupyter supporting Python 3.
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
-python3-jupyter-ipykernel:
diff --git a/python/python3-lazy-object-proxy/python3-lazy-object-proxy.SlackBuild b/python/python3-lazy-object-proxy/python3-lazy-object-proxy.SlackBuild
index 24a0b8820c..ca20845afc 100644
--- a/python/python3-lazy-object-proxy/python3-lazy-object-proxy.SlackBuild
+++ b/python/python3-lazy-object-proxy/python3-lazy-object-proxy.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-lazy-object-proxy
 SRCNAM=lazy-object-proxy
-VERSION=${VERSION:-1.4.3}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-lazy-object-proxy/python3-lazy-object-proxy.info b/python/python3-lazy-object-proxy/python3-lazy-object-proxy.info
index d98934ab96..4bbab650e3 100644
--- a/python/python3-lazy-object-proxy/python3-lazy-object-proxy.info
+++ b/python/python3-lazy-object-proxy/python3-lazy-object-proxy.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-lazy-object-proxy"
-VERSION="1.4.3"
+VERSION="1.6.0"
 HOMEPAGE="https://github.com/ionelmc/python-lazy-object-proxy"
-DOWNLOAD="https://files.pythonhosted.org/packages/07/3f/a3d687f83c7d44970f70ff0400677746c8860b11f0c08f6b4e07205f0cdc/lazy-object-proxy-1.4.3.tar.gz"
-MD5SUM="5c64c06affcd2a7c6ddc848af4280cca"
+DOWNLOAD="https://files.pythonhosted.org/packages/bb/f5/646893a04dcf10d4acddb61c632fd53abb3e942e791317dcdd57f5800108/lazy-object-proxy-1.6.0.tar.gz"
+MD5SUM="0b99101615658aa711cb55c8db4930d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 setuptools-scm"
diff --git a/python/python3-mpmath/README b/python/python3-mpmath/README
index 5d1fe568a9..26f493d19b 100644
--- a/python/python3-mpmath/README
+++ b/python/python3-mpmath/README
@@ -1,6 +1,7 @@
 mpmath is a free (BSD licensed) Python library for real and complex
-floating-point arithmetic with arbitrary precision. It has been developed
-by Fredrik Johansson since 2007, with help from many contributors.
+floating-point arithmetic with arbitrary precision. It has been
+developed by Fredrik Johansson since 2007, with help from many
+contributors.
 
 This is the python3 version of mpmath and it can coexist with SBo's
 mpmath package.
diff --git a/python/python3-mpmath/python3-mpmath.SlackBuild b/python/python3-mpmath/python3-mpmath.SlackBuild
index 4753945f4d..2dcc257bcf 100644
--- a/python/python3-mpmath/python3-mpmath.SlackBuild
+++ b/python/python3-mpmath/python3-mpmath.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for python3-mpmath
 
 # Copyright SlackBuilds.org Project, David Melik, 2015, Spokane, WA, USA
-# Copyright 2019, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=python3-mpmath
 SRCNAM=mpmath
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-mpmath/python3-mpmath.info b/python/python3-mpmath/python3-mpmath.info
index 47a300912c..1746b74f96 100644
--- a/python/python3-mpmath/python3-mpmath.info
+++ b/python/python3-mpmath/python3-mpmath.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-mpmath"
-VERSION="1.1.0"
+VERSION="1.2.1"
 HOMEPAGE="http://mpmath.org/"
-DOWNLOAD="https://github.com/fredrik-johansson/mpmath/archive/1.1.0/mpmath-1.1.0.tar.gz"
-MD5SUM="c06bdf456bbbf092c929931974c8dac9"
+DOWNLOAD="https://files.pythonhosted.org/packages/95/ba/7384cb4db4ed474d4582944053549e02ec25da630810e4a23454bc9fa617/mpmath-1.2.1.tar.gz"
+MD5SUM="ef8a6449851755319673b06f71731d52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES="python3 setuptools-scm"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/python/python3-multidict/python3-multidict.SlackBuild b/python/python3-multidict/python3-multidict.SlackBuild
index 9c08864dc0..ba0b740d4d 100644
--- a/python/python3-multidict/python3-multidict.SlackBuild
+++ b/python/python3-multidict/python3-multidict.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for python3-multidict
-# Copyright 2019-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-multidict
-VERSION=${VERSION:-4.7.6}
+VERSION=${VERSION:-5.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-multidict/python3-multidict.info b/python/python3-multidict/python3-multidict.info
index 2afb61d633..252ea06813 100644
--- a/python/python3-multidict/python3-multidict.info
+++ b/python/python3-multidict/python3-multidict.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-multidict"
-VERSION="4.7.6"
+VERSION="5.1.0"
 HOMEPAGE="https://multidict.readthedocs.io/en/stable/"
-DOWNLOAD="https://github.com/aio-libs/multidict/archive/v4.7.6/multidict-4.7.6.tar.gz"
-MD5SUM="819045033522109102e366f25a70aac8"
+DOWNLOAD="https://github.com/aio-libs/multidict/archive/v5.1.0/multidict-5.1.0.tar.gz"
+MD5SUM="78fd6c8b34823a3e05706c66dd1d05a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-Cython"
diff --git a/python/python3-multidict/slack-desc b/python/python3-multidict/slack-desc
index d8bf5a6a10..8a94ad4016 100644
--- a/python/python3-multidict/slack-desc
+++ b/python/python3-multidict/slack-desc
@@ -8,8 +8,8 @@
                  |-----handy-ruler------------------------------------------------------|
 python3-multidict: python3-multidict (Asyncio-based multidict implementation)
 python3-multidict:
-python3-multidict: Multidict is dict-like collection of key-value pairs where key might 
-python3-multidict: be occurred more than once in the container. 
+python3-multidict: Multidict is dict-like collection of key-value pairs where key might
+python3-multidict: be occurred more than once in the container.
 python3-multidict:
 python3-multidict: https://multidict.readthedocs.io/en/stable/
 python3-multidict:
diff --git a/python/python3-obspy/python3-obspy.info b/python/python3-obspy/python3-obspy.info
index b440e95868..677b80e92e 100644
--- a/python/python3-obspy/python3-obspy.info
+++ b/python/python3-obspy/python3-obspy.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/obspy/obspy/archive/1.2.2/obspy-1.2.2.tar.gz"
 MD5SUM="1c334f4bf1ddffb0eb836e0f996384e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="decorator python3-future python-requests scipy3 lxml SQLAlchemy python3-basemap python3-certifi suds-jurko"
+REQUIRES="decorator python3-future python-requests scipy3 lxml SQLAlchemy python3-basemap python-certifi suds-jurko"
 MAINTAINER="Cristiano Urban"
 EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/python/python3-openpyxl/python3-openpyxl.SlackBuild b/python/python3-openpyxl/python3-openpyxl.SlackBuild
index 549f270c18..f4eab85eb7 100644
--- a/python/python3-openpyxl/python3-openpyxl.SlackBuild
+++ b/python/python3-openpyxl/python3-openpyxl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-openpyxl
 
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-openpyxl
-VERSION=${VERSION:-3.0.3}
-COMMIT=${COMMIT:-ca7b1baf75f2}
+VERSION=${VERSION:-3.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +57,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$SRCNAM-$COMMIT
-tar xvf $CWD/$VERSION.tar.bz2
-cd $SRCNAM-$SRCNAM-$COMMIT
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/python/python3-openpyxl/python3-openpyxl.info b/python/python3-openpyxl/python3-openpyxl.info
index 6eb84b0ee2..fece003fcc 100644
--- a/python/python3-openpyxl/python3-openpyxl.info
+++ b/python/python3-openpyxl/python3-openpyxl.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-openpyxl"
-VERSION="3.0.3"
+VERSION="3.0.7"
 HOMEPAGE="https://openpyxl.readthedocs.org/"
-DOWNLOAD="https://bitbucket.org/openpyxl/openpyxl/get/3.0.3.tar.bz2"
-MD5SUM="8e1cd4bc3045f866e8890cd782f1af64"
+DOWNLOAD="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.7/openpyxl-3.0.7.tar.bz2"
+MD5SUM="7bf1b7dee9fbdc31b8128aa522f11f41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdcal et_xmlfile"
+REQUIRES="et_xmlfile"
 MAINTAINER="Isaac Yu"
 EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python3-packaging/python3-packaging.SlackBuild b/python/python3-packaging/python3-packaging.SlackBuild
index 30bebdd262..9e3c7b1277 100644
--- a/python/python3-packaging/python3-packaging.SlackBuild
+++ b/python/python3-packaging/python3-packaging.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-packaging
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-packaging
-VERSION=${VERSION:-20.4}
+VERSION=${VERSION:-20.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-packaging/python3-packaging.info b/python/python3-packaging/python3-packaging.info
index a9d1131a6e..4561ff8764 100644
--- a/python/python3-packaging/python3-packaging.info
+++ b/python/python3-packaging/python3-packaging.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-packaging"
-VERSION="20.4"
+VERSION="20.9"
 HOMEPAGE="https://pypi.python.org/pypi/packaging"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/packaging/packaging-20.4.tar.gz"
-MD5SUM="3208229da731c5d8e29d4d8941e75005"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/packaging/packaging-20.9.tar.gz"
+MD5SUM="5377308b3ba89f2d78c05e7f485be65d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-attrs python3-pyparsing python3-six"
diff --git a/python/python3-plexapi/README b/python/python3-plexapi/README
new file mode 100644
index 0000000000..6252f31063
--- /dev/null
+++ b/python/python3-plexapi/README
@@ -0,0 +1,4 @@
+Unofficial Python bindings for the Plex API. Our goal is to match all 
+capabilities of the official Plex Web Client.
+
+By ~red
diff --git a/python/python3-plexapi/python3-plexapi.SlackBuild b/python/python3-plexapi/python3-plexapi.SlackBuild
new file mode 100644
index 0000000000..1a969a4ec2
--- /dev/null
+++ b/python/python3-plexapi/python3-plexapi.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-plexapi
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-plexapi
+SRCNAM=PlexAPI
+VERSION=${VERSION:-4.5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-plexapi/python3-plexapi.info b/python/python3-plexapi/python3-plexapi.info
new file mode 100644
index 0000000000..c2f3146d8f
--- /dev/null
+++ b/python/python3-plexapi/python3-plexapi.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-plexapi"
+VERSION="4.5.1"
+HOMEPAGE="https://github.com/pkkid/python-plexapi"
+DOWNLOAD="https://files.pythonhosted.org/packages/f5/9c/93c888870c76303d677a6c338632db02e647f3ab5f04ef22532e3556e30c/PlexAPI-4.5.1.tar.gz"
+MD5SUM="30a91e4b9b25443edb9d23ce808e6ad5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-plexapi/slack-desc b/python/python3-plexapi/slack-desc
new file mode 100644
index 0000000000..2ccec8aff3
--- /dev/null
+++ b/python/python3-plexapi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python3-plexapi: python3-plexapi (PlexAPI Python3 library)
+python3-plexapi:
+python3-plexapi: Unofficial Python bindings for the Plex API.
+python3-plexapi: Our goal is to match all capabilities of the official Plex Web
+python3-plexapi: Client.
+python3-plexapi:
+python3-plexapi:
+python3-plexapi:
+python3-plexapi:
+python3-plexapi:
+python3-plexapi: Homepage: https://github.com/pkkid/python-plexapi
diff --git a/python/python3-prompt_toolkit/python3-prompt_toolkit.SlackBuild b/python/python3-prompt_toolkit/python3-prompt_toolkit.SlackBuild
index 93fee1acec..07ae7f0aca 100644
--- a/python/python3-prompt_toolkit/python3-prompt_toolkit.SlackBuild
+++ b/python/python3-prompt_toolkit/python3-prompt_toolkit.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for python3-prompt_toolkit
 
 # Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-prompt_toolkit
-VERSION=${VERSION:-2.0.9}
+VERSION=${VERSION:-3.0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-prompt_toolkit/python3-prompt_toolkit.info b/python/python3-prompt_toolkit/python3-prompt_toolkit.info
index b050d342c1..d03abf6bbc 100644
--- a/python/python3-prompt_toolkit/python3-prompt_toolkit.info
+++ b/python/python3-prompt_toolkit/python3-prompt_toolkit.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-prompt_toolkit"
-VERSION="2.0.9"
+VERSION="3.0.18"
 HOMEPAGE="https://github.com/jonathanslenders/python-prompt-toolkit"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/prompt_toolkit/prompt_toolkit-2.0.9.tar.gz"
-MD5SUM="091daddeec62015e0be36e8682d36562"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/prompt_toolkit/prompt_toolkit-3.0.18.tar.gz"
+MD5SUM="2d99236def2e1aa39d3eee0f5d05d340"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-wcwidth python3-six"
diff --git a/python/python3-ptyprocess/python3-ptyprocess.SlackBuild b/python/python3-ptyprocess/python3-ptyprocess.SlackBuild
index aa6d21afb4..4b2e723f00 100644
--- a/python/python3-ptyprocess/python3-ptyprocess.SlackBuild
+++ b/python/python3-ptyprocess/python3-ptyprocess.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for python3-ptyprocess
 
 # Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-ptyprocess
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-ptyprocess/python3-ptyprocess.info b/python/python3-ptyprocess/python3-ptyprocess.info
index ec991c5489..e3978b246e 100644
--- a/python/python3-ptyprocess/python3-ptyprocess.info
+++ b/python/python3-ptyprocess/python3-ptyprocess.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-ptyprocess"
-VERSION="0.6.0"
+VERSION="0.7.0"
 HOMEPAGE="https://pypi.python.org/pypi/ptyprocess"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-0.6.0.tar.gz"
-MD5SUM="37402d69f3b50913d4d483587bffad8f"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-0.7.0.tar.gz"
+MD5SUM="9da200c397cb1752209a6b718b6cfc68"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python3-pulsectl/README b/python/python3-pulsectl/README
new file mode 100644
index 0000000000..bef884264c
--- /dev/null
+++ b/python/python3-pulsectl/README
@@ -0,0 +1,10 @@
+Python (3.x and 2.x) blocking high-level interface and ctypes-based 
+bindings for PulseAudio (libpulse), to use in a simple synchronous code.
+Wrappers are mostly for mixer-like controls and introspection-related 
+operations, as opposed to e.g. submitting sound samples to play and 
+player-like client.
+For async version to use with asyncio, see pulsectl-asyncio project 
+instead.
+Originally forked from pulsemixer project, which had this code bundled.
+
+By ~red
diff --git a/python/python3-pulsectl/python3-pulsectl.SlackBuild b/python/python3-pulsectl/python3-pulsectl.SlackBuild
new file mode 100644
index 0000000000..965accab09
--- /dev/null
+++ b/python/python3-pulsectl/python3-pulsectl.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-pulsectl
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-pulsectl
+SRCNAM=pulsectl
+VERSION=${VERSION:-21.3.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pulsectl/python3-pulsectl.info b/python/python3-pulsectl/python3-pulsectl.info
new file mode 100644
index 0000000000..9a109b8b06
--- /dev/null
+++ b/python/python3-pulsectl/python3-pulsectl.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pulsectl"
+VERSION="21.3.4"
+HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
+DOWNLOAD="https://files.pythonhosted.org/packages/82/50/9ab6147b657b20c1a7c3b72b285fc94f572c6005735bb0364a40f8b337a1/pulsectl-21.3.4.tar.gz"
+MD5SUM="e74990684ecd70b946bbd18dbfab23cf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-pulsectl/slack-desc b/python/python3-pulsectl/slack-desc
new file mode 100644
index 0000000000..b5ff616ce5
--- /dev/null
+++ b/python/python3-pulsectl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+python3-pulsectl: python3-pulsectl (Pulse-control Python3 library)
+python3-pulsectl:
+python3-pulsectl: Python (3.x and 2.x) blocking high-level interface and
+python3-pulsectl: ctypes-based bindings for PulseAudio (libpulse), to use in a simple
+python3-pulsectl: synchronous code. Wrappers are mostly for mixer-like controls and
+python3-pulsectl: introspection-related operations, as opposed to e.g. submitting
+python3-pulsectl: sound samples to play and player-like client. For async version to
+python3-pulsectl: use with asyncio, see pulsectl-asyncio project instead. Originally
+python3-pulsectl: forked from pulsemixer project, which had this code bundled.
+python3-pulsectl:
+python3-pulsectl: Homepage: https://github.com/mk-fg/python-pulse-control
diff --git a/python/python3-pylint/python3-pylint.SlackBuild b/python/python3-pylint/python3-pylint.SlackBuild
index 1c03dcce2d..19317a2243 100644
--- a/python/python3-pylint/python3-pylint.SlackBuild
+++ b/python/python3-pylint/python3-pylint.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-pylint
 SRCNAM=pylint
-VERSION=${VERSION:-2.6.0}
+VERSION=${VERSION:-2.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-pylint/python3-pylint.info b/python/python3-pylint/python3-pylint.info
index aca94dcdab..87e73424ee 100644
--- a/python/python3-pylint/python3-pylint.info
+++ b/python/python3-pylint/python3-pylint.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-pylint"
-VERSION="2.6.0"
+VERSION="2.7.4"
 HOMEPAGE="https://www.pylint.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/24/4a/a07484119d23283de4d8db8176e85be3b20583eefc1cbfa8363b1414fbe2/pylint-2.6.0.tar.gz"
-MD5SUM="7db013001ada7c2a4383818cbc593326"
+DOWNLOAD="https://files.pythonhosted.org/packages/2d/5b/491cf9e85288c29759a6535e6009938c2141b137b27a0653e435dcbad6a2/pylint-2.7.4.tar.gz"
+MD5SUM="448218b9b424be9b3012dd60ee14ad94"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-toml python3-astroid python3-isort python3-mccabe"
diff --git a/python/python3-pylyrics/README b/python/python3-pylyrics/README
new file mode 100644
index 0000000000..c10a196852
--- /dev/null
+++ b/python/python3-pylyrics/README
@@ -0,0 +1,5 @@
+PyLyrics is a python module to get Lyrics of songs from 
+lyrics.wikia.com. It has support for getting albums of a singer and 
+songs from an album from which lyrics can be accessed.
+
+By ~red
diff --git a/python/python3-pylyrics/python3-pylyrics.SlackBuild b/python/python3-pylyrics/python3-pylyrics.SlackBuild
new file mode 100644
index 0000000000..83d377c35c
--- /dev/null
+++ b/python/python3-pylyrics/python3-pylyrics.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-pylyrics
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-pylyrics
+SRCNAM=PyLyrics
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+unzip $CWD/$SRCNAM-$VERSION.zip
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pylyrics/python3-pylyrics.info b/python/python3-pylyrics/python3-pylyrics.info
new file mode 100644
index 0000000000..10fc210a7b
--- /dev/null
+++ b/python/python3-pylyrics/python3-pylyrics.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pylyrics"
+VERSION="1.1.0"
+HOMEPAGE="https://github.com/geekpradd/PyLyrics"
+DOWNLOAD="https://files.pythonhosted.org/packages/9d/74/8e92322cb1425739849eb719c3b5d8ca05a6b1f027829fd56b4db7c4b7c7/PyLyrics-1.1.0.zip"
+MD5SUM="1f3c997edeba149a8fb2b861cbad89c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-pylyrics/slack-desc b/python/python3-pylyrics/slack-desc
new file mode 100644
index 0000000000..2d3dc7ee5c
--- /dev/null
+++ b/python/python3-pylyrics/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+python3-pylyrics: python3-pylyrics (PyLyrics Python3 library for Slackware)
+python3-pylyrics:
+python3-pylyrics: PyLyrics is a python module to get Lyrics of songs from
+python3-pylyrics: lyrics.wikia.com.
+python3-pylyrics: It has support for getting albums of a singer and songs from an album
+python3-pylyrics: from which lyrics can be accessed.
+python3-pylyrics:
+python3-pylyrics:
+python3-pylyrics:
+python3-pylyrics:
+python3-pylyrics: Homepage: https://github.com/geekpradd/PyLyrics
diff --git a/python/python3-pypresence/README b/python/python3-pypresence/README
new file mode 100644
index 0000000000..1063ab9706
--- /dev/null
+++ b/python/python3-pypresence/README
@@ -0,0 +1,3 @@
+A Discord RPC library in Python.
+
+By ~red
diff --git a/python/python3-pypresence/python3-pypresence.SlackBuild b/python/python3-pypresence/python3-pypresence.SlackBuild
new file mode 100644
index 0000000000..8c746587f7
--- /dev/null
+++ b/python/python3-pypresence/python3-pypresence.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-pypresence
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-pypresence
+SRCNAM=pypresence
+VERSION=${VERSION:-4.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pypresence/python3-pypresence.info b/python/python3-pypresence/python3-pypresence.info
new file mode 100644
index 0000000000..5fd98ad4ab
--- /dev/null
+++ b/python/python3-pypresence/python3-pypresence.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pypresence"
+VERSION="4.2.0"
+HOMEPAGE="https://github.com/qwertyquerty/pypresence"
+DOWNLOAD="https://files.pythonhosted.org/packages/e2/d1/8d0fb2f2ceda70e3a5cb199ca019cb592c957976e1944c62d43335e1f29c/pypresence-4.2.0.tar.gz"
+MD5SUM="87fb41e2a5a353a4ec8e74169da87a69"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-pypresence/slack-desc b/python/python3-pypresence/slack-desc
new file mode 100644
index 0000000000..1b312fe8af
--- /dev/null
+++ b/python/python3-pypresence/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+python3-pypresence: python3-pypresence (Pypresence Python3 library)
+python3-pypresence:
+python3-pypresence: A Discord RPC library in Python.
+python3-pypresence:
+python3-pypresence:
+python3-pypresence:
+python3-pypresence:
+python3-pypresence:
+python3-pypresence:
+python3-pypresence:
+python3-pypresence: https://github.com/qwertyquerty/pypresence
diff --git a/python/python3-pyrsistent/python3-pyrsistent.SlackBuild b/python/python3-pyrsistent/python3-pyrsistent.SlackBuild
index 5317cfcc37..e1058b9a1a 100644
--- a/python/python3-pyrsistent/python3-pyrsistent.SlackBuild
+++ b/python/python3-pyrsistent/python3-pyrsistent.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-pyrsistent
-VERSION=${VERSION:-0.16.0}
+VERSION=${VERSION:-0.17.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-pyrsistent/python3-pyrsistent.info b/python/python3-pyrsistent/python3-pyrsistent.info
index beccf3483b..988972d2a1 100644
--- a/python/python3-pyrsistent/python3-pyrsistent.info
+++ b/python/python3-pyrsistent/python3-pyrsistent.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-pyrsistent"
-VERSION="0.16.0"
+VERSION="0.17.3"
 HOMEPAGE="https://github.com/tobgu/pyrsistent/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyrsistent/pyrsistent-0.16.0.tar.gz"
-MD5SUM="4ba30da6f0a63554e70ac6c4c1904929"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyrsistent/pyrsistent-0.17.3.tar.gz"
+MD5SUM="cd38658ea772a7f9b12b6f9485a7018b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-six"
diff --git a/python/python3-pysdl2/README b/python/python3-pysdl2/README
new file mode 100644
index 0000000000..793874187b
--- /dev/null
+++ b/python/python3-pysdl2/README
@@ -0,0 +1,10 @@
+PySDL2 is a pure Python wrapper around the SDL2, SDL2_mixer, 
+SDL2_image, SDL2_ttf, and SDL2_gfx libraries. Instead of relying on C
+code, it uses the built-in ctypes module to interface with SDL2, and 
+provides simple Python classes and wrappers for common SDL2 
+functionality.
+
+This package changed the path to python3.x incase of some of my 
+packages dependencies and the sake of Python3.
+
+By ~red
diff --git a/python/python3-pysdl2/python3-pysdl2.SlackBuild b/python/python3-pysdl2/python3-pysdl2.SlackBuild
new file mode 100644
index 0000000000..f27f6a998a
--- /dev/null
+++ b/python/python3-pysdl2/python3-pysdl2.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-pysdl2
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-pysdl2
+SRCNAM=PySDL2
+VERSION=${VERSION:-0.9.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pysdl2/python3-pysdl2.info b/python/python3-pysdl2/python3-pysdl2.info
new file mode 100644
index 0000000000..bfd2d56b44
--- /dev/null
+++ b/python/python3-pysdl2/python3-pysdl2.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pysdl2"
+VERSION="0.9.7"
+HOMEPAGE="https://github.com/marcusva/py-sdl2"
+DOWNLOAD="https://files.pythonhosted.org/packages/39/58/21d31ceba68b7d8c06be5ee620264bc91a5a7c69b796a7c32aae9e8b10bc/PySDL2-0.9.7.tar.gz"
+MD5SUM="e77e9c15589e15b6c877555f34a429ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-pysdl2/slack-desc b/python/python3-pysdl2/slack-desc
new file mode 100644
index 0000000000..37610d4730
--- /dev/null
+++ b/python/python3-pysdl2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python3-pysdl2: python3-pysdl2 (PySDL2 Python3 library)
+python3-pysdl2:
+python3-pysdl2: PySDL2 is a pure Python wrapper around the SDL2, SDL2_mixer,
+python3-pysdl2: SDL2_image, SDL2_ttf, and SDL2_gfx libraries. Instead of relying on
+python3-pysdl2: C code, it uses the built-in ctypes module to interface with SDL2, and
+python3-pysdl2: provides simple Python classes and wrappers for common SDL2
+python3-pysdl2: functionality.
+python3-pysdl2:
+python3-pysdl2:
+python3-pysdl2:
+python3-pysdl2: https://github.com/marcusva/py-sdl2
diff --git a/python/python3-seaborn/python3-seaborn.SlackBuild b/python/python3-seaborn/python3-seaborn.SlackBuild
index 24db23459a..a3b9c72a27 100644
--- a/python/python3-seaborn/python3-seaborn.SlackBuild
+++ b/python/python3-seaborn/python3-seaborn.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-seaborn
 
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-seaborn
-VERSION=${VERSION:-0.10.1}
-SRCNAM=seaborn
+VERSION=${VERSION:-0.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=seaborn
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
diff --git a/python/python3-seaborn/python3-seaborn.info b/python/python3-seaborn/python3-seaborn.info
index 65cec7b38a..b2adaafd8b 100644
--- a/python/python3-seaborn/python3-seaborn.info
+++ b/python/python3-seaborn/python3-seaborn.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-seaborn"
-VERSION="0.10.1"
+VERSION="0.11.1"
 HOMEPAGE="https://seaborn.pydata.org/"
-DOWNLOAD="https://github.com/mwaskom/seaborn/archive/v0.10.1/seaborn-0.10.1.tar.gz"
-MD5SUM="125586d58ef64fb47199d4eae71cbd69"
+DOWNLOAD="https://github.com/mwaskom/seaborn/archive/v0.11.1/seaborn-0.11.1.tar.gz"
+MD5SUM="6fd7c297d708044439bde6997c96402c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-matplotlib python3-pandas scipy3"
diff --git a/python/python3-soupsieve/python3-soupsieve.SlackBuild b/python/python3-soupsieve/python3-soupsieve.SlackBuild
index ebff96b0ed..24b96b6159 100644
--- a/python/python3-soupsieve/python3-soupsieve.SlackBuild
+++ b/python/python3-soupsieve/python3-soupsieve.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-soupsieve
 
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-soupsieve
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-soupsieve/python3-soupsieve.info b/python/python3-soupsieve/python3-soupsieve.info
index f471e1ee56..45c27a2317 100644
--- a/python/python3-soupsieve/python3-soupsieve.info
+++ b/python/python3-soupsieve/python3-soupsieve.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-soupsieve"
-VERSION="2.0.1"
+VERSION="2.2.1"
 HOMEPAGE="https://github.com/facelessuser/soupsieve"
-DOWNLOAD="https://github.com/facelessuser/soupsieve/archive/2.0.1/soupsieve-2.0.1.tar.gz"
-MD5SUM="71bc38dc5ab3ed9614d0594d72553d1b"
+DOWNLOAD="https://github.com/facelessuser/soupsieve/archive/2.2.1/soupsieve-2.2.1.tar.gz"
+MD5SUM="8b9b3b1c7cdde2ffc57d58fd90ad09a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python3-stagger/README b/python/python3-stagger/README
new file mode 100644
index 0000000000..74ad8ab11b
--- /dev/null
+++ b/python/python3-stagger/README
@@ -0,0 +1,10 @@
+The ID3v2 tag format is notorious for its useless specification 
+documents and its quirky, mutually incompatible part-implementations. 
+Stagger is to provide a robust tagging package that is able to handle 
+all the various badly formatted tags out there and allow you to convert
+them to a consensus format.
+*If you ran into source not found and can't be extracted, make sure it 
+starts with release* not the stagger-release*, it's probably because 
+you've downloaded from github directly via browser.
+
+By ~red
diff --git a/python/python3-stagger/python3-stagger.SlackBuild b/python/python3-stagger/python3-stagger.SlackBuild
new file mode 100644
index 0000000000..a8a7e730f2
--- /dev/null
+++ b/python/python3-stagger/python3-stagger.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python3-stagger
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-stagger
+SRCNAM=stagger
+VERSION=${VERSION:-1.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-release-$VERSION
+tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz
+cd $SRCNAM-release-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py
+
+python3 setup.py install --root=$PKG
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-stagger/python3-stagger.info b/python/python3-stagger/python3-stagger.info
new file mode 100644
index 0000000000..5e61cb583c
--- /dev/null
+++ b/python/python3-stagger/python3-stagger.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-stagger"
+VERSION="1.0.1"
+HOMEPAGE="http://github.com/lorentey/stagger"
+DOWNLOAD="https://github.com/staggerpkg/stagger/archive/release-1.0.1/stagger-release-1.0.1.tar.gz"
+MD5SUM="b4b141bc36cfda0d6f9b2d40cff3b346"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-stagger/slack-desc b/python/python3-stagger/slack-desc
new file mode 100644
index 0000000000..98636f91c0
--- /dev/null
+++ b/python/python3-stagger/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python3-stagger: python3-stagger (Stagger Python3 library)
+python3-stagger:
+python3-stagger: The ID3v2 tag format is notorious for its useless specification
+python3-stagger: documents and its quirky, mutually incompatible part-implementations.
+python3-stagger: Stagger is to provide a robust tagging package that is able to
+python3-stagger: handle all the various badly formatted tags out there and allow you
+python3-stagger: to convert them to a consensus format.
+python3-stagger:
+python3-stagger:
+python3-stagger:
+python3-stagger: Homepage: https://pypi.org/project/stagger/
diff --git a/python/python3-tekore/README b/python/python3-tekore/README
new file mode 100644
index 0000000000..27a44d49fb
--- /dev/null
+++ b/python/python3-tekore/README
@@ -0,0 +1,8 @@
+Welcome to the Python Package Tekore! We provide a client for the 
+Spotify Web API for Python, complete with all available endpoints and 
+authentication methods, async support and loads of additional features.
+Tekore allows you to interact with the API effortlessly. 
+Here’s five lines to get you full access and start playing your top 
+songs.
+
+By ~red
diff --git a/python/python3-tekore/python3-tekore.SlackBuild b/python/python3-tekore/python3-tekore.SlackBuild
new file mode 100644
index 0000000000..9776532091
--- /dev/null
+++ b/python/python3-tekore/python3-tekore.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for python3-tekore
+
+# Copyright 2019-2020 Pouria Rezaei <Pouria.rz@outlook.com>
+# 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=python3-tekore
+SRCNAM=tekore
+VERSION=${VERSION:-3.6.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py		
+
+python3 setup.py install --root=$PKG
+
+
+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
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-tekore/python3-tekore.info b/python/python3-tekore/python3-tekore.info
new file mode 100644
index 0000000000..be263253af
--- /dev/null
+++ b/python/python3-tekore/python3-tekore.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-tekore"
+VERSION="3.6.2"
+HOMEPAGE="https://pypi.org/project/tekore/"
+DOWNLOAD="https://files.pythonhosted.org/packages/ed/c4/a589e124812d79e24049e58831a2bce97234f2d9ec500423dc52beb46450/tekore-3.6.2.tar.gz"
+MD5SUM="b5f1e4bc7244cd07ac5554a842811aa5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/python/python3-tekore/slack-desc b/python/python3-tekore/slack-desc
new file mode 100644
index 0000000000..6df98be1c7
--- /dev/null
+++ b/python/python3-tekore/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python3-tekore: python3-tekore (Tekore Python3 library)
+python3-tekore:
+python3-tekore: Welcome to the Python Package Tekore! We provide a client for the
+python3-tekore: Spotify Web API for Python, complete with all available endpoints and
+python3-tekore: authentication methods, async support and loads of additional
+python3-tekore: features. Tekore allows you to interact with the API effortlessly.
+python3-tekore: Here’s five lines to get you full access and start playing your
+python3-tekore: top songs.
+python3-tekore:
+python3-tekore:
+python3-tekore: https://pypi.org/project/tekore/
diff --git a/python/python3-tornado/python3-tornado.SlackBuild b/python/python3-tornado/python3-tornado.SlackBuild
index 3e8fa02242..a18f778006 100644
--- a/python/python3-tornado/python3-tornado.SlackBuild
+++ b/python/python3-tornado/python3-tornado.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-tornado
-VERSION=${VERSION:-6.0.4}
+VERSION=${VERSION:-6.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-tornado/python3-tornado.info b/python/python3-tornado/python3-tornado.info
index 7e33d779ed..ed75d5ebce 100644
--- a/python/python3-tornado/python3-tornado.info
+++ b/python/python3-tornado/python3-tornado.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-tornado"
-VERSION="6.0.4"
+VERSION="6.1.0"
 HOMEPAGE="http://www.tornadoweb.org"
-DOWNLOAD="https://github.com/tornadoweb/tornado/archive/v6.0.4/tornado-6.0.4.tar.gz"
-MD5SUM="278b164caddc4d67c05b03c53d823c82"
+DOWNLOAD="https://github.com/tornadoweb/tornado/archive/v6.1.0/tornado-6.1.0.tar.gz"
+MD5SUM="2d94363f8a3dcf14dd77a796e19b0386"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/pyusb/pyusb.SlackBuild b/python/pyusb/pyusb.SlackBuild
index e8a591e571..69cb9e5d1e 100644
--- a/python/pyusb/pyusb.SlackBuild
+++ b/python/pyusb/pyusb.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for PyUSB
 
-# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyusb
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,6 +53,8 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
+# Can't build the git snapshot.  Upstream publishes a modified copy
+# (with version metadata that setup.py needs), see setuptools-scm.
 python2 ./setup.py install --root=$PKG
 if python3 -c 'import sys' 2>/dev/null; then
   rm -rf build
diff --git a/python/pyusb/pyusb.info b/python/pyusb/pyusb.info
index 05347079fd..2531a3f5b9 100644
--- a/python/pyusb/pyusb.info
+++ b/python/pyusb/pyusb.info
@@ -1,8 +1,8 @@
 PRGNAM="pyusb"
-VERSION="1.0.2"
+VERSION="1.1.1"
 HOMEPAGE="https://pyusb.github.io/pyusb/"
-DOWNLOAD="https://github.com/pyusb/pyusb/archive/v1.0.2/pyusb-1.0.2.tar.gz"
-MD5SUM="95bf0adc0f25bfb70daf86605cff2b3f"
+DOWNLOAD="https://github.com/pyusb/pyusb/releases/download/v1.1.1/pyusb-1.1.1.tar.gz"
+MD5SUM="a9db479f1fb914e91d3106e67a13ae09"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pyzmq/pyzmq.SlackBuild b/python/pyzmq/pyzmq.SlackBuild
index 0ec4c4d748..e7fd4b8771 100644
--- a/python/pyzmq/pyzmq.SlackBuild
+++ b/python/pyzmq/pyzmq.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for PyZMQ
 
-# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyzmq
-VERSION=${VERSION:-18.1.1}
+VERSION=${VERSION:-19.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pyzmq/pyzmq.info b/python/pyzmq/pyzmq.info
index 5bc0d715ba..dab11d0ac2 100644
--- a/python/pyzmq/pyzmq.info
+++ b/python/pyzmq/pyzmq.info
@@ -1,8 +1,8 @@
 PRGNAM="pyzmq"
-VERSION="18.1.1"
+VERSION="19.0.2"
 HOMEPAGE="https://github.com/zeromq/pyzmq"
-DOWNLOAD="https://github.com/zeromq/pyzmq/archive/v18.1.1/pyzmq-18.1.1.tar.gz"
-MD5SUM="2a5c336dc942825006699bea9761d842"
+DOWNLOAD="https://github.com/zeromq/pyzmq/archive/v19.0.2/pyzmq-19.0.2.tar.gz"
+MD5SUM="dfffada96ae10d3b0afbaa9b8378433e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zeromq"
diff --git a/python/reedsolo/README b/python/reedsolo/README
new file mode 100644
index 0000000000..9d20c18954
--- /dev/null
+++ b/python/reedsolo/README
@@ -0,0 +1,6 @@
+Pure-Python Reed Solomon encoder/decoder
+For Python2 and Python3.
+
+OPTIONAL:
+
+python3
diff --git a/python/reedsolo/reedsolo.SlackBuild b/python/reedsolo/reedsolo.SlackBuild
new file mode 100644
index 0000000000..6b2ccca98b
--- /dev/null
+++ b/python/reedsolo/reedsolo.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# SlackBuild build script for reedsolo
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=reedsolo
+VERSION=${VERSION:-1.5.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+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 \
+  -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 {} \;
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/reedsolo/reedsolo.info b/python/reedsolo/reedsolo.info
new file mode 100644
index 0000000000..481b79f551
--- /dev/null
+++ b/python/reedsolo/reedsolo.info
@@ -0,0 +1,10 @@
+PRGNAM="reedsolo"
+VERSION="1.5.4"
+HOMEPAGE="https://pypi.org/project/reedsolo/"
+DOWNLOAD="https://files.pythonhosted.org/packages/c8/cb/bb2ddbd00c9b4215dd57a2abf7042b0ae222b44522c5eb664a8fd9d786da/reedsolo-1.5.4.tar.gz"
+MD5SUM="89bb392d10ddc5e3d876a7a9e05d103c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/reedsolo/slack-desc b/python/reedsolo/slack-desc
new file mode 100644
index 0000000000..9651aafb8c
--- /dev/null
+++ b/python/reedsolo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+reedsolo: reedsolo (Pure-Python Reed Solomon encoder/decoder)
+reedsolo:
+reedsolo: A pure-python universal errors-and-erasures Reed-Solomon Codec ,
+reedsolo: based on the wonderful tutorial at wikiversity, written by “Bobmath� 
+reedsolo: and “LRQ3000�.
+reedsolo:
+reedsolo: Homepage: https://pypi.org/project/reedsolo/
+reedsolo:
+reedsolo:
+reedsolo:
+reedsolo:
diff --git a/python/scikit-learn/scikit-learn.SlackBuild b/python/scikit-learn/scikit-learn.SlackBuild
index e52e115e12..476f13ccb8 100644
--- a/python/scikit-learn/scikit-learn.SlackBuild
+++ b/python/scikit-learn/scikit-learn.SlackBuild
@@ -2,7 +2,7 @@
 #
 # SlackBuild for scikit-learn
 #
-# Copyright 2016-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2016-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scikit-learn
-VERSION=${VERSION:-0.22.1}
+VERSION=${VERSION:-0.24.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/scikit-learn/scikit-learn.info b/python/scikit-learn/scikit-learn.info
index 5aa92aad8d..455e06fdc2 100644
--- a/python/scikit-learn/scikit-learn.info
+++ b/python/scikit-learn/scikit-learn.info
@@ -1,8 +1,8 @@
 PRGNAM="scikit-learn"
-VERSION="0.22.1"
+VERSION="0.24.1"
 HOMEPAGE="https://scikit-learn.org"
-DOWNLOAD="https://github.com/scikit-learn/scikit-learn/archive/0.22.1/scikit-learn-0.22.1.tar.gz"
-MD5SUM="27269b66e4bd20d099bd84bdb191ee39"
+DOWNLOAD="https://github.com/scikit-learn/scikit-learn/archive/0.24.1/scikit-learn-0.24.1.tar.gz"
+MD5SUM="a396b295ed76979577279bee9310acc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-joblib python3-Cython scipy3"
diff --git a/python/scikit-umfpack/README b/python/scikit-umfpack/README
new file mode 100644
index 0000000000..5c9c049722
--- /dev/null
+++ b/python/scikit-umfpack/README
@@ -0,0 +1 @@
+scikit-umfpack provides wrapper of UMFPACK sparse direct solver to SciPy.
diff --git a/python/scikit-umfpack/scikit-umfpack.SlackBuild b/python/scikit-umfpack/scikit-umfpack.SlackBuild
new file mode 100644
index 0000000000..99de5a1762
--- /dev/null
+++ b/python/scikit-umfpack/scikit-umfpack.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# SlackBuild build script for scikit-umfpack
+
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
+# 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=scikit-umfpack
+VERSION=${VERSION:-0.3.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+#set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+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 \
+  -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 {} \;
+
+
+ ( if [ -f /usr/include/umfpack/umfpack.h ]; then
+  echo "umfpack detected."
+  echo
+  echo "The umfpack.h needs to be patched before building to ensure that"
+  echo "the scikit-umfpack has amd module and its amd.h include is found."
+  echo
+  cd /usr/include/umfpack
+    find . -type f -name "umfpack.h" -print0 | xargs -0 sed -i 's/#include "amd.h"/#include <amd\/amd.h>/g'
+fi )
+
+# Python 2.7 will be droped in the future.
+if $(python2 -c 'import sys' 2>/dev/null); then
+  python2 setup.py install --root=$PKG
+  else
+  python setup.py install --root=$PKG
+fi
+
+# Replacement of python-2.x Python3.x check presence and build if found.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+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 README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/scikit-umfpack/scikit-umfpack.info b/python/scikit-umfpack/scikit-umfpack.info
new file mode 100644
index 0000000000..ca34bd0c13
--- /dev/null
+++ b/python/scikit-umfpack/scikit-umfpack.info
@@ -0,0 +1,10 @@
+PRGNAM="scikit-umfpack"
+VERSION="0.3.2"
+HOMEPAGE="https://pypi.org/project/scikit-umfpack/"
+DOWNLOAD="https://files.pythonhosted.org/packages/38/70/12391037c558543518a8c2446b583dfd9fc2e0237cbdcd67ddef3ae98e97/scikit-umfpack-0.3.2.tar.gz"
+MD5SUM="a92e3b8b7c864a9d5b25bf3d1a7ca39c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="numpy scipy umfpack"
+MAINTAINER="Pr. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/scikit-umfpack/slack-desc b/python/scikit-umfpack/slack-desc
new file mode 100644
index 0000000000..33d6c854ba
--- /dev/null
+++ b/python/scikit-umfpack/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+scikit-umfpack: scikit-umfpack (wrapper of UMFPACK sparse direct solver to SciPy)
+scikit-umfpack:
+scikit-umfpack: scikit-umfpack provides wrapper of UMFPACK sparse direct solver to
+scikit-umfpack: SciPy.
+scikit-umfpack:
+scikit-umfpack:
+scikit-umfpack: Homepage: https://pypi.org/project/scikit-umfpack/
+scikit-umfpack:
+scikit-umfpack:
+scikit-umfpack:
+scikit-umfpack:
diff --git a/python/setuptools-scm/setuptools-scm.SlackBuild b/python/setuptools-scm/setuptools-scm.SlackBuild
index 2f7b895cdd..bc591d8e76 100644
--- a/python/setuptools-scm/setuptools-scm.SlackBuild
+++ b/python/setuptools-scm/setuptools-scm.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=setuptools-scm
 SRCNAM=$(printf %s $PRGNAM | tr - _)
-VERSION=${VERSION:-3.3.3}
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/setuptools-scm/setuptools-scm.info b/python/setuptools-scm/setuptools-scm.info
index fc4cc63ac2..132f060e57 100644
--- a/python/setuptools-scm/setuptools-scm.info
+++ b/python/setuptools-scm/setuptools-scm.info
@@ -1,8 +1,8 @@
 PRGNAM="setuptools-scm"
-VERSION="3.3.3"
+VERSION="3.4.1"
 HOMEPAGE="https://github.com/pypa/setuptools_scm"
-DOWNLOAD="https://files.pythonhosted.org/packages/83/44/53cad68ce686585d12222e6769682c4bdb9686808d2739671f9175e2938b/setuptools_scm-3.3.3.tar.gz"
-MD5SUM="50b2199082fe808d032ec1710c9d7415"
+DOWNLOAD="https://files.pythonhosted.org/packages/9a/29/d8f9b0ddb3b9cb9da4de7fdd5f85bc598f774f22161cf72e5fe47207c8ea/setuptools_scm-3.4.1.tar.gz"
+MD5SUM="7d999ac299ae58e98f17b8f2cb988429"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/sphinx-rtd-theme/README b/python/sphinx-rtd-theme/README
index 9e27b7a33d..6612eac0f6 100644
--- a/python/sphinx-rtd-theme/README
+++ b/python/sphinx-rtd-theme/README
@@ -1,7 +1,7 @@
 The sphinx_rtd_theme is a sphinx theme designed to look modern and be
 mobile-friendly. 
 
-This theme is primarily focused to be used on readthedocs.org but can work with
-your own sphinx projects.
+This theme is primarily focused to be used on readthedocs.org but can
+work with your own sphinx projects.
 
 To read more and see a working demo head over to readthedocs.org.
diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
index e1937e1790..080603232f 100644
--- a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
+++ b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild build script for sphinx_rtd_theme
 
-# Copyright (c) 2000-2020 Prof. Horstmann <wmh (at) eipg.fr>
+# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sphinx-rtd-theme
-PKGNAM=sphinx_rtd_theme
 VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM="$(printf $PKGNAM | cut -d- -f2-)"
+SRCNAM=$( printf $PRGNAM | tr - _ )
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.info b/python/sphinx-rtd-theme/sphinx-rtd-theme.info
index 5b7649d034..5814934777 100644
--- a/python/sphinx-rtd-theme/sphinx-rtd-theme.info
+++ b/python/sphinx-rtd-theme/sphinx-rtd-theme.info
@@ -6,5 +6,5 @@ MD5SUM="6c50f30bc39046f497d336039a0c13fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Prof. HORSTMANN"
+MAINTAINER="Pr. HORSTMANN"
 EMAIL="wmh@eipg.fr"
diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild
index 4a070c1449..6312197552 100644
--- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild
+++ b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sphinxcontrib-applehelp
 
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sphinxcontrib-applehelp
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info
index ff255249ac..f816fc0a8a 100644
--- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info
+++ b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-applehelp"
-VERSION="1.0.1"
+VERSION="1.0.2"
 HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-applehelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.tar.gz"
-MD5SUM="c3424507cc28291f8005081b6a96afb1"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.tar.gz"
+MD5SUM="3f2de7681e12dde031acee0497c3cc2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild
index fdc14e149c..218a0140a5 100644
--- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild
+++ b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sphinxcontrib-htmlhelp
 
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sphinxcontrib-htmlhelp
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info
index 60e45900a1..bfb0bc5beb 100644
--- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info
+++ b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-htmlhelp"
-VERSION="1.0.1"
+VERSION="1.0.3"
 HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.1.tar.gz"
-MD5SUM="da7ec6e679bf330eb355c69b9640f2fb"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.tar.gz"
+MD5SUM="f1db7db2a467f08f6292ab0d76e38584"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/sphinxcontrib-websupport/sphinxcontrib-websupport.SlackBuild b/python/sphinxcontrib-websupport/sphinxcontrib-websupport.SlackBuild
index b5e53b89b9..ed3d66b5f0 100644
--- a/python/sphinxcontrib-websupport/sphinxcontrib-websupport.SlackBuild
+++ b/python/sphinxcontrib-websupport/sphinxcontrib-websupport.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sphinxcontrib-websupport
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-websupport/sphinxcontrib-websupport.info b/python/sphinxcontrib-websupport/sphinxcontrib-websupport.info
index 16c01ac133..3eabbfb77a 100644
--- a/python/sphinxcontrib-websupport/sphinxcontrib-websupport.info
+++ b/python/sphinxcontrib-websupport/sphinxcontrib-websupport.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-websupport"
-VERSION="1.2.2"
+VERSION="1.2.4"
 HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-websupport"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.tar.gz"
-MD5SUM="093b9a003843ba7f2cfd21d9031b723e"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.tar.gz"
+MD5SUM="eecfd8dc4933bd28c07ffb5e64fa2444"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx"
diff --git a/python/suds-jurko/README b/python/suds-jurko/README
index 3c88d60ff3..1da24681af 100644
--- a/python/suds-jurko/README
+++ b/python/suds-jurko/README
@@ -1,4 +1,4 @@
-suds-jurko is a fork of suds, a lightweight SOAP-based 
+suds-jurko is a fork of suds, a lightweight SOAP-based
 web service client for Python.
 
 python3 is an optional dependency.
diff --git a/python/suds-jurko/slack-desc b/python/suds-jurko/slack-desc
index ea2fc173b2..d12d8b01f4 100644
--- a/python/suds-jurko/slack-desc
+++ b/python/suds-jurko/slack-desc
@@ -11,7 +11,7 @@ suds-jurko:
 suds-jurko: suds-jurko is a fork of suds, a lightweight SOAP-based web service
 suds-jurko: client for Python.
 suds-jurko:
-suds-jurko: Homepage: https://bitbucket.org/jurko/suds
+suds-jurko: Homepage: https://pypi.org/project/suds-jurko/
 suds-jurko:
 suds-jurko:
 suds-jurko:
diff --git a/python/suds-jurko/suds-jurko.info b/python/suds-jurko/suds-jurko.info
index 47b3b31526..8ff95cc94f 100644
--- a/python/suds-jurko/suds-jurko.info
+++ b/python/suds-jurko/suds-jurko.info
@@ -1,7 +1,7 @@
 PRGNAM="suds-jurko"
 VERSION="0.6"
-HOMEPAGE="https://bitbucket.org/jurko/suds"
-DOWNLOAD="https://bitbucket.org/jurko/suds/downloads/suds-jurko-0.6.tar.bz2"
+HOMEPAGE="https://pypi.org/project/suds-jurko/"
+DOWNLOAD="https://files.pythonhosted.org/packages/bd/6f/54fbf0999a606680d27c69b1ad12dfff62768ecb9fe48524cebda6eb4423/suds-jurko-0.6.tar.bz2"
 MD5SUM="1309e9bc2454aa3434041f0a24ae4e11"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/python/terminado/terminado.SlackBuild b/python/terminado/terminado.SlackBuild
index 94bb2da8d4..81c7ca3a24 100644
--- a/python/terminado/terminado.SlackBuild
+++ b/python/terminado/terminado.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for terminado
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=terminado
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/terminado/terminado.info b/python/terminado/terminado.info
index fbb25fe6bf..10b14a7c77 100644
--- a/python/terminado/terminado.info
+++ b/python/terminado/terminado.info
@@ -1,8 +1,8 @@
 PRGNAM="terminado"
-VERSION="0.8.2"
-HOMEPAGE="https://terminado.readthedocs.io/en/latest/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/t/terminado/terminado-0.8.2.tar.gz"
-MD5SUM="933a1c5ca7c28e59284d0ac7cadce1ea"
+VERSION="0.9.2"
+HOMEPAGE="https://github.com/jupyter/terminado"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/t/terminado/terminado-0.9.2.tar.gz"
+MD5SUM="d9b6aa48d9e229dca502828d8b77f70f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-ptyprocess python3-tornado ptyprocess tornado"
diff --git a/python/testpath/setup.py b/python/testpath/setup.py
deleted file mode 100644
index 3a92914bf1..0000000000
--- a/python/testpath/setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-from setuptools import setup, find_packages
-
-setup(
-    name='testpath',
-    version='0.4.1',
-    description='Test utilities for Python code working with files and commands',
-    url='https://github.com/jupyter/testpath',
-    author='The Jupyter Development Team',
-    license='MIT',
-    long_description='Test utilities for Python code working with files and commands',
-    packages=find_packages(exclude=['tests'])
-)
diff --git a/python/testpath/testpath.SlackBuild b/python/testpath/testpath.SlackBuild
index 3a8e585db1..daaa3e08bd 100644
--- a/python/testpath/testpath.SlackBuild
+++ b/python/testpath/testpath.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for testpath
 
-# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=testpath
 VERSION=${VERSION:-0.4.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,6 @@ 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 {} \;
 
-cp $CWD/setup.py .
 python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
diff --git a/python/testpath/testpath.info b/python/testpath/testpath.info
index b037a7c944..3880ba0d0c 100644
--- a/python/testpath/testpath.info
+++ b/python/testpath/testpath.info
@@ -1,8 +1,8 @@
 PRGNAM="testpath"
 VERSION="0.4.4"
 HOMEPAGE="https://github.com/jupyter/testpath"
-DOWNLOAD="https://github.com/jupyter/testpath/archive/0.4.4/testpath-0.4.4.tar.gz"
-MD5SUM="4d7795541fccebd2be9818aead36caf1"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/t/testpath/testpath-0.4.4.tar.gz"
+MD5SUM="297100d49a6f20859383434a182cf426"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/thonny/thonny.SlackBuild b/python/thonny/thonny.SlackBuild
index b84b352dd3..d007a27254 100644
--- a/python/thonny/thonny.SlackBuild
+++ b/python/thonny/thonny.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Slackware build script for thonny
-# Copyright 2017/8/9,2020 Tim Dickson, Scotland
+# Copyright 2017-21 Tim Dickson, Scotland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,33 +20,33 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#version history
+#version history edited down in size
 #2.2.0b4  1 jan 2018. first version for slackbuilds.org
 #3.0.5    1 nov 2018. addition of lots of deps.
-#3.0.8   16 nov 2018. version bump.
-#3.1.0   31 jan 2019. version bump.
-#3.1.1   10 Feb 2019. version bump.
-#3.1.2   14 Feb 2019. version bump.
-#3.2.0b1 25 jun 2019. version bump.
-#3.2.0b7 22 Jul 2019. version bump.
-#3.2.0   12 Aug 2019. release version.
-#3.2.1    6 Sep 2019. version bump.
 #3.2.2    2 Nov 2019. version bump. added new dep. asttokens
-#3.2.3    4 Nov 2019. version bump.
-#3.2.4   10 Dec 2019. version bump.
 #3.2.5   25 Dec 2019. version bump. added extra dep. send2trash
 #add optional dep on pygame with python3 support. common for python learners
 #which thonny is targetted at.
 #3.2.6   06 Jan 2020. version bump. also added optional dep of esptool
 #3.2.7   23 Jan 2020. version bump. added dep of python-distro
-#note. get download link from https://pypi.org/project/thonny/#files
+#3.3.3   27 Jan 2021. version bump.
+#build2 10 Feb 2021. move install location to allow a plugin to work.
+#thanks to chrisw. changed build arch as install is arch specific now.
+#3.3.6   25 Mar 2021. version bump.
 
+#note. get download link from https://pypi.org/project/thonny/#files
 PRGNAM=thonny
-VERSION=${VERSION:-3.2.7}
+VERSION=${VERSION:-3.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=noarch
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -61,6 +61,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar -xzf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+#patch to remove mypy warning. thanks to chrisw
+sed -i -e 's/logger.warning("MyPy: " + "".join(err_lines))/pass/' thonny/plugins/mypy/__init__.py
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,9 +70,7 @@ 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 {} \;
 
-install -D -m0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
-mkdir -p $PKG/opt/$PRGNAM
-cp -r $PRGNAM $PKG/opt/
+python3 setup.py install --root=$PKG
 mkdir -p $PKG/usr/share/applications
 cp -a packaging/linux/org.thonny.Thonny.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 mkdir -p $PKG/usr/share/pixmaps
diff --git a/python/thonny/thonny.info b/python/thonny/thonny.info
index 6ee9e5aabc..184b56cf27 100644
--- a/python/thonny/thonny.info
+++ b/python/thonny/thonny.info
@@ -1,8 +1,8 @@
 PRGNAM="thonny"
-VERSION="3.2.7"
+VERSION="3.3.6"
 HOMEPAGE="http://thonny.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/d7/d1/5675b17e8ffede9ac649a1db64a7f52109048353eb13da7ae0fde3616d66/thonny-3.2.7.tar.gz"
-MD5SUM="91b2e8f206ec933e0896b406800d05b5"
+DOWNLOAD="https://files.pythonhosted.org/packages/bb/0d/30ca6027bee7a992a7777b5a220db5691c8b9f3fe29ebd1392a979f8ea86/thonny-3.3.6.tar.gz"
+MD5SUM="81e943d4255179de9952a675c40d7f2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-jedi docutils python3-pylint pyserial mypy_extensions asttokens send2trash python-distro"
diff --git a/python/tinycss2/README b/python/tinycss2/README
new file mode 100644
index 0000000000..34fd8d5665
--- /dev/null
+++ b/python/tinycss2/README
@@ -0,0 +1,3 @@
+All the web developers know the CSS format, but do they really know all the
+subtleties of its syntax? tinycss2 provides a CSS parser that is able to
+extract everything you want from stylesheets.
diff --git a/python/tinycss2/slack-desc b/python/tinycss2/slack-desc
new file mode 100644
index 0000000000..1a343bc472
--- /dev/null
+++ b/python/tinycss2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+tinycss2: tinycss2 (low-level CSS parser and generator)
+tinycss2:
+tinycss2: All the web developers know the CSS format, but do they really
+tinycss2: know all the subtleties of its syntax? tinycss2 provides a CSS
+tinycss2: parser that is able to extract everything you want from stylesheets.
+tinycss2:
+tinycss2: Homepage: https://www.courtbouillon.org/tinycss2
+tinycss2:
+tinycss2:
+tinycss2:
+tinycss2:
diff --git a/python/tinycss2/tinycss2.SlackBuild b/python/tinycss2/tinycss2.SlackBuild
new file mode 100644
index 0000000000..7d7328bc00
--- /dev/null
+++ b/python/tinycss2/tinycss2.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for tinycss2
+
+# Copyright 2021 Dimitris Zlatanidis Orestiada, Greece
+# 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=tinycss2
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+python setup.py install --root=$PKG
+
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
+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 PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/tinycss2/tinycss2.info b/python/tinycss2/tinycss2.info
new file mode 100644
index 0000000000..fb7e4cafe7
--- /dev/null
+++ b/python/tinycss2/tinycss2.info
@@ -0,0 +1,10 @@
+PRGNAM="tinycss2"
+VERSION="1.1.0"
+HOMEPAGE="https://www.courtbouillon.org/tinycss2"
+DOWNLOAD="https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8/tinycss2-1.1.0.tar.gz"
+MD5SUM="7caf513c4e87fc2449dcfbf407a8416f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-webencodings"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/traitlets/traitlets.SlackBuild b/python/traitlets/traitlets.SlackBuild
index 2613a6f8a7..466827a985 100644
--- a/python/traitlets/traitlets.SlackBuild
+++ b/python/traitlets/traitlets.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for traitlets
 
-# Copyright 2017-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=traitlets
-VERSION=${VERSION:-4.3.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.0.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,6 @@ 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 {} \;
 
-python2 setup.py install --root=$PKG
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/traitlets/traitlets.info b/python/traitlets/traitlets.info
index 812a9996c5..cfdaa7f37f 100644
--- a/python/traitlets/traitlets.info
+++ b/python/traitlets/traitlets.info
@@ -1,8 +1,8 @@
 PRGNAM="traitlets"
-VERSION="4.3.3"
+VERSION="5.0.5"
 HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://github.com/ipython/traitlets/archive/4.3.3/traitlets-4.3.3.tar.gz"
-MD5SUM="7469c5aef78ced2eb7f7f19cdf1d9e87"
+DOWNLOAD="https://github.com/ipython/traitlets/archive/5.0.5/traitlets-5.0.5.tar.gz"
+MD5SUM="4c4b866f4b98082a2b60083ab9d6adf7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="enum34 ipython_genutils six python3-six"
diff --git a/python/typed_ast/typed_ast.SlackBuild b/python/typed_ast/typed_ast.SlackBuild
index 6242bcc518..2d9917d89b 100644
--- a/python/typed_ast/typed_ast.SlackBuild
+++ b/python/typed_ast/typed_ast.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=typed_ast
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/typed_ast/typed_ast.info b/python/typed_ast/typed_ast.info
index c0bd46165a..387f668053 100644
--- a/python/typed_ast/typed_ast.info
+++ b/python/typed_ast/typed_ast.info
@@ -1,8 +1,8 @@
 PRGNAM="typed_ast"
-VERSION="1.4.1"
+VERSION="1.4.3"
 HOMEPAGE="https://github.com/python/typed_ast"
-DOWNLOAD="https://github.com/python/typed_ast/archive/1.4.1/typed_ast-1.4.1.tar.gz"
-MD5SUM="38f45ab6d04679fdbb1a9d2874526d1c"
+DOWNLOAD="https://github.com/python/typed_ast/archive/1.4.3/typed_ast-1.4.3.tar.gz"
+MD5SUM="de94287e7fa3f1f44a4acacfe725e51a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/typing-extensions/README b/python/typing-extensions/README
index a80a248d6d..7c11c211d7 100644
--- a/python/typing-extensions/README
+++ b/python/typing-extensions/README
@@ -1,19 +1,19 @@
 Typing Extensions – Backported and Experimental Type Hints for Python
 
 The typing module was added to the standard library in Python 3.5 on a
-provisional basis and will no longer be provisional in Python 3.7. However,
-this means users of Python 3.5 - 3.6 who are unable to upgrade will not be able
-to take advantage of new types added to the typing module, such as typing.Text
-or typing.Coroutine.
+provisional basis and will no longer be provisional in Python 3.7.
+However, this means users of Python 3.5 - 3.6 who are unable to upgrade
+will not be able to take advantage of new types added to the typing
+module, such as typing.Text or typing.Coroutine.
 
-The typing_extensions module contains both backports of these changes as well
-as experimental types that will eventually be added to the typing module, such
-as Protocol or TypedDict.
+The typing_extensions module contains both backports of these changes as
+well as experimental types that will eventually be added to the typing
+module, such as Protocol or TypedDict.
 
-Users of other Python versions should continue to install and use the typing
-module from PyPi instead of using this one unless specifically writing code
-that must be compatible with multiple Python versions or requires experimental
-types.
+Users of other Python versions should continue to install and use the
+typing module from PyPi instead of using this one unless specifically
+writing code that must be compatible with multiple Python versions or
+requires experimental types.
 
 Optional:
 
diff --git a/python/typing-extensions/typing-extensions.SlackBuild b/python/typing-extensions/typing-extensions.SlackBuild
index b7ca9ca089..b10423fe6f 100644
--- a/python/typing-extensions/typing-extensions.SlackBuild
+++ b/python/typing-extensions/typing-extensions.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=typing-extensions
 PKGNAM=typing_extensions
-VERSION=${VERSION:-3.7.4.2}
+VERSION=${VERSION:-3.7.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,7 +39,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp}
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -58,14 +58,27 @@ 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 {} \;
 
- # Python 2.7 will be droped in the future.
-if $(python2 -c 'import sys' 2>/dev/null); then
-  python2 setup.py install --root=$PKG
-fi
-# Replacement of python-2.x Python3.x check presence and build if found.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+set -- ./*
+
+mkdir -p build-py2 build-py3
+cp -r -- "$@" build-py2
+cp -r -- "$@" build-py3
+
+(
+  cd build-py2
+  # Python 2.7 will be dropped in the future.
+  if python2 -c 'import sys' 2>/dev/null; then
+    python2 setup.py install --root=$PKG
+  fi
+)
+
+(
+  cd build-py3
+  # Replacement of python-2.x Python3.x check presence and build if found.
+  if python3 -c 'import sys' 2>/dev/null; then
+    python3 setup.py install --root=$PKG
+  fi
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/python/typing-extensions/typing-extensions.info b/python/typing-extensions/typing-extensions.info
index d4fe1b83c5..eaa8077ee4 100644
--- a/python/typing-extensions/typing-extensions.info
+++ b/python/typing-extensions/typing-extensions.info
@@ -1,8 +1,8 @@
 PRGNAM="typing-extensions"
-VERSION="3.7.4.2"
+VERSION="3.7.4.1"
 HOMEPAGE="https://pypi.org/project/typing-extensions/"
-DOWNLOAD="https://files.pythonhosted.org/packages/6a/28/d32852f2af6b5ead85d396249d5bdf450833f3a69896d76eb480d9c5e406/typing_extensions-3.7.4.2.tar.gz"
-MD5SUM="f2674282966dc088d10170c2347431cc"
+DOWNLOAD="https://files.pythonhosted.org/packages/e7/dd/f1713bc6638cc3a6a23735eff6ee09393b44b96176d3296693ada272a80b/typing_extensions-3.7.4.1.tar.gz"
+MD5SUM="566292497a533981216e1d05a7c00fd3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/tzlocal/tzlocal.SlackBuild b/python/tzlocal/tzlocal.SlackBuild
index 122697c81a..d6495f6f02 100644
--- a/python/tzlocal/tzlocal.SlackBuild
+++ b/python/tzlocal/tzlocal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tzlocal
 
-# Copyright 2014-2017  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tzlocal
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +70,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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
diff --git a/python/tzlocal/tzlocal.info b/python/tzlocal/tzlocal.info
index 39288117b2..a5a526dfab 100644
--- a/python/tzlocal/tzlocal.info
+++ b/python/tzlocal/tzlocal.info
@@ -1,10 +1,10 @@
 PRGNAM="tzlocal"
-VERSION="1.5.1"
+VERSION="2.1"
 HOMEPAGE="https://github.com/regebro/tzlocal"
-DOWNLOAD="https://pypi.python.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz"
-MD5SUM="4553be891efa0812c4adfb0c6e818eec"
+DOWNLOAD="https://files.pythonhosted.org/packages/ce/73/99e4cc30db6b21cba6c3b3b80cffc472cc5a0feaf79c290f01f1ac460710/tzlocal-2.1.tar.gz"
+MD5SUM="c0877603ff9de71cd8ca6ee2b50d2ebd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pytz"
+REQUIRES="python3 pytz"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/vine/vine.SlackBuild b/python/vine/vine.SlackBuild
index 041d84a1a7..07bfd8d1d8 100644
--- a/python/vine/vine.SlackBuild
+++ b/python/vine/vine.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vine
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-5.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/vine/vine.info b/python/vine/vine.info
index 906ab2023d..c6e553284b 100644
--- a/python/vine/vine.info
+++ b/python/vine/vine.info
@@ -1,8 +1,8 @@
 PRGNAM="vine"
-VERSION="1.3.0"
+VERSION="5.0.0"
 HOMEPAGE="https://pypi.org/project/vine/"
-DOWNLOAD="https://files.pythonhosted.org/packages/1c/e1/79fb8046e607dd6c2ad05c9b8ebac9d0bd31d086a08f02699e96fc5b3046/vine-1.3.0.tar.gz"
-MD5SUM="5d125e0b4d759b39e03d11902dede8c9"
+DOWNLOAD="https://files.pythonhosted.org/packages/66/b2/8954108816865edf2b1e0d24f3c2c11dfd7232f795bcf1e4164fb8ee5e15/vine-5.0.0.tar.gz"
+MD5SUM="2fc3270a999cdc9341ba173360d62367"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/watchdog/watchdog.SlackBuild b/python/watchdog/watchdog.SlackBuild
index eb104ab351..df2bf18380 100644
--- a/python/watchdog/watchdog.SlackBuild
+++ b/python/watchdog/watchdog.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=watchdog
 SRCPKG=${SRCPKG-watchdog}
-VERSION=${VERSION:-0.10.2}
+VERSION=${VERSION:-0.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/watchdog/watchdog.info b/python/watchdog/watchdog.info
index 5c4eef26c5..4bf2b5701b 100644
--- a/python/watchdog/watchdog.info
+++ b/python/watchdog/watchdog.info
@@ -1,10 +1,10 @@
 PRGNAM="watchdog"
-VERSION="0.10.2"
+VERSION="0.10.4"
 HOMEPAGE="https://pypi.org/project/watchdog/"
-DOWNLOAD="https://files.pythonhosted.org/packages/73/c3/ed6d992006837e011baca89476a4bbffb0a91602432f73bd4473816c76e2/watchdog-0.10.2.tar.gz"
-MD5SUM="2477fb59dcb110b8562eb4eb973cda23"
+DOWNLOAD="https://files.pythonhosted.org/packages/6f/10/500580a0987363a0d9e1f3dd5cb1bba94a47e19266c6ce9dfb6cdd455758/watchdog-0.10.4.tar.gz"
+MD5SUM="d8fba5e25277520b65ca55952ae1341b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="pathtools3"
 MAINTAINER="Prof. HORSTMANN"
 EMAIL="wmh@eipg.fr"
diff --git a/python/websocket-client/websocket-client.SlackBuild b/python/websocket-client/websocket-client.SlackBuild
index 581f6e09ec..3c655759ba 100644
--- a/python/websocket-client/websocket-client.SlackBuild
+++ b/python/websocket-client/websocket-client.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=websocket-client
-VERSION=${VERSION:-0.57.0}
+VERSION=${VERSION:-0.58.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,7 +58,7 @@ find -L . \
 python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog examples/ LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog examples/ LICENSE README.md README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/websocket-client/websocket-client.info b/python/websocket-client/websocket-client.info
index 270b9a58c3..ba6ec658b7 100644
--- a/python/websocket-client/websocket-client.info
+++ b/python/websocket-client/websocket-client.info
@@ -1,8 +1,8 @@
 PRGNAM="websocket-client"
-VERSION="0.57.0"
+VERSION="0.58.0"
 HOMEPAGE="https://github.com/liris/websocket-client"
-DOWNLOAD="https://github.com/liris/websocket-client/archive/v0.57.0/websocket-client-0.57.0.tar.gz"
-MD5SUM="e15b73763d04b17a84762ef26292640b"
+DOWNLOAD="https://github.com/liris/websocket-client/archive/v0.58.0/websocket-client-0.58.0.tar.gz"
+MD5SUM="7b0ac14ff53702801500fd043c76a88e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="six"
diff --git a/python/xlutils/xlutils.SlackBuild b/python/xlutils/xlutils.SlackBuild
index 03f955e27a..9573ebd806 100644
--- a/python/xlutils/xlutils.SlackBuild
+++ b/python/xlutils/xlutils.SlackBuild
@@ -76,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ruby/chronic/chronic.SlackBuild b/ruby/chronic/chronic.SlackBuild
index 9dbd3b4aa7..3efeebac04 100644
--- a/ruby/chronic/chronic.SlackBuild
+++ b/ruby/chronic/chronic.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for chronic
 
-# Copyright 2013-2014 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2013-2014 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/chronic/chronic.info b/ruby/chronic/chronic.info
index 93b73d5bfd..9d93e2059e 100644
--- a/ruby/chronic/chronic.info
+++ b/ruby/chronic/chronic.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/ncurses-ruby/ncurses-ruby.SlackBuild b/ruby/ncurses-ruby/ncurses-ruby.SlackBuild
index 3b44f1a659..0aac6695e9 100644
--- a/ruby/ncurses-ruby/ncurses-ruby.SlackBuild
+++ b/ruby/ncurses-ruby/ncurses-ruby.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ncurses-ruby
 
-# Copyright 2016  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/ncurses-ruby/ncurses-ruby.info b/ruby/ncurses-ruby/ncurses-ruby.info
index ad509afbc2..b990bfc781 100644
--- a/ruby/ncurses-ruby/ncurses-ruby.info
+++ b/ruby/ncurses-ruby/ncurses-ruby.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/ruby-build/ruby-build.SlackBuild b/ruby/ruby-build/ruby-build.SlackBuild
index 01c570cc5b..0c33ed9b20 100644
--- a/ruby/ruby-build/ruby-build.SlackBuild
+++ b/ruby/ruby-build/ruby-build.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ruby-build
 
-# Copyright 2016-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ruby-build
-VERSION=${VERSION:-20201005}
+VERSION=${VERSION:-20210405}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/ruby-build/ruby-build.info b/ruby/ruby-build/ruby-build.info
index 02b20e5730..66fb159c0a 100644
--- a/ruby/ruby-build/ruby-build.info
+++ b/ruby/ruby-build/ruby-build.info
@@ -1,8 +1,8 @@
 PRGNAM="ruby-build"
-VERSION="20201005"
+VERSION="20210405"
 HOMEPAGE="https://github.com/rbenv/ruby-build"
-DOWNLOAD="https://github.com/rbenv/ruby-build/archive/v20201005/ruby-build-20201005.tar.gz"
-MD5SUM="e61a28010f0378e08ffe0381c022e274"
+DOWNLOAD="https://github.com/rbenv/ruby-build/archive/v20210405/ruby-build-20210405.tar.gz"
+MD5SUM="81328a15907ce6fa83c6b9d4de9fe41d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild b/ruby/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild
index 0a3228dd5f..4de982c206 100644
--- a/ruby/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild
+++ b/ruby/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for asciidoctor
 
-# Copyright 2020 Trevor D. Cook, Issaquah, WA, USA
+# Copyright 2021 Trevor D. Cook, Issaquah, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-asciidoctor
-VERSION=${VERSION:-2.0.10}
+VERSION=${VERSION:-2.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/rubygem-asciidoctor/rubygem-asciidoctor.info b/ruby/rubygem-asciidoctor/rubygem-asciidoctor.info
index e5ff96b5f6..261b61eab1 100644
--- a/ruby/rubygem-asciidoctor/rubygem-asciidoctor.info
+++ b/ruby/rubygem-asciidoctor/rubygem-asciidoctor.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-asciidoctor"
-VERSION="2.0.10"
+VERSION="2.0.12"
 HOMEPAGE="https://asciidoctor.org"
-DOWNLOAD="https://rubygems.org/downloads/asciidoctor-2.0.10.gem"
-MD5SUM="1be613f34f6b3c03dc7d6d78ac209307"
+DOWNLOAD="https://rubygems.org/downloads/asciidoctor-2.0.12.gem"
+MD5SUM="a067ad19682364af6d65be5ef4b57e15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/rubygem-ast/rubygem-ast.SlackBuild b/ruby/rubygem-ast/rubygem-ast.SlackBuild
index 76fa7f01b0..bc45a7a005 100644
--- a/ruby/rubygem-ast/rubygem-ast.SlackBuild
+++ b/ruby/rubygem-ast/rubygem-ast.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-ast
 
-# Copyright 2018,2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2018,2020-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-ast
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/rubygem-ast/rubygem-ast.info b/ruby/rubygem-ast/rubygem-ast.info
index 67cec36f69..334e7b68ad 100644
--- a/ruby/rubygem-ast/rubygem-ast.info
+++ b/ruby/rubygem-ast/rubygem-ast.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-ast"
-VERSION="2.4.1"
+VERSION="2.4.2"
 HOMEPAGE="https://github.com/whitequark/ast"
-DOWNLOAD="https://rubygems.org/downloads/ast-2.4.1.gem"
-MD5SUM="d361b241a0dcd72b7f791227b6ce4cbd"
+DOWNLOAD="https://rubygems.org/downloads/ast-2.4.2.gem"
+MD5SUM="f34e4eebd2f1d443a90a2aff11a08c73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/rubygem-mail/rubygem-mail.SlackBuild b/ruby/rubygem-mail/rubygem-mail.SlackBuild
index 0dee0b5edb..e9c47cb6b2 100644
--- a/ruby/rubygem-mail/rubygem-mail.SlackBuild
+++ b/ruby/rubygem-mail/rubygem-mail.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-mail
 
-# Copyright 2017-2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2020  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-mail/rubygem-mail.info b/ruby/rubygem-mail/rubygem-mail.info
index 2b6739fac7..214967aad8 100644
--- a/ruby/rubygem-mail/rubygem-mail.info
+++ b/ruby/rubygem-mail/rubygem-mail.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-mini_mime"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-mime-types-data/rubygem-mime-types-data.SlackBuild b/ruby/rubygem-mime-types-data/rubygem-mime-types-data.SlackBuild
index 0fe97eaa79..9b5d4a135d 100644
--- a/ruby/rubygem-mime-types-data/rubygem-mime-types-data.SlackBuild
+++ b/ruby/rubygem-mime-types-data/rubygem-mime-types-data.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-mime-types-data
 
-# Copyright 2017-2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2020  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-mime-types-data/rubygem-mime-types-data.info b/ruby/rubygem-mime-types-data/rubygem-mime-types-data.info
index fad76858ff..bced4512b3 100644
--- a/ruby/rubygem-mime-types-data/rubygem-mime-types-data.info
+++ b/ruby/rubygem-mime-types-data/rubygem-mime-types-data.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-mime-types/rubygem-mime-types.SlackBuild b/ruby/rubygem-mime-types/rubygem-mime-types.SlackBuild
index ef3e340cf2..3a7bcc3dd6 100644
--- a/ruby/rubygem-mime-types/rubygem-mime-types.SlackBuild
+++ b/ruby/rubygem-mime-types/rubygem-mime-types.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-mime-types
 
-# Copyright 2017-2019  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2019  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-mime-types/rubygem-mime-types.info b/ruby/rubygem-mime-types/rubygem-mime-types.info
index 08ef1836c9..f24a255d30 100644
--- a/ruby/rubygem-mime-types/rubygem-mime-types.info
+++ b/ruby/rubygem-mime-types/rubygem-mime-types.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-mime-types-data"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-mini_mime/rubygem-mini_mime.SlackBuild b/ruby/rubygem-mini_mime/rubygem-mini_mime.SlackBuild
index afc22bf11c..2f7dad7af9 100644
--- a/ruby/rubygem-mini_mime/rubygem-mini_mime.SlackBuild
+++ b/ruby/rubygem-mini_mime/rubygem-mini_mime.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-mini_mime
 
-# Copyright 2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2020  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-mini_mime/rubygem-mini_mime.info b/ruby/rubygem-mini_mime/rubygem-mini_mime.info
index b97f9a8c0c..be61633141 100644
--- a/ruby/rubygem-mini_mime/rubygem-mini_mime.info
+++ b/ruby/rubygem-mini_mime/rubygem-mini_mime.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-multi_json/rubygem-multi_json.SlackBuild b/ruby/rubygem-multi_json/rubygem-multi_json.SlackBuild
index 871556c363..94ee66bd73 100644
--- a/ruby/rubygem-multi_json/rubygem-multi_json.SlackBuild
+++ b/ruby/rubygem-multi_json/rubygem-multi_json.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-multi_json
 
-# Copyright 2017-2019  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2019  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-multi_json/rubygem-multi_json.info b/ruby/rubygem-multi_json/rubygem-multi_json.info
index e932d04d7e..cd968bdf86 100644
--- a/ruby/rubygem-multi_json/rubygem-multi_json.info
+++ b/ruby/rubygem-multi_json/rubygem-multi_json.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-powerpack/rubygem-powerpack.SlackBuild b/ruby/rubygem-powerpack/rubygem-powerpack.SlackBuild
index 6e83bc6867..e245b2d962 100644
--- a/ruby/rubygem-powerpack/rubygem-powerpack.SlackBuild
+++ b/ruby/rubygem-powerpack/rubygem-powerpack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-powerpack
 
-# Copyright 2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2018,2020 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-powerpack
-VERSION=${VERSION:-0.1.2}
+VERSION=${VERSION:-0.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/rubygem-powerpack/rubygem-powerpack.info b/ruby/rubygem-powerpack/rubygem-powerpack.info
index 95d26c62e9..0a97199dd8 100644
--- a/ruby/rubygem-powerpack/rubygem-powerpack.info
+++ b/ruby/rubygem-powerpack/rubygem-powerpack.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-powerpack"
-VERSION="0.1.2"
+VERSION="0.1.3"
 HOMEPAGE="https://github.com/bbatsov/powerpack"
-DOWNLOAD="https://rubygems.org/downloads/powerpack-0.1.2.gem"
-MD5SUM="745bf5d0bc2766b0d193d01b95d01acf"
+DOWNLOAD="https://rubygems.org/downloads/powerpack-0.1.3.gem"
+MD5SUM="bc638f34a087171e3a0ee8ec5a43a2d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/rubygem-pygments/rubygem-pygments.SlackBuild b/ruby/rubygem-pygments/rubygem-pygments.SlackBuild
index 88b5156b36..7c31276435 100644
--- a/ruby/rubygem-pygments/rubygem-pygments.SlackBuild
+++ b/ruby/rubygem-pygments/rubygem-pygments.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-pygments
 
-# Copyright 2017  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-pygments/rubygem-pygments.info b/ruby/rubygem-pygments/rubygem-pygments.info
index d12fcf7153..daaef01d52 100644
--- a/ruby/rubygem-pygments/rubygem-pygments.info
+++ b/ruby/rubygem-pygments/rubygem-pygments.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-multi_json"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-ruumba/rubygem-ruumba.SlackBuild b/ruby/rubygem-ruumba/rubygem-ruumba.SlackBuild
index 00b0b48baf..0e5e32a7c1 100644
--- a/ruby/rubygem-ruumba/rubygem-ruumba.SlackBuild
+++ b/ruby/rubygem-ruumba/rubygem-ruumba.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-ruumba
 
-# Copyright 2018-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2018-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-ruumba
-VERSION=${VERSION:-0.1.16}
+VERSION=${VERSION:-0.1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/rubygem-ruumba/rubygem-ruumba.info b/ruby/rubygem-ruumba/rubygem-ruumba.info
index 8ae5ee1237..113fe30170 100644
--- a/ruby/rubygem-ruumba/rubygem-ruumba.info
+++ b/ruby/rubygem-ruumba/rubygem-ruumba.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-ruumba"
-VERSION="0.1.16"
+VERSION="0.1.17"
 HOMEPAGE="https://github.com/ericqweinstein/ruumba"
-DOWNLOAD="https://rubygems.org/downloads/ruumba-0.1.16.gem"
-MD5SUM="7b8825b2cb1654cdae8ac40a42b38098"
+DOWNLOAD="https://rubygems.org/downloads/ruumba-0.1.17.gem"
+MD5SUM="941f1c5d2dfa5c9662da0fc95e0d68ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-rubocop"
diff --git a/ruby/rubygem-sync/rubygem-sync.SlackBuild b/ruby/rubygem-sync/rubygem-sync.SlackBuild
index 71e197c622..e84678854b 100644
--- a/ruby/rubygem-sync/rubygem-sync.SlackBuild
+++ b/ruby/rubygem-sync/rubygem-sync.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-sync
 
-# Copyright 2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2020  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-sync/rubygem-sync.info b/ruby/rubygem-sync/rubygem-sync.info
index f7ef107fa0..6070688aef 100644
--- a/ruby/rubygem-sync/rubygem-sync.info
+++ b/ruby/rubygem-sync/rubygem-sync.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.SlackBuild b/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.SlackBuild
index 6401629479..42aa4df0dd 100644
--- a/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.SlackBuild
+++ b/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-term-ansicolor
 
-# Copyright 2017-2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2017-2020  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.info b/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.info
index b7f69f200d..82df731edb 100644
--- a/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.info
+++ b/ruby/rubygem-term-ansicolor/rubygem-term-ansicolor.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-tins"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/rubygem-tins/rubygem-tins.SlackBuild b/ruby/rubygem-tins/rubygem-tins.SlackBuild
index a233253e5a..ab6da87beb 100644
--- a/ruby/rubygem-tins/rubygem-tins.SlackBuild
+++ b/ruby/rubygem-tins/rubygem-tins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-tins
 
-# Copyright 2016-2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2016-2020  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/rubygem-tins/rubygem-tins.info b/ruby/rubygem-tins/rubygem-tins.info
index 63e4a29339..10f06b6192 100644
--- a/ruby/rubygem-tins/rubygem-tins.info
+++ b/ruby/rubygem-tins/rubygem-tins.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-sync"
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/sequel/README b/ruby/sequel/README
index 1d179eccf9..430934b0ab 100644
--- a/ruby/sequel/README
+++ b/ruby/sequel/README
@@ -1,13 +1,17 @@
-Sequel is a simple, flexible, and powerful SQL database access toolkit for
-Ruby.
+Sequel is a simple, flexible, and powerful SQL database access toolkit
+for Ruby.
 
 Sequel provides thread safety, connection pooling and a concise DSL for
 constructing SQL queries and table schemas.
-Sequel includes a comprehensive ORM layer for mapping records to Ruby objects
-and handling associated records.
-Sequel supports advanced database features such as prepared statements, bound
-variables, stored procedures, savepoints, two-phase commit, transaction
-isolation, master/slave configurations, and database sharding.
+
+Sequel includes a comprehensive ORM layer for mapping records to Ruby
+objects and handling associated records.
+
+Sequel supports advanced database features such as prepared statements,
+bound variables, stored procedures, savepoints, two-phase commit,
+transaction isolation, master/slave configurations, and database
+sharding.
+
 Sequel currently has adapters for ADO, Amalgalite, CUBRID, DataObjects,
-IBM_DB, JDBC, MySQL, Mysql2, ODBC, Oracle, PostgreSQL, SQLAnywhere, SQLite3,
-Swift, and TinyTDS.
+IBM_DB, JDBC, MySQL, Mysql2, ODBC, Oracle, PostgreSQL, SQLAnywhere,
+SQLite3, Swift, and TinyTDS.
diff --git a/ruby/sequel/sequel.SlackBuild b/ruby/sequel/sequel.SlackBuild
index f3bdd5f87d..1bce43a99f 100644
--- a/ruby/sequel/sequel.SlackBuild
+++ b/ruby/sequel/sequel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sequel
 
-# Copyright 2013-2020 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2013-2021 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sequel
-VERSION=${VERSION:-5.31.0}
+VERSION=${VERSION:-5.42.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/sequel/sequel.info b/ruby/sequel/sequel.info
index 19cb465726..09911d119f 100644
--- a/ruby/sequel/sequel.info
+++ b/ruby/sequel/sequel.info
@@ -1,10 +1,10 @@
 PRGNAM="sequel"
-VERSION="5.31.0"
+VERSION="5.42.0"
 HOMEPAGE="http://sequel.jeremyevans.net/"
-DOWNLOAD="https://rubygems.org/downloads/sequel-5.31.0.gem"
-MD5SUM="ad2284309ed66c9fb5cc99ac28d557d3"
+DOWNLOAD="https://rubygems.org/downloads/sequel-5.42.0.gem"
+MD5SUM="828e5de8d95e67422f56d737ee90bc56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/sequel4/sequel4.SlackBuild b/ruby/sequel4/sequel4.SlackBuild
index a4e42c8d45..97e657087f 100644
--- a/ruby/sequel4/sequel4.SlackBuild
+++ b/ruby/sequel4/sequel4.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sequel
 
-# Copyright 2013-2017 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2013-2017 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/sequel4/sequel4.info b/ruby/sequel4/sequel4.info
index 49e19d0639..bacc0949d5 100644
--- a/ruby/sequel4/sequel4.info
+++ b/ruby/sequel4/sequel4.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/ruby/sqlite3/sqlite3.SlackBuild b/ruby/sqlite3/sqlite3.SlackBuild
index 7836557e1d..4c572d96c8 100644
--- a/ruby/sqlite3/sqlite3.SlackBuild
+++ b/ruby/sqlite3/sqlite3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sqlite3
 
-# Copyright 2013-2018 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2013-2018 Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/ruby/sqlite3/sqlite3.info b/ruby/sqlite3/sqlite3.info
index 3441ae2037..0444106ada 100644
--- a/ruby/sqlite3/sqlite3.info
+++ b/ruby/sqlite3/sqlite3.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/system/CPU-X/CPU-X.SlackBuild b/system/CPU-X/CPU-X.SlackBuild
index 86069a8b7a..7136be3143 100644
--- a/system/CPU-X/CPU-X.SlackBuild
+++ b/system/CPU-X/CPU-X.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CPU-X
-VERSION=${VERSION:-4.0.1}
+VERSION=${VERSION:-4.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info
index a8af4b71db..c38afb294d 100644
--- a/system/CPU-X/CPU-X.info
+++ b/system/CPU-X/CPU-X.info
@@ -1,8 +1,8 @@
 PRGNAM="CPU-X"
-VERSION="4.0.1"
+VERSION="4.2.0"
 HOMEPAGE="https://x0rg.github.io/CPU-X/"
-DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v4.0.1/CPU-X-4.0.1.tar.gz"
-MD5SUM="4337fc118398392f90a88379ca9e2954"
+DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v4.2.0/CPU-X-4.2.0.tar.gz"
+MD5SUM="70c2f0626cdf3b193c0639c1395066a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libcpuid"
diff --git a/system/CPU-X/README b/system/CPU-X/README
index c4c8b8c153..ebacfe5e95 100644
--- a/system/CPU-X/README
+++ b/system/CPU-X/README
@@ -1,3 +1,3 @@
 Free software that gathers information on CPU, motherboard and more.
 CPU-X is similar to CPU-Z (Windows), but CPU-X is a Free and 
-Open Source software designed for GNU/Linux; also, it works on *BSD.
+Open Source software designed for GNU/Linux and FreeBSD.
diff --git a/system/CPU-X/slack-desc b/system/CPU-X/slack-desc
index e298c2544b..06f7f5051d 100644
--- a/system/CPU-X/slack-desc
+++ b/system/CPU-X/slack-desc
@@ -10,7 +10,7 @@ CPU-X: CPU-X (System information tool)
 CPU-X:
 CPU-X: Free software that gathers information on CPU, motherboard and more.
 CPU-X: CPU-X is similar to CPU-Z (Windows), but CPU-X is a Free and 
-CPU-X: Open Source software designed for GNU/Linux; also, it works on *BSD.
+CPU-X: Open Source software designed for GNU/Linux and FreeBSD.
 CPU-X:
 CPU-X: Homepage: https://x0rg.github.io/CPU-X/
 CPU-X:
diff --git a/system/Iosevka-slab/Iosevka-slab.SlackBuild b/system/Iosevka-slab/Iosevka-slab.SlackBuild
index 373092bf21..90175e9ce6 100644
--- a/system/Iosevka-slab/Iosevka-slab.SlackBuild
+++ b/system/Iosevka-slab/Iosevka-slab.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Iosevka-slab
 
-# Copyright 2020 Eugene M., <damagedone at gmx dot com>
+# Copyright 2020-2021 Eugene M., <damagedone at gmx dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Iosevka-slab
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-5.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/Iosevka-slab/Iosevka-slab.info b/system/Iosevka-slab/Iosevka-slab.info
index 31ec4d1c08..1d011a5459 100644
--- a/system/Iosevka-slab/Iosevka-slab.info
+++ b/system/Iosevka-slab/Iosevka-slab.info
@@ -1,8 +1,8 @@
 PRGNAM="Iosevka-slab"
-VERSION="3.6.1"
+VERSION="5.1.1"
 HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v3.6.1/ttc-iosevka-slab-3.6.1.zip"
-MD5SUM="79a0579f33cb9050c1adb91bd6d12f2d"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v5.1.1/ttc-iosevka-slab-5.1.1.zip"
+MD5SUM="e0d5b48c59fc117a6fbbf7ee1b821461"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/Iosevka-slab/doinst.sh b/system/Iosevka-slab/doinst.sh
index 2909ee40e1..f0ffee7710 100644
--- a/system/Iosevka-slab/doinst.sh
+++ b/system/Iosevka-slab/doinst.sh
@@ -1,9 +1,9 @@
 # Update the X font indexes:
 
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
   )
 
   [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild
index 7ebfa0dcbb..fcd4d2aca7 100644
--- a/system/Iosevka/Iosevka.SlackBuild
+++ b/system/Iosevka/Iosevka.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Iosevka
 
-# Copyright 2015-2020 Eugene M., <damagedone at gmx dot com>
+# Copyright 2015-2021 Eugene M., <damagedone at gmx dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Iosevka
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-5.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info
index 174b8c9653..13e3da213a 100644
--- a/system/Iosevka/Iosevka.info
+++ b/system/Iosevka/Iosevka.info
@@ -1,8 +1,8 @@
 PRGNAM="Iosevka"
-VERSION="3.6.1"
+VERSION="5.1.1"
 HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v3.6.1/ttc-iosevka-3.6.1.zip"
-MD5SUM="76d222fbec9b4e2c26ae33cfb3b396bc"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v5.1.1/ttc-iosevka-5.1.1.zip"
+MD5SUM="223ff002dcad132138f2b3b0602c5162"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/Iosevka/doinst.sh b/system/Iosevka/doinst.sh
index 2909ee40e1..f0ffee7710 100644
--- a/system/Iosevka/doinst.sh
+++ b/system/Iosevka/doinst.sh
@@ -1,9 +1,9 @@
 # Update the X font indexes:
 
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
   )
 
   [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/system/Sl/README b/system/Sl/README
new file mode 100644
index 0000000000..97058f6a3a
--- /dev/null
+++ b/system/Sl/README
@@ -0,0 +1,24 @@
+Sl (ls with enhancements)
+
+sl takes the most common use of Unix ls, to display the files in a
+directory compactly in multiple columns, and makes it substantially
+more useful.
+
+sl groups files by purpose so you can mentally organize many files
+quickly; for instance, it collects HTML and PHP files together, as
+opposed to leaving them mixed up with supporting images, CSS, and
+JavaScript. sl points out interesting files, which include those that
+have been recently modified, read relatively recently, are relatively
+large, have warnings, or need to be checked in to or out of version
+control.
+
+sl is also aesthetically pleasing due to attention to layout and
+filtering as well as limiting color and text annotations to salient
+information.
+
+Since there's already an "sl" on SlackBuilds.org (in games/), this is
+called Sl. If you install it on a system that doesn't have games/sl
+installed, a /usr/bin/sl symlink will be created.
+
+The ".sl.tcl" referred to in the documentation is installed in the doc
+dir as "sl.tcl.example".
diff --git a/system/Sl/README.upstream b/system/Sl/README.upstream
new file mode 100644
index 0000000000..e258bfe683
--- /dev/null
+++ b/system/Sl/README.upstream
@@ -0,0 +1,223 @@
+                                       sl
+
+sl takes the most common use of Unix ls, to display the files in a directory
+compactly in multiple columns, and makes it substantially more useful.
+
+sl groups files by purpose so you can mentally organize many files quickly; for
+instance, it collects HTML and PHP files together, as opposed to leaving them
+mixed up with supporting images, CSS, and JavaScript. sl points out interesting
+files, which include those that have been recently modified, read relatively
+recently, are relatively large, have warnings, or need to be checked in to or
+out of version control.
+
+sl is also aesthetically pleasing due to attention to layout and filtering as
+well as limiting color and text annotations to salient information.
+
+  ----------------------------------------------------------------------------
+
+Screen Shots
+
+ls vs sl on WWW site:
+
+sl on a software development directory:
+
+sl on a collection (photos, audio, video, even apps):
+On this directory of music, which is managed by iTunes, we see all the albums by
+an artist. sl also shows /number of songs in each album, the relatively recent
+CD rips (which not coincidentally correspond to the latest two albums), which we
+ripped about 2 months ago (58 days) and 7 months ago (228 days). The summary
+line at bottom shows the total number of CDs and the (total number) of songs.
+Note that the directories were determined to hold audio material, and sorting
+works as it should with inital "The"s ignored. This display is useful for other
+kinds of hierarchy.
+
+Features
+
+  * sort
+       * group by purpose to organize and make understandable so many files
+         (like Apple II catalog arrangers, but automatically)
+         For subdirectories, look at the files they contain and if warranted
+         reclassify directory into image, audio, or video group.
+       * normalize: fold case for most groups (rather than all files starting
+         with an uppercase letter followed by all lowercase files), ignore
+         initial the/an/a, treat various word separators (space . _ -) as
+         equivalent
+       * numbers ordered properly (8.jpg before 10.jpg — no need for leading 0s
+         just for sorting)
+  * mark
+       * important (highlight in inverse colors)
+       * autosearch for keywords, such as "urgent" or "password"
+       * quickly see what's new by looking at recently changed files (think red
+         hot)
+         or recent relative to other files in that directory (think once hot now
+         still glowing orange)
+       * → files read relatively recently. The file you worked with more
+         recently than the others is often the one you're looking for now.
+       *     large files relative to other files in that directory (indent by a
+         space — easy to pick out against column edge)
+         e.g., largest fonts may have CJK or extensive Unicode, largest among
+         source code may be site of heavy lifting, in directory of directories
+         call out ones with most files
+       * classification by trailing character (like ls -F): directory/, link->,
+         executable*, special_
+       * colorize directory, executable*, special (like ls -G, though more
+         subtle since have groupings and warnings)
+  * info
+       * spot info: brief, particularly relevant additional information on a
+         highly limited number of files. Since few files are targeted, this is
+         fast and avoids visual clutter. Standard spot info details the recently
+         read (-age), recently changed (<age, with < implying it may be earlier
+         if a download or sloppy copy reset the last modified time), and
+         relatively large (size-in-bytes). Per-file customizations can display,
+         for example, latest build time and build number next to Ant build.xml,
+         count of critical bugs filed against source code file, number of lines
+         in TODO list, warning if HTML has not been validated, you name it.
+       * /number of files in subdirectories, which can be a useful if rough
+         survey (this is not slow)
+         e.g., only 2 files, 1000 files, TOSORT/27, tests/27, Yosemite 2007
+         photos/316 vs Detroit photos/2
+       * summary line with counts and totals. Includes a count of .dotfiles,
+         which are rare outside of the home directory.
+  * filter
+       * ignore clutter: Emacs auto backup (like GNU ls -B), generated (Java
+         .class, C .o), C .h, Macintosh Desktop DB, TAGS
+       * identify series (like audiobook ch 01.mp3 ... audiobook ch 27.mp3) and
+         condense to first one plus count
+         e.g., DSC00423.jpg, DSC00424.jpg, DSC00427.jpg ... DSC01072.jpg ⇒
+         DSC00423.jpg...227. Also look at /dev.
+       * elision of shared prefixes reduces the amount of text to read and
+         implicitly clusters similar files. Here's one spectacular application.
+       * distill: If you are already familiar with a directory or it is very
+         large, use the -only command-line option to distill the listing to only
+         distinctive files. A file is considered distinctive if it's: recently
+         changed, recently read, a warning, or spot info. sl -only on /usr/bin
+         and OS X /Library/Fonts can be interesting.
+  * layout
+       * column widths tailored to what's needed by individual columns (as
+         opposed to uniform width by ls dictated by the single longest filename
+         in the directory), giving a more natural appearance and freeing space
+         for more columns
+       * if group title would be at bottom of column, bump to top of next column
+         if room
+       * shorten very f...ing long names if necessary to achieve multiple
+         columns. Shortened names retain the first characters of the file, file
+         suffix, and the first number which is usually a series number or year
+         or video resolution (1080p).
+  * warnings
+       * broken link X (base file moved, renamed, or deleted): symlink, ~ file
+         from Emacs backup or CVS previous version
+       * not readable by current user
+       * directory Writable by public
+       * directory not searchable/enterable (executable permission not set) by
+         current user
+       * peculiar permissions: owner can't read, group or public can write or
+         execute but not read, or owner has less permission than group or
+         public. For example, a dropbox directory may display permissions
+         rwx-wx-wx
+       * special permission bits: setuid, setgid, sticky. These are not errors,
+         but something to be aware of.
+       * file 0-length or directory is empty, directory contains only 1 file
+         (Strunk and White: "omit needless hierarchy")
+       * file has 2 or more � hard links. Under normal conditions, a file has
+         exactly 1 (from its parent directory).
+       * file changed vis-a-vis version control: either local copy has been
+         edited and needs to be uploaded^ to repository, or another worker
+         updated the repository rendering the local copy stale and in need of
+         downloadingv (stale files checked only in local repositories, not
+         remote servers, for performance). Support for RCS and CVS is built in,
+         and you can customize to add support for others.
+
+sl does not replace ls. Use ls to see all files and full metadata.
+
+Software
+
+for OS X, Solaris, Unix, and GNU/Linux
+Licensed under the GNU Public License version 3. NO WARRANTY.
+
+Install:
+ 1. Download software, probably to /usr/local/bin or ~/bin.
+       * v1.1.2 of February 16. Support filenames that are not UTF-8 and not
+         ASCII (thanks Christian Neukirchen).
+       * v1.1 of February 12. Support file sizes larger than 4GB on 32-bit
+         systems (thanks Giuseppe Merigo), tightened tolerances, new feature:
+         autosearch.
+       * v1.0 of January 26, 2012
+ 2. From the command line:
+
+ chmod +x download-dir/sl
+ unalias sl
+ rehash
+
+ 3. Install Tcl, if needed (which tclsh comes up empty). Install into
+    /usr/local/bin or change the first line of the sl script. Tcl is already
+    installed in OS X.
+
+Use: Now more-useful listings are as convenient to type as the usual ls.
+
+  sl directory-path
+
+Convenience: Automatically see an overview and interesting files when switching
+to a new directory:
+
+ alias cd  'cd \!*; sl'
+ alias pd  'pushd \!*; sl'
+ alias pdo 'pushd \!*; sl -only'
+
+Customization
+
+Customization is done via a startup file, at the path ~/.sl.tcl. You can control
+colors, new suffixes, localization of the most used text, switches that control
+system operation, and even exactly what is shown for every file. For example,
+here's a custom color scheme that makes files and directories brighter and
+blends the text annotations into the background.
+
+The startup file is executed as Tcl code, so you can implement substantial
+changes, such as adding support for another version control system. Rather than
+hacking the source code, it is better to put customizations in the startup file
+so that you can easily update to new versions without reapplying your hacks. Tcl
+lets you go so far as redefining whole procedures, so any change you want can be
+done in the startup file.
+  * .sl.tcl sample startup file, download to your home directory. It shows how
+    to make many of the most likely changes, as well as how to turn on features
+    that are too mind blowing to be the default settings, including prefix and
+    suffix elision.
+
+Support
+
+Troubleshooting:
+  * If you see lots of garbage that looks like ^[[31m, enable color for your
+    terminal or turn off color in your startup file.
+  * To change colors or bold on OS X, use Terminal's Preferences. Be sure to
+    pick a font that has a bold variation, such as Menlo.
+  * To view color output with less, set the LESS environment variable to include
+    --RAW-CONTROL-CHARS.
+  * Error reported no such file or directory, but file definitely exists. If you
+    have a legacy filesystem with filenames that are not encoded in Unicode
+    UTF-8 (or ASCII, which is a subset of UTF-8), you should migrate the names
+    to UTF-8 with a tool such as convmv. sl tries to handle this situation, but
+    for paths passed to it on the command line it is already too late.
+  * Previously, transposing the letters of ls was a misspelling. In some
+    systems, it resulted in a Command not found error. Some shells prepared for
+    this and aliased the transposition and other misspellings to in effect
+    autocorrect to what the user meant to type. If the output still looks like
+    ls, it's probably an alias. You can unalias in open terminals and take out
+    the line in the shell startup file. In another case, a Linux distribution
+    surprised you with ASCII art of a train. You can delete it, or if an ASCII
+    train is a key part of your problem-solving toolkit you can rename it.
+
+Known bugs:
+  * On OS X, the Spotlight search engine indexes the contents of files. As a
+    side effect of reading the content of a file, the file system updates the
+    file's last accessed time (atime). Because Spotlight is continuously
+    indexing, often within seconds of a file being changed, almost all files
+    have very recent atimes. For sl, this makes the atime useless for showing
+    recently accessed files: because everybody's special, nobody's special.
+    Spotlight should consider its work to be stealthy and reset the atime.
+  * Some file systems do not update atime, which is used to determine recently
+    read files.
+
+Send suggestions and bug reports to
+
+  ----------------------------------------------------------------------------
+
+Invented by Tom Phelps on December 30, 2011.
diff --git a/system/Sl/Sl.1 b/system/Sl/Sl.1
new file mode 100644
index 0000000000..2bf8b8e26c
--- /dev/null
+++ b/system/Sl/Sl.1
@@ -0,0 +1,110 @@
+.\" Man page generated from reStructuredText.
+.
+.TH SL 1 "2020-11-13" "1.1.3" "SlackBuilds.org"
+.SH NAME
+Sl \- ls with enhancements
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for Sl(1) man page. Convert with:
+.
+.\" rst2man.py Sl.rst > Sl.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+Sl [\fB\-1\fP] [\fB\-a\fP] [\fB\-atime\fP] [\fB\-only\fP] [\fB\-startup\fP] \fIstartup\-file\fP [\fB\-width\fP] \fIterminal\-width\fP [\fB\-log\fP] [\fB\-version\fP]
+.SH SBO NOTE
+.sp
+\fBSl\fP may also be run as \fBsl\fP, unless \fIgames/sl\fP is installed. The
+documentation here uses the lowercase version of the name.
+.SH DESCRIPTION
+.sp
+sl takes the most common use of Unix ls, to display the files in a
+directory compactly in multiple columns, and makes it substantially
+more useful.
+.sp
+sl groups files by purpose so you can mentally organize many files
+quickly; for instance, it collects HTML and PHP files together, as
+opposed to leaving them mixed up with supporting images, CSS, and
+JavaScript. sl points out interesting files, which include those that
+have been recently modified, read relatively recently, are relatively
+large, have warnings, or need to be checked in to or out of version
+control.
+.sp
+sl is also aesthetically pleasing due to attention to layout and
+filtering as well as limiting color and text annotations to salient
+information.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \fB\-1\fP
+Single column output (same as ls)
+.TP
+.B \fB\-a\fP
+Show hidden (dot) files (same as ls)
+.TP
+.B \fB\-atime\fP
+Use access time instead of modification time, for marking "recent" files.
+.TP
+.B \fB\-only\fP
+Don\(aqt show summary (e.g. "6 files, 11K") at the end of the output
+.TP
+.B \fB\-startup\fP \fIfile.tcl\fP
+Use this startup file instead of \fI~/.sl.tcl\fP\&.
+.TP
+.B \fB\-width\fP \fIterminal\-width\fP
+Assume the terminal is this many columns wide. Default is to query the
+terminal via \fBstty(1)\fP, or the \fB$COLUMNS\fP environment variable.
+.TP
+.B \fB\-log\fP
+Print some debugging info (probably only useful if you\(aqre hacking sl\(aqs code)
+.TP
+.B \fB\-version\fP
+Output version number
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.TP
+.B \fB~/.sl.tcl\fP
+Startup file. See /usr/doc/Sl\-1.1.3/sl.tcl.example.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+sl is licensed under the GNU Public License version 3.
+.SH AUTHORS
+.sp
+sl was written by Tom Phelps.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The complete documentation: /usr/doc/Sl\-1.1.3/README.upstream
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/Sl/Sl.SlackBuild b/system/Sl/Sl.SlackBuild
new file mode 100644
index 0000000000..6dfc1440e3
--- /dev/null
+++ b/system/Sl/Sl.SlackBuild
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Slackware build script for Sl
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# There's already an "sl" on SBo, so this is named Sl. The version number
+# comes from the -version option.
+
+PRGNAM=Sl
+VERSION=${VERSION:-1.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+SRCNAM="sl"
+
+PKGBIN=$PKG/usr/bin
+PKGMAN1=$PKG/usr/man/man1
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+PKGINST=$PKG/install
+
+set -e
+
+rm -rf $PKG
+mkdir -p $OUTPUT $PKGBIN $PKGDOC $PKGMAN1 $PKGINST
+
+# Look, Ma, no source directory!
+cat $SRCNAM > $PKGBIN/$PRGNAM
+chmod 755 $PKGBIN/$PRGNAM
+
+gzip -9c < $PRGNAM.1 > $PKGMAN1/$PRGNAM.1.gz
+
+# README.upstream is just a text rendition of the homepage, sl.tcl-example
+# is linked to by the homepage.
+cat README.upstream > $PKGDOC/README.txt
+cat sl.tcl.example > $PKGDOC/sl.tcl.example
+cat README > $PKGDOC/README_SBo.txt
+cat $PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+cat slack-desc > $PKGINST/slack-desc
+cat doinst.sh > $PKGINST/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/Sl/Sl.info b/system/Sl/Sl.info
new file mode 100644
index 0000000000..37bd254292
--- /dev/null
+++ b/system/Sl/Sl.info
@@ -0,0 +1,10 @@
+PRGNAM="Sl"
+VERSION="1.1.3"
+HOMEPAGE="http://web.archive.org/web/20131228142311/http://practicalthought.com/sl/"
+DOWNLOAD="http://web.archive.org/web/20150726011829/http://practicalthought.com:80/sl/sl"
+MD5SUM="ed4c22a531e957c95df5f41206d6ed2f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/Sl/Sl.rst b/system/Sl/Sl.rst
new file mode 100644
index 0000000000..c6d417d809
--- /dev/null
+++ b/system/Sl/Sl.rst
@@ -0,0 +1,101 @@
+.. RST source for Sl(1) man page. Convert with:
+..   rst2man.py Sl.rst > Sl.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.1.3
+.. |date| date::
+
+==
+Sl
+==
+
+--------------------
+ls with enhancements
+--------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+Sl [**-1**] [**-a**] [**-atime**] [**-only**] [**-startup**] *startup-file* [**-width**] *terminal-width* [**-log**] [**-version**]
+
+SBO NOTE
+========
+
+**Sl** may also be run as **sl**, unless *games/sl* is installed. The
+documentation here uses the lowercase version of the name.
+
+DESCRIPTION
+===========
+
+sl takes the most common use of Unix ls, to display the files in a
+directory compactly in multiple columns, and makes it substantially
+more useful.
+
+sl groups files by purpose so you can mentally organize many files
+quickly; for instance, it collects HTML and PHP files together, as
+opposed to leaving them mixed up with supporting images, CSS, and
+JavaScript. sl points out interesting files, which include those that
+have been recently modified, read relatively recently, are relatively
+large, have warnings, or need to be checked in to or out of version
+control.
+
+sl is also aesthetically pleasing due to attention to layout and
+filtering as well as limiting color and text annotations to salient
+information.
+
+OPTIONS
+=======
+
+**-1**
+  Single column output (same as ls)
+
+**-a**
+  Show hidden (dot) files (same as ls)
+
+**-atime**
+  Use access time instead of modification time, for marking "recent" files.
+
+**-only**
+  Don't show summary (e.g. "6 files, 11K") at the end of the output
+
+**-startup** *file.tcl*
+  Use this startup file instead of *~/.sl.tcl*.
+
+**-width** *terminal-width*
+  Assume the terminal is this many columns wide. Default is to query the
+  terminal via **stty(1)**, or the **$COLUMNS** environment variable.
+
+**-log**
+  Print some debugging info (probably only useful if you're hacking sl's code)
+
+**-version**
+  Output version number
+
+FILES
+=====
+
+**~/.sl.tcl**
+  Startup file. See /usr/doc/Sl-|version|/sl.tcl.example.
+
+COPYRIGHT
+=========
+
+sl is licensed under the GNU Public License version 3.
+
+AUTHORS
+=======
+
+sl was written by Tom Phelps.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The complete documentation: /usr/doc/Sl-|version|/README.upstream
diff --git a/system/Sl/doinst.sh b/system/Sl/doinst.sh
new file mode 100644
index 0000000000..604a5c77f7
--- /dev/null
+++ b/system/Sl/doinst.sh
@@ -0,0 +1,8 @@
+# If there's no sl link, take over:
+if [ ! -r usr/games/sl ]; then
+  ( cd usr/bin ; rm -rf sl )
+  ( cd usr/bin ; ln -sf Sl sl )
+  ( cd usr/man/man1 ; rm -rf sl.1.gz )
+  ( cd usr/man/man1 ; ln -sf Sl.1.gz sl.1.gz )
+fi
+
diff --git a/system/Sl/sl.tcl.example b/system/Sl/sl.tcl.example
new file mode 100644
index 0000000000..d5e0adf99d
--- /dev/null
+++ b/system/Sl/sl.tcl.example
@@ -0,0 +1,110 @@
+#
+# runtime configuration file for sl (http://www.PracticalThought.com/sl/)
+#
+
+
+
+# 1. override variables
+
+# turn off color
+#set COLORIZE 0
+
+# if your terminal supports Unicode characters, use them
+set I18N(...) "\u2026"
+
+set SWITCH(title) 1	;# turn on prettyname
+set SWITCH(nosfx) 1	;# once you know it's audio or video, don't care what arcane file format it is
+set SWITCH(prefix) 3	;# turn on prefix elision
+
+# if your terminal supports 256 colors, these may be preferable
+# For other color codes, see colortest (http://www.vim.org/scripts/script.php?script_id=1349).
+array set STYLE {
+    file ";38;5;28"  dir ";38;5;20"
+    relrec,file ";38;5;202" relrec,dir ";38;5;202"
+    warning ";38;5;196"
+    post ";38;5;232"
+}
+
+
+# add names to highlight or not show at all
+#append NOTABLE {|TODO$|notes|TOSORT}
+#append IGNORE {|^(tmp|old|obsolete|ignore|bkup)$}
+
+#set K 1000; # set K/M/G/T size suffixes to base 10 vs base 2
+
+# set TIME(recent) [expr $TIME(DAY)*2]
+
+#set COLSEP 4
+#set NAMEMIN 1000; # turn off name shortening
+
+# see supporting files like C .h and .o
+#set SWITCH(ignore) 2
+
+# consider .xml a document, not data
+#set EQ(.xml) doc
+
+# some Linux file systems do not update atime, so turn off to avoid stale information
+#set SWITCH(relread) 0
+
+# L10N
+set I18N(file) fecho
+
+
+
+# 2. per file hook to override properties
+# startup file gets tuple for each file fully loaded with data, just before display, to modify as he pleases
+proc perfile {dir tuple} {
+    global EQ
+
+    # a. unpack
+    lassign $tuple tail sfx type group sortkey  style pre display warning post  size mtime atime
+
+
+    # b. your changes here
+
+    # example: negate dir reclassification
+    if {$type=="directory"} {set group "dir"}
+
+    # example: show #lines of selected file
+    if {$tail=="sl" && $type=="file"} {
+	append post " [lindex [exec wc sl] 0]l"
+
+    # example: on Ant build.xml, show date and number of last build (<buildnumber /> task)
+    } elseif {$tail=="build.xml" && [file readable [set f "$dir/build.number"]]} {
+	set fid [open $f]; set txt [read $fid]; close $fid
+#puts $txt
+	regexp {build.number=(\d+)} $txt all num
+	if {$num!=""} {append post " #$num"}
+	append post "[reltime [file mtime $f]]"
+    }
+
+    # example: auto search for filename matching regexp and highlight (show in black on magenta background)
+    #if {[regexp -nocase {license|password} $tail]} {set style ";30;46"}
+
+    # example: local naming convention that puts date at start of file in form yyyymmdd-filename,
+    #  but problematic for sorting by Tcl lsort -dictionary, so reformat
+    regsub {^(19|20)(\d\d)(\d\d)(\d\d\D)} $sortkey {\1\2.\3.\4} sortkey
+    regsub {^(19|20)(\d\d)(\d\d\D)} $sortkey {\1\2.\3} sortkey
+
+
+    # c. repack
+    return [list $tail $sfx $type $group $sortkey  $style $pre $display $warning $post  $size $mtime $atime]
+}
+
+
+
+# 3. redefine procs
+
+#proc vc {} ...
+
+# turn off series construction
+#set SWITCH(series) 0
+
+# change how names are shortened
+#proc shorten {txt w} {}
+
+# classify dir as plain dir, not audio/video and not separate uppercase/lowercase
+#proc classifydir {dir tail l} {return "dir"}
+
+# change evaluation of what constitutes a distinctive file for -only
+#proc distinctive {tuple} {return 1}
diff --git a/system/Sl/slack-desc b/system/Sl/slack-desc
new file mode 100644
index 0000000000..4b629ecc80
--- /dev/null
+++ b/system/Sl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+Sl: Sl (ls with enhancements)
+Sl:
+Sl: sl takes the most common use of Unix ls, to display the files in a
+Sl: directory compactly in multiple columns, and makes it substantially
+Sl: more useful.
+Sl:
+Sl: sl groups files by purpose so you can mentally organize many files
+Sl: quickly; for instance, it collects HTML and PHP files together, as
+Sl: opposed to leaving them mixed up with supporting images, CSS, and
+Sl: JavaScript.
+Sl:
diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild
index f59f7f1b1a..02f2eb1027 100644
--- a/system/Solaar/Solaar.SlackBuild
+++ b/system/Solaar/Solaar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Solaar
 
-# Copyright 2019 Erich Ritz, Scottsdale, Arizona, USA
+# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Solaar
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/Solaar/Solaar.info b/system/Solaar/Solaar.info
index 6f9fd9d7cf..b42550bf28 100644
--- a/system/Solaar/Solaar.info
+++ b/system/Solaar/Solaar.info
@@ -1,10 +1,10 @@
 PRGNAM="Solaar"
-VERSION="1.0.3"
+VERSION="1.0.4"
 HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.0.3/Solaar-1.0.3.tar.gz"
-MD5SUM="0fb26e93f4fe5022809e6fdf25dddbd6"
+DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.0.4/Solaar-1.0.4.tar.gz"
+MD5SUM="da7074a03814b42372b6aea31078c9f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 pyudev"
+REQUIRES="pyudev pygobject3-python3"
 MAINTAINER="Erich Ritz"
 EMAIL="erich.public@protonmail.com"
diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild
index 9be2bed29b..cbba19ee17 100644
--- a/system/acpi_call/acpi_call.SlackBuild
+++ b/system/acpi_call/acpi_call.SlackBuild
@@ -65,6 +65,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p0 < $CWD/fix-acpi-include.patch
+patch -p0 < $CWD/fix-5.x-kernel.patch
 
 make KDIR=$KERNELPATH
 
diff --git a/system/acpi_call/fix-5.x-kernel.patch b/system/acpi_call/fix-5.x-kernel.patch
new file mode 100644
index 0000000000..5ed4392857
--- /dev/null
+++ b/system/acpi_call/fix-5.x-kernel.patch
@@ -0,0 +1,29 @@
+--- acpi_call.c.orig	2020-10-28 23:05:01.875849692 +0100
++++ acpi_call.c	2020-10-28 23:07:50.658179392 +0100
+@@ -7,6 +7,7 @@
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
+ #include <linux/acpi.h>
++#include <linux/uaccess.h>
+
+ MODULE_LICENSE("GPL");
+
+@@ -317,11 +318,18 @@
+     return ret;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static struct proc_ops proc_acpi_operations = {
++        .proc_read  = acpi_proc_read,
++        .proc_write = acpi_proc_write,
++};
++#else
+ static struct file_operations proc_acpi_operations = {
+         .owner    = THIS_MODULE,
+         .read     = acpi_proc_read,
+         .write    = acpi_proc_write,
+ };
++#endif
+
+ #else
+ static int acpi_proc_read(char *page, char **start, off_t off,
diff --git a/system/afio/README b/system/afio/README
index 51e85268ab..6ff9ad41b5 100644
--- a/system/afio/README
+++ b/system/afio/README
@@ -1,8 +1,8 @@
-Afio makes compressed archives that are safer than compressed tar or 
-cpio archives, allowing better handling of input data corruption. Afio 
+Afio makes compressed archives that are safer than compressed tar or
+cpio archives, allowing better handling of input data corruption. Afio
 also supports multi-volume archives during interactive operation.
 
-Afio makes cpio archives with ASCII-formatted header information (odc). 
-Where the odc format cannot represent some files and file properties 
-that could be present on a modern UNIX filesystem, it uses an afio- 
+Afio makes cpio archives with ASCII-formatted header information (odc).
+Where the odc format cannot represent some files and file properties
+that could be present on a modern UNIX filesystem, it uses an afio-
 specific 'large ASCII' header for the files concerned.
diff --git a/system/afio/afio.SlackBuild b/system/afio/afio.SlackBuild
index a22fb9c783..c6b9c4e6ba 100644
--- a/system/afio/afio.SlackBuild
+++ b/system/afio/afio.SlackBuild
@@ -5,13 +5,13 @@
 # Written by ruario <sbo@ruari.com>
 
 PRGNAM=afio
-VERSION=${VERSION:-2.5.1}
+VERSION=${VERSION:-2.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -38,7 +38,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/afio/afio.info b/system/afio/afio.info
index 161531dea5..93f2229d06 100644
--- a/system/afio/afio.info
+++ b/system/afio/afio.info
@@ -1,8 +1,8 @@
 PRGNAM="afio"
-VERSION="2.5.1"
-HOMEPAGE="http://members.chello.nl/~k.holtman/afio.html"
-DOWNLOAD="http://members.chello.nl/~k.holtman/afio-2.5.1.tgz"
-MD5SUM="03a04d7b16684dce6c628eba5a4c7c93"
+VERSION="2.5.2"
+HOMEPAGE="https://github.com/kholtman/afio"
+DOWNLOAD="https://github.com/kholtman/afio/archive/v2.5.2.tar.gz"
+MD5SUM="2ab7c66d2b6c100aef5fce596baf2247"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/agedu/agedu.SlackBuild b/system/agedu/agedu.SlackBuild
index 1794fed4c8..ad6f833c72 100644
--- a/system/agedu/agedu.SlackBuild
+++ b/system/agedu/agedu.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201025 bkw: Update for v20200705.2a7d4a2.
 # 20200302 bkw: Update for v20200206.963bc9d.
 # 20191130 bkw: Update for v20190630.66cb14d.
 # 20180918 bkw: Update for v20180918.80c7beb.
@@ -15,7 +16,7 @@
 # as upstream deletes the old version as soon as a new one is released.
 
 PRGNAM=agedu
-VERSION=${VERSION:-20200206.963bc9d}
+VERSION=${VERSION:-20200705.2a7d4a2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/agedu/agedu.info b/system/agedu/agedu.info
index 4f8c9293a1..0570282f19 100644
--- a/system/agedu/agedu.info
+++ b/system/agedu/agedu.info
@@ -1,8 +1,8 @@
 PRGNAM="agedu"
-VERSION="20200206.963bc9d"
+VERSION="20200705.2a7d4a2"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/agedu-20200206.963bc9d.tar.gz"
-MD5SUM="d31fb0d9ff9cc4c4b081aac0a5139ab1"
+DOWNLOAD="https://slackware.uk/~urchlay/src/agedu-20200705.2a7d4a2.tar.gz"
+MD5SUM="db17b0c0a7ee222e54e02e6a53ac10d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/aide/aide.SlackBuild b/system/aide/aide.SlackBuild
index b87c666081..a03e45be96 100644
--- a/system/aide/aide.SlackBuild
+++ b/system/aide/aide.SlackBuild
@@ -2,11 +2,11 @@
 
 # Slackware build script for AIDE
 # Andy Bailey <GooseYArd@gmail.com>
-# Emmanuel N. Millan <emmanueln@gmail.com> - 2018,2019
+# Emmanuel N. Millan <emmanueln@gmail.com> - 2018,2021
 
 PRGNAM=aide
 #PKGVER=`basename $PRGNAM*tar.gz .tar.gz | cut -d- -f2`
-VERSION=${VERSION:-0.16.2}
+VERSION=${VERSION:-0.17.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/aide/aide.info b/system/aide/aide.info
index 8caec1c7d3..2fa8767204 100644
--- a/system/aide/aide.info
+++ b/system/aide/aide.info
@@ -1,8 +1,8 @@
 PRGNAM="aide"
-VERSION="0.16.2"
+VERSION="0.17.3"
 HOMEPAGE="https://aide.github.io/"
-DOWNLOAD="https://github.com/aide/aide/releases/download/v0.16.2/aide-0.16.2.tar.gz"
-MD5SUM="9835914273bb06f9b3263ce36ef7149b"
+DOWNLOAD="https://github.com/aide/aide/releases/download/v0.17.3/aide-0.17.3.tar.gz"
+MD5SUM="b642b5da44e827da57ae24b3670e4b33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/alacritty/alacritty.SlackBuild b/system/alacritty/alacritty.SlackBuild
index afc957fc37..b776ff04fc 100644
--- a/system/alacritty/alacritty.SlackBuild
+++ b/system/alacritty/alacritty.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=alacritty
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-zcat $CWD/offline_build.diff.gz | patch -p1
-
 # build offline
 # configuration tells cargo to use the configured directory
 # for dependencies instead of downloading from crates.io
@@ -97,12 +95,7 @@ mkdir vendor
     ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
     dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
-    if [ "$dep" = "winit" ] ; then
-      tar xvf "$CWD/winit-d1c6506865c7bddbb5fb4d80a613e43ddc1370b5.tar.gz"
-      mv winit-d1c6506865c7bddbb5fb4d80a613e43ddc1370b5 winit-0.20.0-alpha6
-    else
-      tar xvf $CWD/$dep-$ver.crate
-    fi
+    tar xvf $CWD/$dep-$ver.crate
 
     touch $dep-$ver/.cargo-ok
 
@@ -119,11 +112,7 @@ mkdir vendor
       printf "    },\n"
       printf '    "package": "'
 
-      if [ "$dep" = "winit" ] ; then
-        printf "%s\"\\n" "0eb274a21a6f25b86b03d76b7f4e3fdfc5139c5f7a8bd999bee1aca43acd0b37"
-      else
-        sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
-      fi
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
     } > $dep-$ver/.cargo-checksum.json
diff --git a/system/alacritty/alacritty.info b/system/alacritty/alacritty.info
index 2e005d7ca0..a2b156f48f 100644
--- a/system/alacritty/alacritty.info
+++ b/system/alacritty/alacritty.info
@@ -1,69 +1,70 @@
 PRGNAM="alacritty"
-VERSION="0.4.1"
+VERSION="0.4.3"
 HOMEPAGE="https://github.com/jwilm/alacritty"
-DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.4.1/alacritty-0.4.1.tar.gz \
+DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.4.3/alacritty-0.4.3.tar.gz \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/andrew/andrew-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/android_glue/android_glue-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/android_log-sys/android_log-sys-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arc-swap/arc-swap-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arc-swap/arc-swap-0.4.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.32.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.40.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.10.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bindgen/bindgen-0.33.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bindgen/bindgen-0.53.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/block/block-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytemuck/bytemuck-1.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.8+1.0.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2/bzip2-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/c2-chacha/c2-chacha-0.2.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/calloop/calloop-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.48.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cexpr/cexpr-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.53.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cexpr/cexpr-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cgl/cgl-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clang-sys/clang-sys-0.22.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clang-sys/clang-sys-0.29.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/clipboard-win/clipboard-win-2.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cmake/cmake-0.1.42.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cmake/cmake-0.1.43.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.19.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.20.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/copypasta/copypasta-0.6.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.6.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.7.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.6.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.7.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.17.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-text/core-text-13.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-video-sys/core-video-sys-0.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.19.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-text/core-text-15.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-video-sys/core-video-sys-0.1.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.6.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/deflate/deflate-0.7.20.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/deflate/deflate-0.8.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/derivative/derivative-2.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dispatch/dispatch-0.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dispatch/dispatch-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/dlib/dlib-0.4.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/downcast-rs/downcast-rs-1.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/dwrote/dwrote-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/embed-resource/embed-resource-1.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.5.13.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/embed-resource/embed-resource-1.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/euclid/euclid-0.20.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/euclid/euclid-0.20.11.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/expat-sys/expat-sys-2.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-macros/foreign-types-macros-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-macros/foreign-types-macros-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.3.2.crate \
@@ -72,269 +73,257 @@ DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.4.1/alacritty-0.4.1.tar.
           https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-sys/freetype-sys-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent-sys/fsevent-sys-2.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent/fsevent-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.13.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.14.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin/glutin-0.22.0-alpha5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin/glutin-0.24.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_egl_sys/glutin_egl_sys-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_emscripten_sys/glutin_emscripten_sys-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_gles2_sys/glutin_gles2_sys-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_glx_sys/glutin_glx_sys-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_wgl_sys/glutin_wgl_sys-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/http_req/http_req-0.5.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_emscripten_sys/glutin_emscripten_sys-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_gles2_sys/glutin_gles2_sys-0.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_glx_sys/glutin_glx_sys-0.1.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_wgl_sys/glutin_wgl_sys-0.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/http_req/http_req-0.5.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/image/image-0.22.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/image/image-0.23.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/inflate/inflate-0.4.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/jni-sys/jni-sys-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/khronos_api/khronos_api-3.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.66.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lexical-core/lexical-core-0.6.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.70.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libloading/libloading-0.5.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/line_drawing/line_drawing-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.3.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.3.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/malloc_buf/malloc_buf-0.0.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-anonymous-pipes/mio-anonymous-pipes-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-extras/mio-extras-2.0.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-named-pipes/mio-named-pipes-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.22.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/named_pipe/named_pipe-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/native-tls/native-tls-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.33.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/native-tls/native-tls-0.2.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk-glue/ndk-glue-0.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk-sys/ndk-sys-0.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk/ndk-0.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.34.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.15.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-3.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-4.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/notify/notify-4.0.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.41.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-iter/num-iter-0.1.39.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-rational/num-rational-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.11.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.17.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-5.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/notify/notify-4.0.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.42.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-iter/num-iter-0.1.40.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-rational/num-rational-0.2.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_enum/num_enum-0.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_enum_derive/num_enum_derive-0.4.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/objc-foundation/objc-foundation-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/objc/objc-0.2.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/objc_id/objc_id-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-probe/openssl-probe-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.53.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.10.26.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.56.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.10.29.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ordered-float/ordered-float-1.0.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/osmesa-sys/osmesa-sys-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.10.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.7.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/peeking_take_while/peeking_take_while-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf/phf-0.7.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_codegen/phf_codegen-0.7.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_generator/phf_generator-0.7.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_shared/phf_shared-0.7.24.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf/phf-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_codegen/phf_codegen-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_generator/phf_generator-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_shared/phf_shared-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/png/png-0.15.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/png/png-0.16.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/podio/podio-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-crate/proc-macro-crate-0.1.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.30.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.13.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.3.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.6.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_isaac/rand_isaac-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_jitter/rand_jitter-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_os/rand_os-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/raw-window-handle/raw-window-handle-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.16.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-hash/rustc-hash-1.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_tools_util/rustc_tools_util-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.7.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework-sys/security-framework-sys-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.8.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework-sys/security-framework-sys-0.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.4.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.104.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.104.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig-sys/servo-fontconfig-sys-4.0.9.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig/servo-fontconfig-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/shared_library/shared_library-0.1.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook-registry/signal-hook-registry-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook/signal-hook-0.1.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/siphasher/siphasher-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook/signal-hook-0.1.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/siphasher/siphasher-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-0.6.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-client-toolkit/smithay-client-toolkit-0.6.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-clipboard/smithay-clipboard-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-client-toolkit/smithay-client-toolkit-0.6.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-clipboard/smithay-clipboard-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/spsc-buffer/spsc-buffer-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/static_assertions/static_assertions-0.3.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/stb_truetype/stb_truetype-0.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.22.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminfo/terminfo-0.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminfo/terminfo-0.7.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.43.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.5.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-2.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/urlocator/urlocator-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/urlocator/urlocator-0.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vswhom-sys/vswhom-sys-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vswhom/vswhom-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.2.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-client/wayland-client-0.23.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-commons/wayland-commons-0.23.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-protocols/wayland-protocols-0.23.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-scanner/wayland-scanner-0.23.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-sys/wayland-sys-0.23.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/which/which-1.0.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/which/which-3.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty-sys/winpty-sys-0.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winit/winit-0.22.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty-sys/winpty-sys-0.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty/winpty-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.6.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-clipboard/x11-clipboard-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-dl/x11-dl-2.18.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-clipboard/x11-clipboard-0.5.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-dl/x11-dl-2.18.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/xcb/xcb-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.5.3.crate \
-          https://github.com/rust-windowing/winit/archive/d1c6506865c7bddbb5fb4d80a613e43ddc1370b5/winit-d1c6506865c7bddbb5fb4d80a613e43ddc1370b5.tar.gz"
-MD5SUM="2e480583d1a71214c378b6b8cf41b184 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.5.5.crate"
+MD5SUM="bf062ba33330ef00d5ad7fe5c0209964 \
         853b409f126727af3ee29ae2de887271 \
-        5e41b84ab6486427a9de0aaa8414cfe6 \
-        d1b8436fac27cf4644cad3e695f2365f \
+        abc51f82118d86e83165ba87e2521e96 \
         6cceeb8df4bc23fa37bfcd31dfa3277d \
         196a2eb81627baf71f6677a3c669e6ac \
+        55fb1d6c71bdf258f91759517ac64c8e \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         711b149cf4767597fc265983750f4da3 \
-        a85e07c47c7690d56ddb4cf776fef26c \
-        3ac483de5b4c3bd00c6922295391ce70 \
+        da0c3fb9229aa468e48f73aa614b9823 \
+        6ff474dd60c839a9c788844b7a42c72c \
+        11364a62687e5682d652aeafe1a13ed2 \
         38a5278571eefda86428a8ebfc1cedc2 \
-        4d54da5d6fec11f144464c1a928df3fe \
-        898079c1c795b5aa847169137918c7bc \
-        8dc7791342326d4c157c5b1e8a211336 \
-        e4c598b78dc5d44154debd564bd89425 \
-        9ed1fef898024a6aaf3e3878cd83c103 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        7c6515c4b7f4c7723a3c6d1f07acc261 \
         bbaf2cabce203fecd54c0c294eb7fb2b \
-        18b867a604c1e8303d01bd107179cffa \
+        064762ae7ae5feb9af472e8e8900aea9 \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        07aa09e957c0e33d03016ca7f414ce99 \
+        085f6f44e54f62691bf3cf3365f5544a \
         ea2d23ceb9f98853a7dffc6c02884464 \
-        85562346cef4a44a32cc1fadcdd06b50 \
-        43c46e86e471f6a4e7bdaea0d6505c27 \
+        3b74244d96b3c60d2bf930a363679415 \
+        e502e6c6b0dca9c1ae2d99e92b26f645 \
+        ff4e1560b7d0ac5c4ae2688bc27f9c98 \
         e0bf3b40b2d51cb52f40647b368efb50 \
-        a470cd1ad90d21544de1cead32c54307 \
         0935eb9ddb26216e9dfd44bb249457b2 \
-        4a284f5334fc4ce4e5f4969dc98a3ea6 \
-        759bdda054c794e4e553ed446e6ac8ce \
+        547dbf225c61b70c81f74f79a83affc9 \
+        dcb58f182347515cab229f836dd8e6d1 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
         5739f950bcce803d986d189b128861b0 \
-        f203b3252adb458272effbcc3c7dbe6e \
-        135f6d6306e50606f0475ada50c33ce2 \
+        20cac860cf8ea29dd8e7e6f76eae9639 \
+        42af3a1e965585d80dcc1e0324fda6eb \
         eb6e4217d79aefec36a4d1068b4ae278 \
         1c8b50f8528dd37df7d984e0e4b61bd5 \
-        a4349339dcf0551c7f795e5a8f85b95e \
+        bfa12a07125b5aadf803aa3b5f939aa8 \
         8de0c85238890738ff538f1548be52f0 \
-        06426e259e81b55cb93a15c31cbe88d7 \
+        50a7fcd4cdc347a06d3702c8dea6e926 \
+        ec9751a4c0d35e7313e52ddb7147376b \
+        a31d6dd3fb5148b9f87bf0b5e2761585 \
         6a97194aa07f7993298563f012b05a73 \
+        9754db1eb3e8b15807f05a3540d2ab39 \
         ee7b2dc49246abc5b91ed9feccbde82f \
+        f0682cfdc40af509c98f46f6350c1ba5 \
         868723b977d47531ecfc00d431362acd \
-        8ef19b01c1898a58d8259634983578b3 \
-        9c040121c32313fcbd5e514a3901c02e \
+        2a9cc9f6b6f7399263d93df520be6ff6 \
+        bae239f1a0c474035926b65a8b271305 \
+        ba5527be251aede09ca0c45331f0feca \
         3c153e21729b743f5127dec47670de17 \
-        66912c6b316cfec144c4fbcbf59bf862 \
-        8bfe1cedccec2c99af2b566533e104ef \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        ba7b8f06debf4491d6d530caaa4d3e66 \
+        1bb3b5328fdb89edf639fd9c3613e61f \
         1946cef415cbf82cdcb975d813dd9696 \
         8b418106a3968619300a2af8f6b4f200 \
-        16fc2909c162b4d5c61722e58da8c856 \
+        03f2b7eae8b6491dbd3caacd842cb8cb \
         1886bdaca29d3af3cc1178fe96dc3876 \
         8cf354694bfabc868c506a648839b84c \
-        b5c83d38a90566cce432ca48643d1f1f \
+        f8e21d57a92cfe87510176559f2118f0 \
         a227f79f30fea6e06777524ce2602f18 \
-        ee9b2d13c7f9325306133c359d53ccd8 \
-        3986bd8fb612a68cf2b3c6fd81464457 \
+        146047ba26d24cfcfc6cf91979df6bc4 \
         081ed755ceb8e0b7c78cffde40fd084d \
-        88a26ff62804b34af70ec6a2faa7f0f5 \
+        788b783fe3389534dc509539c20b7612 \
         d318084a7a361875006cd156c19db3dc \
-        de2d3d836fb5c8c6897f2b4e16b65d29 \
-        a2e69999db212f31024f21ae7a62ccec \
-        704bb3b90e401df7415d10cb98cca8d2 \
-        9708bad3bd89dd9894e8f2e0a4de9d74 \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
-        891f4f01a0d00d3d0471a28fe5c0cdab \
+        b9f03f84345e22eae7858abc75dea31c \
+        5941f4a3d3435767e79260f61093ecd3 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        506b571683460afdd2674576c022ff76 \
         667e86b8b8d96ab4e9605627ce7dcc9a \
         13c3c9f696793ecdc507877849cd3e02 \
         78c898fdaa3968e23904bf8538c4a271 \
@@ -343,206 +332,193 @@ MD5SUM="2e480583d1a71214c378b6b8cf41b184 \
         9337eab4f601d1770903c6d3f3bde679 \
         7c292ae288fae4b3dd8f4871f7ec54e9 \
         49c7c8d8dff092a63277ed8d8a3b383b \
-        27260b46db6b9ac40318143d70a80ba3 \
         54cfab480b7a5f7302eadf44129d3f4b \
         dd7c80c2d04d2e9ceba82826cf69764d \
-        dfdcc92099e197aa0fbae622636ed40a \
-        61af0a81b544ec9cbd86f349bad3b705 \
+        de1228e571c94ef53ec4c21db57279ab \
         849054e0df3292687cc1a3971d65ec2e \
         cd6875725af793cd82db47d68b00ee93 \
-        f8ece52bd2dc2019f8ccc8401d259ecf \
-        98d76c8e4f9835a4927d11ccf11c1231 \
+        e7c07242a95ee1df865efe9534e10a34 \
+        8d6d77db0129da96cc9bbf3f7649d5af \
         a2532fe5c5af23f578e58f47c8b512f0 \
-        758b7c1f511a2b578c0ed79c1f197e99 \
-        e0a513526c8896fbdca49c5d805d4a35 \
-        5b21e1f0d584fa3448ae0236d48a1106 \
-        a6c0334d34f420b865c0393ad79eb85c \
-        9c17966c8f18434e9803081edb9d0d05 \
-        1830d5e24486d80c243969e96516604e \
+        443d79d3dc7fbcd8b2ca67a3caa717b1 \
+        197834cb95fbe6ee356760ede252f4d1 \
+        42111d38dc2b5b6f96aae7ea6412605f \
+        c6384052cffdc4f368edd4efd5c67c42 \
+        be4d52524ec8485abc40efba317b1e4c \
+        edc41639aa4527c8cd965e601d4a1b4d \
         bb2582cae7b3d837f5da1df153001db5 \
         54ac4c56d9ec2800b8428020f24be67c \
-        e1615b8de8c97f0d90b75136296fe5a6 \
+        c93dba5222b7abb3e2377590fcdb0d13 \
         8ece65b4db64f81379cbd293e2f04d39 \
         50929c2de8a472031f43c9fc371f2111 \
-        66dc0bb75af270eaae7297cab2268102 \
-        e4b87077e706d2d0b34664532bc0bf99 \
+        2be25e9b80e7d5a98393dc83069dc1b9 \
+        f73657307861e5406065d5171ad8ccdc \
         f1c40b9836035b69e464df711a1d2950 \
-        a5143958be2dfd4f34d4634973c12da2 \
-        59f7c7805e594603a30057e82accc4e8 \
+        493f4bd45cf2a6c3963f66f58884f622 \
+        73272fe4aadb91d550dca8fc7ead8bf7 \
+        04a84513cdad48c92d8363d627904227 \
         9d033cc2daa6924420a4a89e6705773f \
         8bc92e2d422193be1d498146e34a0b85 \
         fba3b040a55c01be7376d3dd5c4d4920 \
         09c2a456bd4064675a0c53ca70f5eea1 \
-        36ccbe3ad01b8cdf8ae1f0e28568eae5 \
+        a2f5808f8787bdbcf577f560c70b5dba \
+        6db136a3e060ff39fc699991b77b0170 \
         16b94c53885cc430711a85db2ea665e4 \
         8a79353ba205d0a86f695053dd4d15be \
         4e3c46643b83ce53618c9bcd211f111a \
-        7442f011dffa49333c3c49eed18209a1 \
-        02b4544bc1eed63768648b5e1efbba02 \
+        ccfdc823f169bd2016cb508b117dae67 \
+        19466d8edb3c032438026125770b17f9 \
         61e508ca2eee543023c5e1ba777e5ede \
         7c81e7a61ec172a229d6fdbc553e883d \
         7916dcd738a8fa6a2798754c20d6e146 \
         b5cf10e268e8a3bee2de8a734104245e \
-        b961d154bd164250ba7b651a1643db72 \
-        4b85a1c8d6ad78feccb549d50e81c697 \
+        124ec4f35274a0e9c1a4ef3dc0958643 \
         bdb38691302aeb63500e053919f5f0f7 \
-        59b2580a74f55f1026e26234caad37fe \
+        6ad7c30338903afc3521369ecd826cfb \
         eb7a07c42356ca50832d5a7ca0e738d3 \
         0d4dc4bd76fdb66114874a4afae6834b \
         0e68149cff6d0663d9d70dc88a3f124a \
-        cbb51b97e5e91ff6fd24b40e4feb5d09 \
+        e820082de1cf13e1111d2acbae898fcc \
         a82e0b9efe7f6385071c9fd9b3bccfa3 \
         6217ae55f37fa0c9a37595276ead194a \
-        e75dcb7aacaff7c5dcd7120dd5ad556b \
-        13bbe3e6bc0cf7e6e5e877d7c2587ab4 \
-        2ab09fa67b2a6b3b33eb15d8f23814ec \
+        98731fbefe42841dce239a8e8064431d \
+        e4b3317d33ff0d40a2a0f5195673ec38 \
+        fbccda0cd4fb98e305ba86c4dd5567bc \
+        7cc35774447d1ec5b7a6f0ebf8765c39 \
+        683a998da434a7ff8558bdf6eaa7b8c7 \
         0cddb62b3dcfb814b4e0b9441c5c1a18 \
-        65f04bfaccdc2156621ab8e6a22da1e9 \
-        1ee36ecee72339333335c8dbc5a5f501 \
-        92bcd45a654d9e24c86f3465c6387c47 \
-        44d321254a14c62d68d7e2475211a41b \
-        a09680cc667e663b1b19320b8614166b \
-        3f8e3010da14cb08648783296e2b172a \
-        dae789d1958abac54ffdd3a73ee54fff \
-        3826baff700aa07bbdc4659ef5a2d46b \
-        c7844b2d8aa3eb6e3e0e046b001f99ca \
+        c45800f4dfb888a928c772b081065214 \
+        2bd60bd849926090bd69a9fca2706c62 \
+        8efd24bdaba2414159d5c9c7d146f3ca \
+        d29e8c70063563f063eb6647ddd187ff \
+        9c52a747ee0325081e566c9f700a8d7e \
+        7ea8e5ad906d517aa522b8fcbc49e8dd \
+        99e024622d98dc28a8a5f37afccaf20a \
+        c3df6ec550943c6ccd356272db8eb202 \
+        fdb01eb939ccb5c5ff66970427d22c48 \
+        03442e847beac2997633c93f7ecb9cc2 \
         aecd889de42c8168e1bc97a6f2720d8f \
         b4dcac855af5df71f3383d86c4a96b78 \
         fd9aa273ad560dedd00ddcf3dbe808ce \
         0fb8f799f959c69991d54556c5457068 \
-        ca32e1e615d7863196eccd9e35611cd6 \
-        c88451bf438d171b7d01f7acb31e2e27 \
+        c20de7948428395a51bbd46dd03dbfc8 \
+        59b36aa3bae0b2fa7d338e71da2e309f \
         1d457c63e43a46ed899f3c644ffb2d92 \
         e1e7dd5a92eecf2d6a2430313d5b4de5 \
-        8d3f22415fd7622ab681783f87e9b7d5 \
-        783499db4bc8bb10620a842c2f2d8d36 \
-        521a4741dd82cd5667e866400c7a8e4f \
-        f4c3c3c0e0f18c40a6fca1aeb43f6f16 \
+        8d7308960df5143fe29a4a31c0c5f9c9 \
+        be2af3efcea9586194e249f646161d83 \
         7e264bc8f23a45ad680668cb5e57d9fd \
         f490982aceabdbd515348f63e638a782 \
-        b8db92fd9b5ab0acb0e107e2663e29ce \
-        208dec586f410e1e0f73922920496c17 \
-        c9b8a4037f18a98c6c48e91ad0337aad \
-        9f78b722429cc2f34dfab91ba302cae6 \
+        a580658df3c2da1e8fed41a7a51389d0 \
+        4964b67b085fa4433b67dbde4d986c31 \
+        fd3df95de65e4c1fe6c9c4a8399cb7e7 \
+        f27cbb8b66feb1cc9ab1b9af8a1a2c51 \
         d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        7e42ceeff4da1a6b25e2161814e76666 \
+        e23545b69ca2087070db2432c9e9f52f \
         7261ce43635fd9c2a009810db04d6901 \
-        7c4bfd315ee9de1c1b2f2d56163567cf \
+        31e22078d1d024582e5116669d6714e4 \
+        d120d82e6be8b10ed122a6b026db4199 \
         020c7d0be083642e24a1499122793006 \
-        06fbd7aed6eb61198afee9a4132f1dc7 \
+        54b1bfe8bed9df22acc8e98f0761f527 \
         3181dca31efe33cbed29a45d0ec67848 \
-        e4dce2134a2e4ae3bc240f8b09287d8f \
         e6692d52f35aa3b9311d7d7748fa25ea \
-        ad271964ee0641ce512d5ca5ac4f5b41 \
-        793627c8c18012ad77cb3e81fa4c2195 \
-        254edb578c297247938fb9a5ac8955a5 \
-        3ab5a79607a4d260bf61cd99dc82ab05 \
-        156a171385b476b5a63459398419c803 \
-        8cab41822d03dfa674870315308fa392 \
-        35ddcd36701a1a6711cc3aec85909f41 \
+        d3c0a18ae8f426b3659405203a88f182 \
+        66d1cb32dce999907409f636f004b884 \
+        0a80ed36a125ac3cdfa09f8707055873 \
         a0f55fda89c0f97784edb18f4c253a49 \
-        28b1e6d15e1ba8cf3a2e953ce7fcd3de \
         b269356e8646f3184a0e8d52a58cee69 \
-        74b15f1928431937f14ed91fdc12b542 \
-        2255d3d9a603e177985602a7df1c5bbc \
-        5acfdc8656212bce8df1bcc43db34c3d \
-        f9e08a49715c401602243230b28d86f0 \
-        7826deb76941fc36c2391951bd65ba47 \
+        7b0715affe44616a992f113ad7ab7d50 \
         6840e02794f8d1a270f10a743f62d8b2 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
         8dc2aa474c2cba342120ade9e98de066 \
-        f42752f3dd4d93251e28c0aeae2a7953 \
-        de7bb5037caf6403d859c56b09fedcd2 \
-        f1bbc6327ff6f0fee219010257939158 \
-        d3652677415c9ed4cae3b602316ff8bd \
-        f86ee8193d8297a35301f9afa73ddca6 \
+        31d088af3982b271b2afdda37e963518 \
+        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
+        26e3fed1cf505f5fd65b98fb149ca1aa \
         526f5ebac8d794185afbc71959c5c968 \
-        180a51b74b4b6ef842f48fa6bdf95f5f \
-        94136c77f70313d3162e031638fc67ed \
+        c9a135ad3406eeeffb425d585d4567d7 \
+        7b1261ea730a9314bc9bcdf4a379bf98 \
         675704441633e4a46e05d0dec5671a70 \
         4d101ab24d14c54937c5f45ece8fad5f \
         f69d418c4e60b38ce069f8778208b520 \
-        c3c2a6bb90612a9dfbfe635a0d450b8b \
-        7254eab0007564ebfaaed3a586c9919b \
-        6ece57eb74771cfee69719f514c3aa7a \
-        dae544e6b19bfbe9da40cf10988a29d9 \
-        dad6b55e158861f8c4e199d498efe162 \
-        9705fd56a28172c8af8c63197cca925c \
-        e2f38be68fb3f3878bd8708a0b88be2a \
+        55ba60123c22238764e9007b3152f6cc \
+        44d95c1ed46baee736c9420ad1de3228 \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        f505a218806e44b2369671089d65e839 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        1024ac462fe90a1d7882a6911bd70604 \
+        9e0c7fedb6287e5090bab920da5c1d09 \
         8b4d8c7b6e3a060d365bc1ad650929fa \
         64111c20b69aa1532fb66b70c4660b55 \
-        41f86328d71bfca707af1cf7fb14460c \
-        6ae6ed94c6787ec87ce5c7239fdad0f6 \
-        34cc94ac4855a569e4885f3366700458 \
-        c32a0204af6704a7eae1b0e473a5918e \
+        3879349fe374e764e24f37ce40ac9824 \
+        9b7d58f6341fb619ff2190481ce13b84 \
+        ce76f5430cd6d2ab76d0d86ecb8a4f4d \
+        edc6879bb5e213331662862bb4a68145 \
         1e7f016a7eff797498f28cba0e156d3a \
         0a1c33ff15279010692af23566070deb \
         e0a0f1fa737110ffd0b04af8d1062edd \
+        e4e7efe2ab7921499d5c247a349e9e1f \
         6baa5e1feb7ae90febb0ce028b0e4117 \
-        48d6c7edc4ae1ac7291f83bb25112ae1 \
-        85e4e64ebc6bd76f1b9ff5be147a918d \
+        25d8a9b311bab576201d2d2bf19492e4 \
+        760118daf11b1985e22552de2b5b868a \
         c7bfa89e6da163f1474bb3787987bb12 \
-        8984a241871c346716c1f46549907a9e \
-        32f5621d1013059eda5e659eb6558dd6 \
-        3a6a284283ade096cef1054fc9760109 \
-        e9297e434e8b98b4168e9071a5d84618 \
-        b31865d7dac5715109192ed926eefa30 \
+        079297fc0fb968f749368577d9131549 \
+        d542cb62835e6715b6971ef7af7a592c \
+        0f842e0256ed664e51aca8ca2e306c57 \
+        77db363940fc8039d4389406375031d0 \
         557d2ae2d0ba91790dfa7b2a894807e8 \
+        180a73ec075244f3a7a519160efade32 \
         3cea882cebbb1273387568cf938abe35 \
         781d4ccf5d04c98fa02af207a9639249 \
-        2e67a226b051d8274d3bdaa872609a2e \
-        bd5f9d9900731be1a4e4df05db231991 \
+        67ddc5f26cbbc715dfa213c9e4881dd7 \
         bb3ae104a9fa1b31568cc98c920a4653 \
-        4df756b9ab1b163e13a390b204b3d092 \
-        051f9a8b684a784c146a4ab0b79de48e \
+        62e883807a65ebe1ba9d0e555d703339 \
+        c4fcdc44105c5e02def5a4ea19f1775f \
         a8de006fe0c7e373c560dd51599287a8 \
-        baaa166f66e90e94b76b7418afd5df90 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
-        460c77765ecd617dc230b8feb1c07e38 \
+        a5dd75e77c7324f5c1d2d372c990d0a7 \
+        9d66208e00715217a8c1f2e40efe4a0c \
+        2e99b7fe9fc50def58bf0b391c149b1c \
         36cbce768155bdac8934efa262d75fe3 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
-        a9cab683aed77cef7b446d2bc9014b12 \
+        3d394ff298f20e04de3ce053ab63ccc7 \
         0f65fd26370e1fd67c8e8812cabea574 \
         5aaf04f9a94a6450e3e4963ddd62b92d \
         e628ca8adb2b572bffb210f014656b6f \
-        a76e35e38a9d89f7915ba064c34cb88b \
-        57ed07835f226229604691b687407af4 \
-        3b29db27295237c759f597215fc9b870 \
-        3b656a3aebdf60145eb01a1300cd85ca \
+        81821d39675a1f584546b9920e5d6b5d \
+        f0fec022d543fb5d2575bd32ee6803a4 \
+        9d83f7627e511837fb2d94fbad338d35 \
         aab44b0dae2fc434c7b1f119ffb100b9 \
-        0eedbc32447f40b3045d6de3910b5415 \
-        f48add3d6234e8b9829fa5364509f425 \
+        333b4ba3f64c35b6f89b521e8d64548b \
         0d6976e8a1a1e69abc8ba8f6966cddb8 \
         689203efc084fc0f1d1f74f5d354ae75 \
         6fe13b4122d83cd239b61466ede3198c \
         32222c3df2805eabcfe92432db2aee8f \
-        9f49c12903d0319936054bf1c128f112 \
-        5933f1ea0593fae34fbd678057867287 \
-        15f70a2b956755e88b334e7c1af58e97 \
+        03d7d776edd1a01dbc81f955fa9a9d41 \
+        a29fec77b1e07caf7b682b881b676c06 \
+        1092a4a24e80f8856efc71af51a06114 \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         a59b9a01b4de22db8d7287f945bce33c \
         b5015d777b19cae7d1c9a40622c74b03 \
         45a3312c06fe9539a292146025f02426 \
         fbdc95c195b987c8d75dc92c97a10307 \
         5a2a0beb0c61c93106161a473bb9df12 \
-        2d007e6bd4d52c23e864eaa2f9fcbc2f \
+        7035a08f69721a134bd3f401d977fb57 \
         c900e7dbce808ff8ced375077b17a163 \
         db96b50050277bf05a3c68534bbb9586 \
-        4724370f3179d1ab61f3fd8fa60a2368 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
         b44489eb4799c4fabac3fceb48de54f7 \
         ce68e06a2cd4f180747cf169fc388a95 \
-        becaf5049393c66bf9528dd91352a474 \
-        35dc54bd806e940d9fd1fcdab28a5fc3 \
+        8125488182a6ce236cdc8508ae1ad6a2 \
+        b047c36ce2c3277ec2f9d0b88b17a082 \
+        a5993712501e0c03db6ec7a31c4d6d50 \
         e01f3a4b5c3690899e5975c90bf12174 \
         38346bab0933c9eb1e36d22fe4220ba7 \
-        4c360539c1e2eaf6118f79199a6160af \
-        0ac49194909832792cd9416a765937f0 \
+        8aa5631ce68ab505b09a7e01fd704f65 \
+        6e5896b10ddc995243e45e5482e7ee43 \
         bc17188adb6a07610c3a78bfb184ef59 \
         1628d3f26e3f952d8c43973ade1f2dad \
         9039399ab9632e189ce70d8008011d34 \
         0541629539c6bf2359a81746df61d841 \
-        7b5222be79d068d384ec7f675656fab7 \
-        6c8802df107430f14c7738a0750f0f66"
+        7ae9feef92beadbfbb0caa8c2fee28d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/system/alacritty/offline_build.diff.gz b/system/alacritty/offline_build.diff.gz
deleted file mode 100644
index b27c15b6f2..0000000000
--- a/system/alacritty/offline_build.diff.gz
+++ /dev/null
diff --git a/system/android-file-transfer/README b/system/android-file-transfer/README
index a2ec55f725..a0b712341a 100644
--- a/system/android-file-transfer/README
+++ b/system/android-file-transfer/README
@@ -1,8 +1,10 @@
 Android File Transfer for Linux - reliable MTP client with
 minimalistic UI similar to Android File Transfer for Mac.
 
-Android File Transfer by default builds qt4 ui (or qt5,
-if installed).  However, in building only the client,
-without ui, run the script with the following command:
+Android File Transfer by default builds qt5 ui. This version
+of Android File Transfer does not support qt4 ui.
+
+In building only the command-line client (this does not require
+qt5), run the script with the following command:
 
 QT_GUI=no ./android-file-transfer.SlackBuild
diff --git a/system/android-file-transfer/android-file-transfer.SlackBuild b/system/android-file-transfer/android-file-transfer.SlackBuild
index 809af5be97..07699f3c7d 100644
--- a/system/android-file-transfer/android-file-transfer.SlackBuild
+++ b/system/android-file-transfer/android-file-transfer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for android-file-transfer
 #
-# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=android-file-transfer
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,9 +81,9 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release .. \
-    -DBUILD_QT_UI=$GUI
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_QT_UI=$GUI \
+    -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
diff --git a/system/android-file-transfer/android-file-transfer.info b/system/android-file-transfer/android-file-transfer.info
index e2ec031b1b..256a032663 100644
--- a/system/android-file-transfer/android-file-transfer.info
+++ b/system/android-file-transfer/android-file-transfer.info
@@ -1,10 +1,10 @@
 PRGNAM="android-file-transfer"
-VERSION="3.9"
+VERSION="4.2"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
-DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v3.9/android-file-transfer-3.9.tar.gz"
-MD5SUM="84c28538f03802a3f0dda71e53564034"
+DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v4.2/android-file-transfer-4.2.tar.gz"
+MD5SUM="861de28c87f095a32808d0cbf9bb897a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
 MAINTAINER="Isaac Yu"
 EMAIL="isaacyu1@isaacyu1.com"
diff --git a/system/ansible/ansible.SlackBuild b/system/ansible/ansible.SlackBuild
index bb0f5e4a09..f5043880e4 100644
--- a/system/ansible/ansible.SlackBuild
+++ b/system/ansible/ansible.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ansible
-VERSION=${VERSION:-2.9.13}
+VERSION=${VERSION:-2.9.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info
index 643c9cb987..bd7b3a06ee 100644
--- a/system/ansible/ansible.info
+++ b/system/ansible/ansible.info
@@ -1,8 +1,8 @@
 PRGNAM="ansible"
-VERSION="2.9.13"
+VERSION="2.9.20"
 HOMEPAGE="https://www.ansible.com"
-DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.13.tar.gz"
-MD5SUM="3f66cce5bdbfc49315b9f357d36d38c5"
+DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.20.tar.gz"
+MD5SUM="47226da137b30883f166d5543882d66f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cryptography python3-PyYAML Jinja2"
diff --git a/system/apg/README b/system/apg/README
new file mode 100644
index 0000000000..5185c1ddd4
--- /dev/null
+++ b/system/apg/README
@@ -0,0 +1,18 @@
+apg (automated password generator)
+
+apg generates random passwords according to several algorithms. The
+default algorithm is pronounceable password generation algorithm
+designed by Morrie Gasser and described in 'A Random Word Generator
+For Pronounceable Passwords (National Technical Information Service
+(NTIS) AD-A-017676)'.
+
+This SlackBuild by default patches apg to use /dev/urandom rather than
+/dev/random for generating random seeds, to avoid apg blocking while
+waiting for the kernel to gather more entropy. If you're worried about
+this being possibly insecure, first read:
+
+http://web.archive.org/web/20201109034537/https://www.2uo.de/myths-about-urandom/
+
+Then, if you remain unconvinced, you can run this script with
+URANDOM=no in the environment to use /dev/random. Remember, apg is
+only using this to generate *seeds* for its own built-in PRNG!
diff --git a/system/apg/apg.SlackBuild b/system/apg/apg.SlackBuild
new file mode 100644
index 0000000000..a213d6346e
--- /dev/null
+++ b/system/apg/apg.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Slackware build script for apg
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# TODO: figure out what's wrong with apgd. It works fine when called
+# from the command line, but when starting it from inetd it seems
+# to get stuck in a loop, never prints any output, logs hundreds
+# of requests, and never generates any output. This is low-priority
+# because nobody actually *uses* a password-generation TCP service...
+
+PRGNAM=apg
+VERSION=${VERSION:-2.2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+[ "${URANDOM:-yes}" = "no" ] || sed -i 's,/dev/random,/dev/urandom,' rnd.h
+
+# If we were going to build the daemon, we'd use "make all".
+
+make FLAGS="$SLKCFLAGS -Wl,-s"
+make install INSTALL_PREFIX=$PKG/usr
+gzip -9 $PKG/usr/man/man?/*.?
+
+rm -rf doc/man
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING LICENSE README README.md THANKS TODO doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/apg/apg.info b/system/apg/apg.info
new file mode 100644
index 0000000000..89d7456f13
--- /dev/null
+++ b/system/apg/apg.info
@@ -0,0 +1,10 @@
+PRGNAM="apg"
+VERSION="2.2.3"
+HOMEPAGE="https://github.com/jabenninghoff/apg/blob/master/rnd.c"
+DOWNLOAD="https://github.com/jabenninghoff/apg/archive/v2.2.3/apg-2.2.3.tar.gz"
+MD5SUM="6d1490d7835dbf5a04ade75fbad3d726"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/apg/slack-desc b/system/apg/slack-desc
new file mode 100644
index 0000000000..7278d89849
--- /dev/null
+++ b/system/apg/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+apg: apg (automated password generator)
+apg:
+apg: apg generates random passwords according to several algorithms. The
+apg: default algorithm is pronounceable password generation algorithm
+apg: designed by Morrie Gasser and described in 'A Random Word Generator
+apg: For Pronounceable Passwords (National Technical Information Service
+apg: (NTIS) AD-A-017676)'.
+apg:
+apg:
+apg:
+apg:
diff --git a/system/atop/142.patch b/system/atop/142.patch
new file mode 100644
index 0000000000..b17fe2d6ca
--- /dev/null
+++ b/system/atop/142.patch
@@ -0,0 +1,47 @@
+From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 22 Dec 2020 12:23:33 +0100
+Subject: [PATCH] ifprop.c: fix build with kernel < 4.6
+
+Build fails with kernel headers < 4.6 since version 2.6.0 and
+https://github.com/Atoptool/atop/commit/08c622ecaa5bb0bb260984ceaddc4730d1b312a7
+
+Indeed, ethtool_link_settings and ETHTOOL_GLINKSETTINGS are only
+available since
+https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ ifprop.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ifprop.c b/ifprop.c
+index 60fa3fa..63fce5a 100644
+--- a/ifprop.c
++++ b/ifprop.c
+@@ -104,7 +104,9 @@ initifprop(void)
+ 	char 				*cp, linebuf[2048];
+ 	int				i=0, sockfd;
+ 
++#ifdef ETHTOOL_GLINKSETTINGS
+ 	struct ethtool_link_settings 	ethlink;	// preferred!
++#endif
+ 	struct ethtool_cmd 		ethcmd;		// deprecated	
+ 
+ 	struct ifreq		 	ifreq;
+@@ -153,6 +155,7 @@ initifprop(void)
+ 		strncpy((void *)&ifreq.ifr_ifrn.ifrn_name, ifprops[i].name,
+ 				sizeof ifreq.ifr_ifrn.ifrn_name-1);
+ 
++#ifdef ETHTOOL_GLINKSETTINGS
+ 		ethlink.cmd              = ETHTOOL_GLINKSETTINGS;
+ 		ifreq.ifr_ifru.ifru_data = (void *)&ethlink;
+ 
+@@ -164,6 +167,7 @@ initifprop(void)
+ 			phy_addr = ethlink.phy_address;
+ 		}
+ 		else
++#endif
+ 		{
+ 			ethcmd.cmd               = ETHTOOL_GSET;
+ 			ifreq.ifr_ifru.ifru_data = (void *)&ethcmd;
diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild
index 971777441c..a8302f3497 100644
--- a/system/atop/atop.SlackBuild
+++ b/system/atop/atop.SlackBuild
@@ -12,8 +12,8 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=atop
-VERSION=${VERSION:-2.5.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.6.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -58,6 +58,8 @@ 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 {} \;
 
+patch -p1 < $CWD/142.patch
+
 make CFLAGS="$SLKCFLAGS"
 
 # Install the binary sgid utmp in order to allow accounting
diff --git a/system/atop/atop.info b/system/atop/atop.info
index f34f8750fe..4e380ae2da 100644
--- a/system/atop/atop.info
+++ b/system/atop/atop.info
@@ -1,8 +1,8 @@
 PRGNAM="atop"
-VERSION="2.5.0"
+VERSION="2.6.0"
 HOMEPAGE="https://www.atoptool.nl/"
-DOWNLOAD="https://www.atoptool.nl/download/atop-2.5.0.tar.gz"
-MD5SUM="5a63d28c276e8f65e8186083b51c7f3a"
+DOWNLOAD="https://www.atoptool.nl/download/atop-2.6.0.tar.gz"
+MD5SUM="1cb879c4e98de49dc66ab79791f435d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/avfs/avfs.SlackBuild b/system/avfs/avfs.SlackBuild
index eeacc0b71b..9e384ac6d5 100644
--- a/system/avfs/avfs.SlackBuild
+++ b/system/avfs/avfs.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by Eugene M., <damagedone at gmx dot com>
 
 PRGNAM=avfs
-VERSION=${VERSION:-1.1.3}
+VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/avfs/avfs.info b/system/avfs/avfs.info
index bd4de2c5ad..8313618311 100644
--- a/system/avfs/avfs.info
+++ b/system/avfs/avfs.info
@@ -1,8 +1,8 @@
 PRGNAM="avfs"
-VERSION="1.1.3"
+VERSION="1.1.4"
 HOMEPAGE="http://avf.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.1.3/avfs-1.1.3.tar.bz2"
-MD5SUM="a2bfa82748c2d3ecb40a5df71ecf136d"
+DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.1.4/avfs-1.1.4.tar.bz2"
+MD5SUM="c333462d744aeab2e6bee7a1af02350e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="p7zip unrar"
diff --git a/system/bat/bat.SlackBuild b/system/bat/bat.SlackBuild
index b2409138cb..3ad1d70525 100644
--- a/system/bat/bat.SlackBuild
+++ b/system/bat/bat.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bat
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bat
-VERSION=${VERSION:-0.13.0}
+VERSION=${VERSION:-0.18.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/bat/bat.info b/system/bat/bat.info
index 8ab185579f..9a8337b2f1 100644
--- a/system/bat/bat.info
+++ b/system/bat/bat.info
@@ -1,50 +1,37 @@
 PRGNAM="bat"
-VERSION="0.13.0"
+VERSION="0.18.0"
 HOMEPAGE="https://github.com/sharkdp/bat"
-DOWNLOAD="https://github.com/sharkdp/bat/archive/v0.13.0/bat-0.13.0.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_colours/ansi_colours-1.0.1.crate \
+DOWNLOAD="https://github.com/sharkdp/bat/archive/v0.18.0/bat-0.18.0.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler/adler-0.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_colours/ansi_colours-1.0.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/anymap/anymap-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-0.12.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.45.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.34.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.10.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bincode/bincode-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bindgen/bindgen-0.50.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bat/bat-0.18.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bincode/bincode-1.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.6.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-buffer/block-buffer-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-padding/block-padding-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byte-tools/byte-tools-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.50.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cexpr/cexpr-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clang-sys/clang-sys-0.28.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clicolors-control/clicolors-control-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/console/console-0.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bugreport/bugreport-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clircle/clircle-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/console/console-0.14.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/content_inspector/content_inspector-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/deunicode/deunicode-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-next/dirs-next-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/encode_unicode/encode_unicode-0.3.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding/encoding-0.2.33.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-japanese/encoding-index-japanese-1.20141219.5.crate \
@@ -53,176 +40,146 @@ DOWNLOAD="https://github.com/sharkdp/bat/archive/v0.13.0/bat-0.13.0.tar.gz \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-singlebyte/encoding-index-singlebyte-1.20141219.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-tradchinese/encoding-index-tradchinese-1.20141219.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_index_tests/encoding_index_tests-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/escargot/escargot-0.5.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fake-simd/fake-simd-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fxhash/fxhash-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fancy-regex/fancy-regex-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.20.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/float-cmp/float-cmp-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/form_urlencoded/form_urlencoded-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.2.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.13.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itertools/itertools-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.68.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.12.0+0.99.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libloading/libloading-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.86.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.12.18+1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/line-wrap/line-wrap-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/liquid/liquid-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/liquid-compiler/liquid-compiler-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/liquid-derive/liquid-derive-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/liquid-error/liquid-error-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/liquid-interpreter/liquid-interpreter-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/liquid-value/liquid-value-0.19.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/maplit/maplit-1.0.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-4.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.42.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/onig/onig-5.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/onig_sys/onig_sys-69.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/peeking_take_while/peeking_take_while-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.19.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.44.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/onig/onig-6.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/onig_sys/onig_sys-69.6.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.11.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.8.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/path_abs/path_abs-0.5.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/pest/pest-2.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_derive/pest_derive-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_generator/pest_generator-2.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_meta/pest_meta-2.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/plist/plist-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.30.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-quote/proc-quote-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-quote-impl/proc-quote-impl-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/plist/plist-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.8.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.6.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.22.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/safemem/safemem-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.105.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.105.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.48.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha-1/sha-1-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/shell-words/shell-words-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.10.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.123.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.123.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.62.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serial_test/serial_test-0.5.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serial_test_derive/serial_test_derive-0.5.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/shell-words/shell-words-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/snailquote/snailquote-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/std_prelude/std_prelude-0.2.12.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syntect/syntect-3.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termios/termios-0.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.60.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syntect/syntect-4.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sys-info/sys-info-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.16.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror/thiserror-1.0.23.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror-impl/thiserror-impl-1.0.23.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-1.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/treeline/treeline-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/typenum/typenum-1.11.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-trie/ucd-trie-0.1.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-segmentation/unicode-segmentation-1.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-1.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode_categories/unicode_categories-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/which/which-2.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wild/wild-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.2+wasi-snapshot-preview1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wild/wild-2.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.3.crate"
-MD5SUM="ba9eba043bbd655cd959f0ad29b11c34 \
-        853b409f126727af3ee29ae2de887271 \
-        abc51f82118d86e83165ba87e2521e96 \
-        4b7bc58614d5e591a09f1d43fce506d6 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.5.crate"
+MD5SUM="e49ce07dd1c51c91f67423d62af32abf \
+        c9d0c8f38c6686e47c29fe9b409c25c2 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
+        3b493a3c9dcd266b3b682e2c2f2191e1 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         f44e8d1d2e61974b268852797530ea41 \
-        64a3aad83a83e6ec727a4d896dcbc077 \
-        6ff474dd60c839a9c788844b7a42c72c \
-        38a5278571eefda86428a8ebfc1cedc2 \
-        b93a56349676498e20bc50a941103125 \
+        6bd91b6b8d9a78a24535d0ed8c738a6c \
         142cb4b9a653e56e56311f0c883b8582 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        e45fcd8245c9e0cfa202abd7e689aa59 \
-        293686d8ff0743bec5d9e3610e101a13 \
-        9ed1fef898024a6aaf3e3878cd83c103 \
-        bbaf2cabce203fecd54c0c294eb7fb2b \
-        acbfcf4f421b7b780926484ad51a989b \
-        85b3c450c138ea8178b0524314b18c54 \
+        c6443ec8d007c729ba5482008d0c864d \
+        80a2c27647a6acb1890a3a7de8fded72 \
+        75337445ec034d3b0c5c191bc9f10e9a \
+        de348f8664b16740eb8d438f9c2fb8a7 \
+        8f8acc3c1caff2043085a0cc28a92757 \
+        45a867175c81501378699f80724393c0 \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        085f6f44e54f62691bf3cf3365f5544a \
-        a885637c56c780044d778f18420687cc \
-        95414d4f9c612bbe8a061dd2ff0bc519 \
-        33229041d7f94f7187634d017a75654f \
-        4bd3c3b61fe602e6078615a491e5050a \
-        e502e6c6b0dca9c1ae2d99e92b26f645 \
-        9b688de84c233898a6e2492174b3ea26 \
-        c229eb8d618a4f2402a15ced68043b63 \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
-        372b0092eb56ebfa98956f810f148610 \
-        320e56c88faae089a89b527a8b428183 \
-        135f6d6306e50606f0475ada50c33ce2 \
-        8a5db69be39bf2857af9636d8de0e9a4 \
-        8175ebb31ccc97dc26f5c02eb1cfc33b \
-        ec9751a4c0d35e7313e52ddb7147376b \
+        5521c32e5f09faa1fbbdb584c95316dc \
+        5d0d14275cf3dd93c93733d3f02613c3 \
+        c0c854d9b92b342470c85564612651fb \
+        b3ebb5d4433417e998d982d46334a6f4 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        1d8b58aa271a21c4196bf1d2a0bb61d1 \
+        4b95605e5c36d3757bad8eb17a64097c \
         64bebafaf681f39deebbc41b24b3527f \
-        3c153e21729b743f5127dec47670de17 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        16c7cd3e8ff97282cbf9f28d8500dd83 \
+        e5b87a7cd8e16e7f46ee58f0e75c026a \
         5e49f4c3f9076fe30ae207fe951f9195 \
-        b00352aced738d455145117157604783 \
-        8b418106a3968619300a2af8f6b4f200 \
-        1946cef415cbf82cdcb975d813dd9696 \
+        3681f813c502d911e9eea940dddd26a5 \
+        056c8d712ee146347c412b72f4077b2f \
         dd1e49c76e9d5853e673a3b41ba02917 \
-        82241b59d4b793d862900b62220cf05a \
+        99e2caee477220b4f0dcf7fdc6fb1b96 \
         95a243b2d7c30018a643e218b3c5d693 \
         1cdd23edc54b385ee5cfb6a0f9f52f17 \
         c19b47edfeea6760da864066bba50208 \
@@ -231,132 +188,115 @@ MD5SUM="ba9eba043bbd655cd959f0ad29b11c34 \
         0dbb2c3d83adb1fa4f17ac94e2bef0dc \
         afdb4c49775dbcd9c76763052433d370 \
         5c31515f4fc8fc5167a5b64f816e915e \
-        034a5cb6f2dd0fe6602fbe95806b678b \
-        e40f8ca2f829fb9f88a1c6578cb531ef \
-        0ed74c1b8cc800ab195c52caded49610 \
-        afc24cfd4c16e2562810eb6fa6b8339d \
-        1aef0dd636d3ef234e4f035fc26c0069 \
-        5941f4a3d3435767e79260f61093ecd3 \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
-        27260b46db6b9ac40318143d70a80ba3 \
-        3903eb92a9ffd398f49c39b8df8e3987 \
-        916a6c827f4f0f64b7652bebf67d82e1 \
-        de1228e571c94ef53ec4c21db57279ab \
-        f0f8bee31c89edc29671c251db6c3e56 \
+        da699c4c8e4c153cbdb9fb0ef3fb3056 \
+        480f00b3768504ade60944b9b340bc67 \
+        7881509413936dc7382f9314f632787e \
+        2a49454320cf4ea4fde553c66e2e9522 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        e3225eb6ecda0f2c3d1d09c8450f7ef8 \
+        b8a0cdd510c32ee8b6cdd47ba3ea3a4c \
+        f6ff4e5808bcd44a99b19384561b4f52 \
         e7c07242a95ee1df865efe9534e10a34 \
-        976eacc1e28ff6a04a08e7f4a2a5466a \
-        b9b9083c321e04d293fc37b9695a8e49 \
-        bb2582cae7b3d837f5da1df153001db5 \
-        89cabfcb37602a7b200b1a9cd660ee2e \
-        54ac4c56d9ec2800b8428020f24be67c \
-        ba77ab6ec36953a30a83a70a1281ded7 \
-        493f4bd45cf2a6c3963f66f58884f622 \
+        1b94f32581a557963eecb29761e9c0eb \
+        58285dfb5134c5df5503066a20dc9d2c \
+        2c4bc5c16b345ce4d4bbf977577fab35 \
+        37526dd3d44994407f5d2e9ab4fc022d \
+        acd3ce35bdaa48ec384fcfec07c0f0dd \
+        1509d8c3ecae86153ea1e5724d2018c9 \
+        4379362bf1be77d47a45c7223a01eead \
         04a84513cdad48c92d8363d627904227 \
-        9d033cc2daa6924420a4a89e6705773f \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        09c2a456bd4064675a0c53ca70f5eea1 \
-        12eab0b5d25a0244e1082c24d3b6c57d \
-        bbcf4819e9d0f41500509611958690d0 \
-        16b94c53885cc430711a85db2ea665e4 \
-        8a79353ba205d0a86f695053dd4d15be \
+        23cc9e52c52465f5b225e62ab7cc3457 \
+        04f84e88732a1057a37b5d01c23eac1d \
+        b5b2006aeb90fbd6a12b32ed9c19bb37 \
+        e5768043e447a7423f030c1394440502 \
         651dd38020e02806ccadcc41df89c7dc \
-        7442f011dffa49333c3c49eed18209a1 \
-        d3d3074d88dbdc0ab7e2aaab05a478e1 \
-        bf0ef2a63fdff2462afaa5c58ecc1245 \
-        ad0392b18387a04b769a68f82bf21e69 \
-        dc830fd476b1ba0220441514d021f2d0 \
-        0843cda3c08f3ff9fbca71de2b4221e7 \
-        c0db0cedf3885ec05508985a8a20e489 \
-        61e508ca2eee543023c5e1ba777e5ede \
-        47580fad08273a52e998f84ef404912e \
+        0d60bc25ce9a0383bf64efc300f4cb16 \
+        474d078cf6fb1ea92ec630c7ffa5df90 \
+        40e508baeee8cdccbc471489b0f449ff \
         7916dcd738a8fa6a2798754c20d6e146 \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        6ad7c30338903afc3521369ecd826cfb \
-        92bcd45a654d9e24c86f3465c6387c47 \
-        9c52a747ee0325081e566c9f700a8d7e \
-        c3df6ec550943c6ccd356272db8eb202 \
-        0d0869472b8dff13a99b2bafc54c9a1e \
-        fa7e0b53d2cd022ddce52bb924eed616 \
-        797752fea1f2c8b458cf7383b61433c9 \
-        7e264bc8f23a45ad680668cb5e57d9fd \
-        8a5fc6ba84f3ac8a7e43ecb99322866c \
+        fa3630e5867493e09296155763e4f4a0 \
+        c291ac2f4465c030c058a7c1bc595783 \
+        4ade3dff4f5f96ff3aa1c04fd28ac11d \
+        f9ddf92ded75c1df47b2dd1379a482fd \
+        a8ec1126ef06244ac1e3773981a005f1 \
+        c0e036fd990d0c9cae11b5876a5cb572 \
+        d227ca24b102ae4ab2a4f3bc3bd44bf3 \
+        e7de14df5369a22fe08167972e34df14 \
+        2c223fe5b38361c4aa8b8a4ea832e910 \
+        fc5f09918af1f97297e928d728e07236 \
+        467a9abc6c4099e5cb830a0eed66cbfb \
+        88b078aad93b7c645bd6c127e910051b \
         f490982aceabdbd515348f63e638a782 \
         37cf6acd1c3259eefeba636e4cc9b365 \
-        43e97206d08bfd1a23b2ed01fba95c69 \
-        0cf1fcdb3e8eab7001792f4916516fc2 \
-        222d8ac7246a639ff9858d12cbb40e54 \
-        d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        8617790d80fbc13cda1b84b4b5dfe579 \
-        22a3abb4bb5dd1549ddc0cc235bfc1d3 \
-        d7994a5881ead65b583339d8c7fc31c8 \
-        7d6ee412648063d4ef8062b466a41115 \
-        19cb00cf377f71bd91878f1af50e9b47 \
-        020c7d0be083642e24a1499122793006 \
-        d614fed188f35da55b2d9e846d315e09 \
-        5e1df5342fa3ed15a92e85c16c726510 \
-        20fd9e86e9ef654c21e7cf2df40cd43b \
-        3181dca31efe33cbed29a45d0ec67848 \
-        e6692d52f35aa3b9311d7d7748fa25ea \
-        2d2578337a3ff53dce9b46fb5bf7102c \
-        9e99a37f8c37bb953732ef46ac2b12a1 \
-        8cab41822d03dfa674870315308fa392 \
-        35ddcd36701a1a6711cc3aec85909f41 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        31d088af3982b271b2afdda37e963518 \
-        8ea9f47964ca4c580f250027ceb4cefd \
-        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
-        526f5ebac8d794185afbc71959c5c968 \
-        c9a135ad3406eeeffb425d585d4567d7 \
-        94136c77f70313d3162e031638fc67ed \
-        9436ca5c7881b6e8f3caae39515498df \
+        448bc61aee07661464d98da7660e9a1d \
+        899b172855b10f2e76eea3ecc6314a7d \
+        a4ff7abd41c57dfd24bbd4b50edb848f \
+        e93afff8bd2e6bc78ba02d6312d7c006 \
+        30d783a004d6ae43913983d49b8466c9 \
+        59425b318d7a80253445671a9fda0aa4 \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        3233400d1bc56e7c78d4d7564d8e5b74 \
+        e878596904877d1d7933d8f89a63dd49 \
+        bacea6e63b5b0b7a55a8881b47d80f3a \
+        b5b168b1af99cbb8c0f5556ffe56f1e5 \
+        69e9436d5c9889a6fdf199dfc5c3d3fe \
+        03fb8f44e1d4f958154720139bde9cb0 \
+        d961a02195226cfce1a1e23ba5980cb4 \
+        26d687e0e0e8b04fafabfcd88f594a53 \
+        3b298ba1d0e5e75b14765b2c48d52b13 \
+        bef05db0f0e720c1fd56505850065ae1 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        a69721c73263cd2040e1a5f120b03a6f \
         994b165f971ecfc09dc13fca8d394691 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
-        9f340031dada0fc1168826e25c283e56 \
-        5134162b34de0aa912c0d64754ca8370 \
-        49c10b8e144e01a6985a3c1e6f7ccd47 \
-        b1cace2e0c87bbbf5753996e28016787 \
-        62d2d20578e2fa58f97a258b6023ffb0 \
-        e4e7efe2ab7921499d5c247a349e9e1f \
-        c86e7fb900b268f9c291e167300bad22 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        d2cc4e584ed64165fc56d2c9081eb3ee \
+        42408be0352a76b14f1e77a6b8858a77 \
+        e16bb0d9c46839fbf5d1a69673b00c4c \
+        6ec70075835fed0250bc4407f32d5928 \
+        f024ce4a4f4ff7326d9bbe3039017081 \
+        540180a044c1a83c751915586ee3a81c \
+        ae34124843bda798c5e387a28ad4b5ea \
+        a7bf8d2fe33b8dd1cad14d9f6bd19a7f \
+        1a3070ee58d2d21cb6adaacc71ff27cd \
+        e1b37f2526a1f0eed9c0bda62b8095ba \
+        3268d0bb1ba1e9a04ef5d70ceec8cef0 \
+        8e320697cbdcd4b294e671888e746131 \
         781d4ccf5d04c98fa02af207a9639249 \
-        340f92fe45f0eb5766d679252e9acc42 \
-        8a227260b1b37a3672254267d22cb1e6 \
-        3952fefecfe4ffc02f2ef1c75c14ca5e \
-        918b2d65f7489e154483e3d6e54118a0 \
-        adf9d2250c2a622c6274514e38d1f559 \
-        62e883807a65ebe1ba9d0e555d703339 \
-        d6055ba17c6af208b467e970ff5dba61 \
+        c72a927acc4cc7695ae9c73c19964a6f \
+        4417301f71d3f8408073b0c5dad21697 \
+        0c6cfebb3f8a7b21c76e30d7a59c9fdb \
+        6e328718765f2352dd34f10215488fbb \
+        73d602cc41e3e431bf4fabd129ae1616 \
+        62a72aa48fde11aa7b0daf7788009ca5 \
         a8de006fe0c7e373c560dd51599287a8 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
+        b5e95a9fbe4c8fa6b1cee73db0aca22c \
+        85e9f0e4567eafc985f4f4375bf383a6 \
+        36f6470713fffe6b98b6f457c2d2c299 \
+        f7d6a4f32f22507c694dd2f2251076aa \
+        7bfcad253aff26bc26c5e3521f3ba891 \
         8f1da9ba3b7b793efa8a39a159d06035 \
-        a76d0cc8c803a8aa69d82f7caeb731f0 \
         6cae4969689ecc3b4b4c31a9fb9539a6 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
-        3d394ff298f20e04de3ce053ab63ccc7 \
-        f4c4adefa5c5303bea99f622785de3b4 \
-        0f65fd26370e1fd67c8e8812cabea574 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        e628ca8adb2b572bffb210f014656b6f \
-        32f0ced8a8881d2c0572b879bf15b91e \
-        81821d39675a1f584546b9920e5d6b5d \
-        aab44b0dae2fc434c7b1f119ffb100b9 \
-        0eedbc32447f40b3045d6de3910b5415 \
-        f48add3d6234e8b9829fa5364509f425 \
-        0d6976e8a1a1e69abc8ba8f6966cddb8 \
+        9acda194d3610e7d42e09b6de24c717a \
+        4272c279b06b88f8b0ffce7109348e27 \
+        a51c43692084979295641a7ffba4b297 \
+        5d5167f36e5fb271a426dfead24427fc \
+        2b19b51b60f46edd8f7826a3e8be2de9 \
+        e17e2583e10c6947982de78aeae42a5c \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        8b01b016a9b6deebc1b43f296057efb5 \
+        6708629acf3d2ecb7404e43255d2df85 \
         1092a4a24e80f8856efc71af51a06114 \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        d450112d50444f81cefdfe58cc81d6e4 \
-        3d22a85b3b4e148b630e02d33bd86f8d \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        ce68e06a2cd4f180747cf169fc388a95 \
-        c900e7dbce808ff8ced375077b17a163 \
+        a061ad1db3e0d839725b037ff8be84e7 \
+        95491f9095e26cbd501d6aadc7322e1c \
+        0498c4a11448bfc35dc7bb2caa64c753 \
         db96b50050277bf05a3c68534bbb9586 \
-        050f25d04677ff1a36ebdec55ea9df23 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
-        9039399ab9632e189ce70d8008011d34 \
-        0541629539c6bf2359a81746df61d841"
+        c78fded8bcf586e5b389e3366d55f9c0 \
+        331d07cdd036d528ede2f69c7ff0beb6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/binfmt-support/binfmt-support.SlackBuild b/system/binfmt-support/binfmt-support.SlackBuild
index 3471378594..b60ef0d36d 100644
--- a/system/binfmt-support/binfmt-support.SlackBuild
+++ b/system/binfmt-support/binfmt-support.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for binfmt-support
 
-# Copyright 2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=binfmt-support
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/binfmt-support/binfmt-support.info b/system/binfmt-support/binfmt-support.info
index 37201e7fb5..bf6c570f5a 100644
--- a/system/binfmt-support/binfmt-support.info
+++ b/system/binfmt-support/binfmt-support.info
@@ -1,8 +1,8 @@
 PRGNAM="binfmt-support"
-VERSION="2.2.0"
+VERSION="2.2.1"
 HOMEPAGE="http://binfmt-support.nongnu.org/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_2.2.0.orig.tar.gz"
-MD5SUM="94e715eb371f0b8823cd7a24692cda20"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_2.2.1.orig.tar.gz"
+MD5SUM="c62b74a8862575f321f8c1ef3e4b8a2e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="man-db"
diff --git a/system/bleachbit/bleachbit.SlackBuild b/system/bleachbit/bleachbit.SlackBuild
index 9187f56bd5..5309956821 100644
--- a/system/bleachbit/bleachbit.SlackBuild
+++ b/system/bleachbit/bleachbit.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for bleachbit
 #
 # Copyright 2013-2018  Erwin van Zanten, Dordrecht, The Netherlands, Europe
-# Copyright 2018-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bleachbit
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-4.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,9 +70,6 @@ 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 {} \;
 
-# Exclude the Windows-only cleaners from the source per author's instructions.
-grep -l os=.windows. cleaners/*xml | xargs rm -f
-
 make
 make install DESTDIR=$PKG prefix=/usr
 
@@ -80,7 +77,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
-cp CONTRIBUTING.md COPYING README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp COPYING README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/bleachbit/bleachbit.info b/system/bleachbit/bleachbit.info
index bc9c1ee766..b2b644d918 100644
--- a/system/bleachbit/bleachbit.info
+++ b/system/bleachbit/bleachbit.info
@@ -1,8 +1,8 @@
 PRGNAM="bleachbit"
-VERSION="4.1.0"
+VERSION="4.2.0"
 HOMEPAGE="https://www.bleachbit.org/"
-DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v4.1.0/bleachbit-4.1.0.tar.gz"
-MD5SUM="7042e01ee1ebdffcd5107ce92e068077"
+DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v4.2.0/bleachbit-4.2.0.tar.gz"
+MD5SUM="39856abb5f3a0bdadf83b07609bed3e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygobject3-python3"
diff --git a/system/bonnie++/bonnie++.SlackBuild b/system/bonnie++/bonnie++.SlackBuild
index fe1243f8bb..b9c011e052 100644
--- a/system/bonnie++/bonnie++.SlackBuild
+++ b/system/bonnie++/bonnie++.SlackBuild
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 # Slackware build script for bonnie++
-# Written by Vincent Batts, vbatts@batts.mine.nu
+# Written by Vincent Batts <vbatts@hashbangbash.com>
 # Modified by Michiel van Wessem <michiel@slackbuils.org>
 
 PRGNAM=bonnie++
-VERSION=${VERSION:-1.03e}
+VERSION=${VERSION:-1.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/bonnie++/bonnie++.info b/system/bonnie++/bonnie++.info
index cc63a14cc4..620997acb5 100644
--- a/system/bonnie++/bonnie++.info
+++ b/system/bonnie++/bonnie++.info
@@ -1,8 +1,8 @@
 PRGNAM="bonnie++"
-VERSION="1.03e"
+VERSION="1.04"
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
-DOWNLOAD="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
-MD5SUM="750aa5b5051263a99c6c195888c74968"
+DOWNLOAD="http://www.coker.com.au/bonnie++/bonnie++_1.04.tgz"
+MD5SUM="1414aab86e2db1b4691bd4be82031012"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/btrbk/README b/system/btrbk/README
index 76bff1ea52..6e1e0c0835 100644
--- a/system/btrbk/README
+++ b/system/btrbk/README
@@ -24,5 +24,5 @@ Key Features:
 *   Display file changes between two backups
 
 btrbk is designed to run as a cron job for triggering periodic snapshots
-and backups, as well as from the command line (e.g. for instantly creating
-additional snapshots).
+and backups, as well as from the command line (e.g. for instantly
+creating additional snapshots).
diff --git a/system/btrbk/btrbk.SlackBuild b/system/btrbk/btrbk.SlackBuild
index 456319f52e..b6f317e277 100644
--- a/system/btrbk/btrbk.SlackBuild
+++ b/system/btrbk/btrbk.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=btrbk
-VERSION=${VERSION:-0.29.1}
+VERSION=${VERSION:-0.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/btrbk/btrbk.info b/system/btrbk/btrbk.info
index 207a68cbcc..e7725f2fe6 100644
--- a/system/btrbk/btrbk.info
+++ b/system/btrbk/btrbk.info
@@ -1,10 +1,10 @@
 PRGNAM="btrbk"
-VERSION="0.29.1"
+VERSION="0.31.0"
 HOMEPAGE="https://digint.ch/btrbk/"
-DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.29.1.tar.xz"
-MD5SUM="624fb6c9d1e0d3d31f430ebdd3ce3f0f"
+DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.31.0.tar.xz"
+MD5SUM="e6d430a3145d021672f11a2a5dbe05b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="rubygem-asciidoctor"
 MAINTAINER="Alan Aversa"
 EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"
diff --git a/system/cfpeek/README b/system/cfpeek/README
new file mode 100644
index 0000000000..849f86b127
--- /dev/null
+++ b/system/cfpeek/README
@@ -0,0 +1,7 @@
+Cfpeek provides a uniform and consistent command line interface for
+various operations on structured configuration files, such as
+named.conf, .gitconfig, etc.  It can be used to look up and retrieve
+settings, reformat the files and to apply external scripts to them.
+
+Support for Guile extension language is enabled on systems with Guile
+2.2 or newer (slackware-current).
diff --git a/system/cfpeek/cfpeek.SlackBuild b/system/cfpeek/cfpeek.SlackBuild
new file mode 100644
index 0000000000..c9b16c02fb
--- /dev/null
+++ b/system/cfpeek/cfpeek.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for cfpeek
+
+# Copyright 2021 Sergey Poznyakoff <gray@gnu.org>
+# 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=cfpeek
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+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
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/cfpeek/cfpeek.info b/system/cfpeek/cfpeek.info
new file mode 100644
index 0000000000..5769a7f01f
--- /dev/null
+++ b/system/cfpeek/cfpeek.info
@@ -0,0 +1,10 @@
+PRGNAM="cfpeek"
+VERSION="1.2"
+HOMEPAGE="https://www.gnu.org.ua/software/cfpeek/"
+DOWNLOAD="http://download.gnu.org.ua/pub/release/cfpeek/cfpeek-1.2.tar.gz"
+MD5SUM="b9f112fd9e3376c1ee46ff7f5c61853f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Sergey Poznyakoff"
+EMAIL="gray@gnu.org"
diff --git a/system/cfpeek/slack-desc b/system/cfpeek/slack-desc
new file mode 100644
index 0000000000..bdf9575ea8
--- /dev/null
+++ b/system/cfpeek/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+cfpeek: cfpeek (Command line processor for structured configuration files)
+cfpeek:
+cfpeek: Cfpeek provides a uniform and consistent command line interface for
+cfpeek: various operations on structured configuration files, such as
+cfpeek: named.conf, .gitconfig, etc. It can be used to look up and retrieve
+cfpeek: settings, reformat the files and to apply external scripts to them.
+cfpeek:
+cfpeek: Cfpeek is a handy tool for use in scripting.
+cfpeek:
+cfpeek: Homepage: https://puszcza.gnu.org.ua/projects/cfpeek
+cfpeek:
diff --git a/system/chkrootkit/README b/system/chkrootkit/README
index 31c9fa8506..0ea9bf08e8 100644
--- a/system/chkrootkit/README
+++ b/system/chkrootkit/README
@@ -1,16 +1,17 @@
-chkrootkit (Check Rootkit) is a common unix-based program intended to help 
-system administrators check their system for known rootkits. It is a shell 
-script using common UNIX/Linux tools like the strings and grep commands to 
-search core system programs for signatures and for comparing a traversal of the 
-/proc filesystem with the output of the ps (process status) command to look for 
-discrepancies.
+chkrootkit (Check Rootkit) is a common unix-based program intended to
+help system administrators check their system for known rootkits. It is
+a shell script using common UNIX/Linux tools like the strings and grep
+commands to search core system programs for signatures and for comparing
+a traversal of the /proc filesystem with the output of the ps (process
+status) command to look for discrepancies.
 
-It can be used from a "rescue disc" (typically a LiveCD) or it can optionally 
-use an alternative directory from which to run all of its own commands. These 
-techniques allow chkrootkit to trust the commands upon which it depends a bit 
-more.
+It can be used from a "rescue disc" (typically a LiveCD) or it can
+optionally use an alternative directory from which to run all of its own
+commands. These techniques allow chkrootkit to trust the commands upon
+which it depends a bit more.
 
-There are inherent limitations to the reliability of any program that attempts 
-to detect compromises (such as rootkits and computer viruses). Newer rootkits 
-may specifically attempt to detect and compromise copies of the chkrootkit 
-programs or take other measures to evade detection by them.
+There are inherent limitations to the reliability of any program that
+attempts to detect compromises (such as rootkits and computer viruses).
+Newer rootkits may specifically attempt to detect and compromise copies
+of the chkrootkit programs or take other measures to evade detection by
+them.
diff --git a/system/chkrootkit/chkrootkit.SlackBuild b/system/chkrootkit/chkrootkit.SlackBuild
index ae695b2ce1..73fba3775a 100644
--- a/system/chkrootkit/chkrootkit.SlackBuild
+++ b/system/chkrootkit/chkrootkit.SlackBuild
@@ -22,10 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated by Emmanuel N. Millan 2020
+# Updated by Emmanuel N. Millan 2020-2021
 
 PRGNAM=chkrootkit
-VERSION=${VERSION:-0.53}
+VERSION=${VERSION:-0.54}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/chkrootkit/chkrootkit.info b/system/chkrootkit/chkrootkit.info
index e5ce8bb1ab..f70ed2dba7 100644
--- a/system/chkrootkit/chkrootkit.info
+++ b/system/chkrootkit/chkrootkit.info
@@ -1,8 +1,8 @@
 PRGNAM="chkrootkit"
-VERSION="0.53"
+VERSION="0.54"
 HOMEPAGE="http://www.chkrootkit.org"
-DOWNLOAD="ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.53.tar.gz"
-MD5SUM="944c529c4846960bdede4be49ef66386"
+DOWNLOAD="ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.54.tar.gz"
+MD5SUM="af81e9b9038019ea53e5d24d34901153"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/chronograf/chronograf.SlackBuild b/system/chronograf/chronograf.SlackBuild
index 927b81efa5..c87bcb4f14 100644
--- a/system/chronograf/chronograf.SlackBuild
+++ b/system/chronograf/chronograf.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=chronograf
-VERSION=${VERSION:-1.8.7}
+VERSION=${VERSION:-1.8.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/chronograf/chronograf.info b/system/chronograf/chronograf.info
index 1163c42863..b8e6183cd4 100644
--- a/system/chronograf/chronograf.info
+++ b/system/chronograf/chronograf.info
@@ -1,10 +1,10 @@
 PRGNAM="chronograf"
-VERSION="1.8.7"
+VERSION="1.8.10"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.7_linux_i386.tar.gz"
-MD5SUM="8b2a07fb121f4eb1f0a5c72049b891f5"
-DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.7_linux_amd64.tar.gz"
-MD5SUM_x86_64="50c7c6782405290e158f0aa9e1f23c70"
+DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.10_linux_i386.tar.gz"
+MD5SUM="7a06e74733b7d7931dc64562940956c2"
+DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.10_linux_amd64.tar.gz"
+MD5SUM_x86_64="29a4e1c6676ab3014c2f7659b62cc8bc"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
 EMAIL="e@dscp.org"
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index 81be8e861f..79be84db92 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com>
-# Copyright (c) 2011-2020 Matteo Bernardini <ponce@slackbuilds.org>
+# Copyright (c) 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
 # No additional license terms added
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.103.0}
+VERSION=${VERSION:-0.103.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -180,7 +180,8 @@ install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav.new
 # init script must still ensure that /var/run/clamav exists
 # and has proper ownership and permissions though
 mkdir -p $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav
-chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav
+chmod 0771 $PKG/var/log/clamav $PKG/var/run/clamav
+chmod 0775 $PKG/var/lib/clamav
 
 # Fixup some ownership and permissions issues
 chown -R root:root $PKG
@@ -189,14 +190,13 @@ if [ "$milter" = "en" ]; then
   chown clamav $PKG/usr/sbin/clamav-milter
   chmod 4700 $PKG/usr/sbin/clamav-milter
 fi
-chmod 0770 $PKG/var/lib/clamav
 touch $PKG/var/lib/clamav/main.cvd $PKG/var/lib/clamav/daily.cvd
 chmod 0660 $PKG/var/lib/clamav/*
 
 # Create log files in such a way that they won't clobber existing ones
 touch $PKG/var/log/clamav/clamd.log.new \
   $PKG/var/log/clamav/freshclam.log.new
-chmod 660 $PKG/var/log/clamav/clamd.log.new \
+chmod 0660 $PKG/var/log/clamav/clamd.log.new \
   $PKG/var/log/clamav/freshclam.log.new
 
 chown -R clamav:clamav $PKG/var/lib/clamav $PKG/var/log/clamav \
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index f150d40c4a..3e4a74944f 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,8 +1,8 @@
 PRGNAM="clamav"
-VERSION="0.103.0"
+VERSION="0.103.2"
 HOMEPAGE="https://www.clamav.net/"
-DOWNLOAD="https://www.clamav.net/downloads/production/clamav-0.103.0.tar.gz"
-MD5SUM="453a389e0147b5df8fae5601b390d7db"
+DOWNLOAD="https://www.clamav.net/downloads/production/clamav-0.103.2.tar.gz"
+MD5SUM="508e6988e2937985e702cc3a2202b6e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/colorize/README b/system/colorize/README
new file mode 100644
index 0000000000..51221064f1
--- /dev/null
+++ b/system/colorize/README
@@ -0,0 +1,6 @@
+colorize (colorize text on terminal)
+
+Colorize aims at being a small, independent and handy command-line
+text colorizing tool. It emits ANSI escape sequences in order to color
+lines of text; also, sequences emitted by colorize or foreign programs
+may be cleared.
diff --git a/system/colorize/colorize.SlackBuild b/system/colorize/colorize.SlackBuild
new file mode 100644
index 0000000000..0bb6b9d8b4
--- /dev/null
+++ b/system/colorize/colorize.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for colorize
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=colorize
+VERSION=${VERSION:-0.65}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make CFLAGS="$SLKCFLAGS"
+
+# disable tests by default
+[ "${CHECK:-no}" = "yes" ] && make check
+
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+install -s -m0755 $PRGNAM $PKG/usr/bin
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS* COPYING* HACKING* README* TODO* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/colorize/colorize.info b/system/colorize/colorize.info
new file mode 100644
index 0000000000..2643a9c7fe
--- /dev/null
+++ b/system/colorize/colorize.info
@@ -0,0 +1,10 @@
+PRGNAM="colorize"
+VERSION="0.65"
+HOMEPAGE="http://cgit.refcnt.org/colorize.git/tree/README"
+DOWNLOAD="http://cgit.refcnt.org/colorize.git/snapshot/colorize-0.65.tar.bz2"
+MD5SUM="4ebbe5fd92ac1f69ce73ba4d6a0cbc78"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/colorize/slack-desc b/system/colorize/slack-desc
new file mode 100644
index 0000000000..276034c426
--- /dev/null
+++ b/system/colorize/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+colorize: colorize (colorize text on terminal)
+colorize:
+colorize: Colorize aims at being a small, independent and handy command-line
+colorize: text colorizing tool. It emits ANSI escape sequences in order to color
+colorize: lines of text; also, sequences emitted by colorize or foreign programs
+colorize: may be cleared.
+colorize:
+colorize:
+colorize:
+colorize:
+colorize:
diff --git a/system/compsize/README b/system/compsize/README
index e930f6fe83..558075e74d 100644
--- a/system/compsize/README
+++ b/system/compsize/README
@@ -1,6 +1,6 @@
-compsize takes a list of files (given as arguments) on a btrfs filesystem
-and measures used compression types and effective compression ratio,
-producing a report such as:
+compsize takes a list of files (given as arguments) on a btrfs
+filesystem and measures used compression types and effective compression
+ratio, producing a report such as:
 
 [~]$ compsize /usr/share
 Processed 120101 files.
diff --git a/system/compsize/compsize.SlackBuild b/system/compsize/compsize.SlackBuild
index 0d1e7b2f55..bc8aaa229a 100644
--- a/system/compsize/compsize.SlackBuild
+++ b/system/compsize/compsize.SlackBuild
@@ -4,7 +4,7 @@
 # Michales (clavisound) Michaloudes korgie@gmail.com <2017>
 
 PRGNAM=compsize
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/compsize/compsize.info b/system/compsize/compsize.info
index 1ee84575c8..ef7c7a2af2 100644
--- a/system/compsize/compsize.info
+++ b/system/compsize/compsize.info
@@ -1,8 +1,8 @@
 PRGNAM="compsize"
-VERSION="1.2"
+VERSION="1.5"
 HOMEPAGE="https://github.com/kilobyte/compsize"
-DOWNLOAD="https://github.com/kilobyte/compsize/archive/v1.2/compsize-1.2.tar.gz"
-MD5SUM="de6e7b8c9391dd8075fcedf62736d799"
+DOWNLOAD="https://github.com/kilobyte/compsize/archive/v1.5/compsize-1.5.tar.gz"
+MD5SUM="41ded6559cd7d1750e5cf967bf2eae08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/conspy/README b/system/conspy/README
new file mode 100644
index 0000000000..6214505103
--- /dev/null
+++ b/system/conspy/README
@@ -0,0 +1,8 @@
+conspy (take control of a virtual console)
+
+Conspy allows the user to take control of a Linux virtual console.
+The user can see what is displayed on the console and their keystrokes
+are sent to it.
+
+Actually, conspy needs to be run as root, so "the user" above is a bit
+misleading...
diff --git a/system/conspy/conspy.SlackBuild b/system/conspy/conspy.SlackBuild
new file mode 100644
index 0000000000..ed1bb1afbc
--- /dev/null
+++ b/system/conspy/conspy.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Slackware build script for conspy
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=conspy
+VERSION=${VERSION:-1.16}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+autoreconf -if
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt *.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/conspy/conspy.info b/system/conspy/conspy.info
new file mode 100644
index 0000000000..139f0ecb86
--- /dev/null
+++ b/system/conspy/conspy.info
@@ -0,0 +1,10 @@
+PRGNAM="conspy"
+VERSION="1.16"
+HOMEPAGE="http://conspy.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/conspy/conspy-1.16-1/conspy-1.16.tar.gz"
+MD5SUM="c5ab86215e27a418f220d853b6ebf6d4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/conspy/slack-desc b/system/conspy/slack-desc
new file mode 100644
index 0000000000..551226aa69
--- /dev/null
+++ b/system/conspy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+conspy: conspy (take control of a virtual console)
+conspy:
+conspy: Conspy allows the user to take control of a Linux virtual console.
+conspy: The user can see what is displayed on the console and their keystrokes
+conspy: are sent to it.
+conspy:
+conspy:
+conspy:
+conspy:
+conspy:
+conspy:
diff --git a/system/containerd/containerd.SlackBuild b/system/containerd/containerd.SlackBuild
index 5dc874323b..934a17ad35 100644
--- a/system/containerd/containerd.SlackBuild
+++ b/system/containerd/containerd.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for containerd
 
 # Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il>
-# Copyright 2017-2020 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=containerd
-VERSION=${VERSION:-1.2.13}
-GITHASH=${GITHASH:-7ad184331fa3e55e52b890ea95e65ba581ae3429}
+VERSION=${VERSION:-1.4.3}
+GITHASH=${GITHASH:-269548fa27e0089a8b8278fc4fc781d7f65a939b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,13 +71,7 @@ make \
   BUILDTAGS="seccomp" \
   GIT_COMMIT=$GITHASH \
   GOPATH=$TMP/$PRGNAM-$VERSION/build
-
-# Install executables.
-install -D -m 0755 bin/containerd $PKG/usr/bin/containerd
-install -D -m 0755 bin/containerd-shim $PKG/usr/bin/containerd-shim
-install -D -m 0755 bin/containerd-shim-runc-v1 $PKG/usr/bin/containerd-shim-runc-v1
-install -D -m 0755 bin/containerd-stress $PKG/usr/bin/containerd-stress
-install -D -m 0755 bin/ctr $PKG/usr/bin/ctr
+make install DESTDIR=$PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md LICENSE NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/containerd/containerd.info b/system/containerd/containerd.info
index e2fd576944..4d93b7af95 100644
--- a/system/containerd/containerd.info
+++ b/system/containerd/containerd.info
@@ -1,10 +1,10 @@
 PRGNAM="containerd"
-VERSION="1.2.13"
+VERSION="1.4.3"
 HOMEPAGE="https://containerd.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.2.13/containerd-1.2.13.tar.gz"
-MD5SUM_x86_64="be00b9a21903a6ccc9ec61a673f5ea28"
+DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.4.3/containerd-1.4.3.tar.gz"
+MD5SUM_x86_64="8b0201fa609d511ad01fd52d5b544fe7"
 REQUIRES="runc"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/cpmtools/README b/system/cpmtools/README
index b431569eb3..114bf0853b 100644
--- a/system/cpmtools/README
+++ b/system/cpmtools/README
@@ -1,4 +1,4 @@
 cpmtools (access CP/M filesystem images or floppies)
 
 cpmtools accesses CP/M file systems. It's similar to the well-known
-mtools package (which accesses MSDOS file systems).
+mtools package (which accesses MS-DOS file systems).
diff --git a/system/cpmtools/cpmtools.SlackBuild b/system/cpmtools/cpmtools.SlackBuild
index 81265004e5..0a34b57dd3 100644
--- a/system/cpmtools/cpmtools.SlackBuild
+++ b/system/cpmtools/cpmtools.SlackBuild
@@ -6,8 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201102 bkw:
+# - Updated for v2.21. Can't build older versions, sorry.
+# - Switch to freebsd distfile source, as upstream vanishes the old
+#   source immediately upon a new release.
+
 PRGNAM=cpmtools
-VERSION=${VERSION:-2.20}
+VERSION=${VERSION:-2.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,11 +52,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -64,19 +66,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make
-# make install fails to create these. Grr.
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/man/man5 $PKG/usr/share
-
-# really old configure script, no DESTDIR support. "autoreconf -fi" fails
-# to build a new configure script, too.
-make install prefix=$PKG/usr exec_prefix=$PKG/usr MANDIR=$PKG/usr/man
-
-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
+# 'make install' fails to create this:
+mkdir -p $PKG/usr/share/diskdefs
 
-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
+make install DESTDIR=$PKG # binaries already stripped, yay!
+gzip $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README NEWS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/cpmtools/cpmtools.info b/system/cpmtools/cpmtools.info
index 57187fab70..8777c5480b 100644
--- a/system/cpmtools/cpmtools.info
+++ b/system/cpmtools/cpmtools.info
@@ -1,8 +1,8 @@
 PRGNAM="cpmtools"
-VERSION="2.20"
+VERSION="2.21"
 HOMEPAGE="http://www.moria.de/~michael/cpmtools/"
-DOWNLOAD="http://www.moria.de/~michael/cpmtools/files/cpmtools-2.20.tar.gz"
-MD5SUM="675dd715c93469330833c8b67abadcda"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/cpmtools-2.21.tar.gz"
+MD5SUM="b250cbcc09a0ca6fbdf850653f5f3e1f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ded/ded.SlackBuild b/system/ded/ded.SlackBuild
index 281f6df10c..ca200877e3 100644
--- a/system/ded/ded.SlackBuild
+++ b/system/ded/ded.SlackBuild
@@ -10,6 +10,9 @@
 # This build script was written from scratch for 14.1, without referring
 # to the old script.
 
+# 20210220 bkw: updated for 20210110. get rid of configure patch, found
+#               a better way to disable the long filename test.
+# 20200111 bkw: updated for 20200428 release
 # 20200111 bkw: updated for 20191226 release
 # 20180915 bkw: updated for 20180324 release
 
@@ -25,7 +28,7 @@
 # - added td_lib docs in /usr/doc
 
 PRGNAM=ded
-VERSION=${VERSION:-20191226}
+VERSION=${VERSION:-20210110}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,10 +83,13 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 # "checking for long filenames" wants to create files in /usr/lib and
 # /var/lib. Violates the principle of least surprise: users don't expect
 # configure scripts (or SlackBuilds) to touch their system directories.
-patch -p1 < $CWD/td_lib_no_write_usr.diff
 
-# NB: the -j1's are necessary, even on 'make install'.
+# This *should* work, but doesn't, I guess because configure.in is too old.
+#sed -i '/^AC_SYS_LONG_FILE_NAMES/d' configure.in
+#autoreconf -i
 
+# It turns out we can force it in the environment.
+ac_cv_sys_long_file_names="set" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -94,6 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
+# NB: the -j1's are necessary, even on 'make install'.
 make -j1
 
 # actually, don't really need to make install, ded's configure will find
diff --git a/system/ded/ded.info b/system/ded/ded.info
index baf5b2b7c1..009d0a2485 100644
--- a/system/ded/ded.info
+++ b/system/ded/ded.info
@@ -1,10 +1,10 @@
 PRGNAM="ded"
-VERSION="20191226"
+VERSION="20210110"
 HOMEPAGE="http://invisible-island.net/ded/"
-DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20191226.tgz \
-          http://invisible-mirror.net/archives/ded/td_lib-20191226.tgz"
-MD5SUM="6fc626edcc918a5b888b69adf537a755 \
-        05b5d3f2971725a6d3473b5e03d127ec"
+DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20210110.tgz \
+          http://invisible-mirror.net/archives/ded/td_lib-20210110.tgz"
+MD5SUM="80a03899f46fe64179d824f65ed1491b \
+        71a71fb677e480e293dc7907df23b70b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ded/td_lib_no_write_usr.diff b/system/ded/td_lib_no_write_usr.diff
deleted file mode 100644
index 455b1a85bf..0000000000
--- a/system/ded/td_lib_no_write_usr.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur td_lib-20150704/configure td_lib-20150704.patched/configure
---- td_lib-20150704/configure	2015-07-04 11:20:27.000000000 -0400
-+++ td_lib-20150704.patched/configure	2017-03-05 11:29:40.888486013 -0500
-@@ -5031,7 +5031,7 @@
- else
-   ac_tmpdirs='/tmp /var/tmp /usr/tmp'
- fi
--for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-+for ac_dir in  . $ac_tmpdirs  ; do
-   test -d $ac_dir || continue
-   test -w $ac_dir || continue # It is less confusing to not echo anything here.
-   ac_xdir=$ac_dir/cf$$
diff --git a/system/dfu-util/dfu-util.SlackBuild b/system/dfu-util/dfu-util.SlackBuild
index 890878e1f8..056010437e 100644
--- a/system/dfu-util/dfu-util.SlackBuild
+++ b/system/dfu-util/dfu-util.SlackBuild
@@ -1,10 +1,10 @@
 #!/bin/sh
 # Slackware build script for dfu-util
 # Written by Damien Durand <splinux25@gmail.com>
-# 2018 Maintained by Christoph Willing <chris.willing@linux.com>
+# From 2018, maintained by Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=dfu-util
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dfu-util/dfu-util.info b/system/dfu-util/dfu-util.info
index a710e848d6..ecd8609d4e 100644
--- a/system/dfu-util/dfu-util.info
+++ b/system/dfu-util/dfu-util.info
@@ -1,8 +1,8 @@
 PRGNAM="dfu-util"
-VERSION="0.9"
+VERSION="0.10"
 HOMEPAGE="http://dfu-util.gnumonks.org"
-DOWNLOAD="http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz"
-MD5SUM="233bb1e08ef4b405062445d84e28fde6"
+DOWNLOAD="http://dfu-util.sourceforge.net/releases/dfu-util-0.10.tar.gz"
+MD5SUM="8cf55663703cdc6b40f377f999eb8d3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dget/dget.SlackBuild b/system/dget/dget.SlackBuild
index de795e47d8..020bd65d4b 100644
--- a/system/dget/dget.SlackBuild
+++ b/system/dget/dget.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for dget.
 #
-# Copyright 2018-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dget
-VERSION=${VERSION:-2.20.4}
+VERSION=${VERSION:-2.20.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dget/dget.info b/system/dget/dget.info
index e161fc317a..f2c54ec3b9 100644
--- a/system/dget/dget.info
+++ b/system/dget/dget.info
@@ -1,10 +1,10 @@
 PRGNAM="dget"
-VERSION="2.20.4"
+VERSION="2.20.5"
 HOMEPAGE="https://goo.gl/mr1Uz3"
-DOWNLOAD="https://snapshot.debian.org/archive/debian/20201015T090243Z/pool/main/d/devscripts/devscripts_2.20.4_i386.deb"
-MD5SUM="576063a89e9784384fbb6709705868c5"
-DOWNLOAD_x86_64="https://snapshot.debian.org/archive/debian/20201015T090243Z/pool/main/d/devscripts/devscripts_2.20.4_amd64.deb"
-MD5SUM_x86_64="762264bb326a9e3164fe0ec00a680d48"
+DOWNLOAD="http://http.us.debian.org/debian/pool/main/d/devscripts/devscripts_2.20.5_i386.deb"
+MD5SUM="064723c6fac020a141c0990c2e70c218"
+DOWNLOAD_x86_64="http://http.us.debian.org/debian/pool/main/d/devscripts/devscripts_2.20.5_amd64.deb"
+MD5SUM_x86_64="cf5cb14bfc90c75cc91772e2436f6c9e"
 REQUIRES="dpkg"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/docker-cli/README b/system/docker-cli/README
new file mode 100644
index 0000000000..d22fbf077f
--- /dev/null
+++ b/system/docker-cli/README
@@ -0,0 +1 @@
+Command line tool for Docker engine.
diff --git a/system/docker-cli/docker-cli.SlackBuild b/system/docker-cli/docker-cli.SlackBuild
new file mode 100644
index 0000000000..b6451ec6fe
--- /dev/null
+++ b/system/docker-cli/docker-cli.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for docker-cli
+
+# Copyright 2021 Audrius Kažukauskas <audrius@neutrino.lt>
+# 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=docker-cli
+VERSION=${VERSION:-20.10.2}
+GITHASH=${GITHASH:-2291f61}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=cli
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+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
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir build
+mv vendor build/src
+ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/cli
+
+DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+make dynbinary \
+  GITCOMMIT=$GITHASH \
+  VERSION=$VERSION \
+  GOPATH=$TMP/$SRCNAM-$VERSION/build
+
+install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker
+
+# Completion.
+( cd contrib/completion
+  install -D -m 0644 bash/docker $PKG/usr/share/bash-completion/completions/docker
+  install -D -m 0644 zsh/_docker $PKG/usr/share/zsh/site-functions/_docker
+  install -D -m 0644 fish/docker.fish $PKG/usr/share/fish/vendor_completions.d/docker.fish
+)
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NOTICE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/docker-cli/docker-cli.info b/system/docker-cli/docker-cli.info
new file mode 100644
index 0000000000..e004f9f2b5
--- /dev/null
+++ b/system/docker-cli/docker-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="docker-cli"
+VERSION="20.10.2"
+HOMEPAGE="https://www.docker.com/products/container-runtime"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/docker/cli/archive/v20.10.2/cli-20.10.2.tar.gz"
+MD5SUM_x86_64="b3e97ba282605d0c511d394d7a7be3b4"
+REQUIRES="docker"
+MAINTAINER="Audrius Kažukauskas"
+EMAIL="audrius@neutrino.lt"
diff --git a/system/docker-cli/slack-desc b/system/docker-cli/slack-desc
new file mode 100644
index 0000000000..944f01ec27
--- /dev/null
+++ b/system/docker-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+docker-cli: docker-cli (command line tool for Docker engine)
+docker-cli:
+docker-cli: Docker is an open-source project to easily create lightweight,
+docker-cli: portable, self-sufficient containers from any application.  The same
+docker-cli: container that a developer builds and tests on a laptop can run at
+docker-cli: scale, in production, on VMs, bare metal, OpenStack clusters, public
+docker-cli: clouds and more.
+docker-cli:
+docker-cli: Homepage: https://www.docker.com/products/container-runtime
+docker-cli:
+docker-cli:
diff --git a/system/docker-proxy/docker-proxy.SlackBuild b/system/docker-proxy/docker-proxy.SlackBuild
index 049910676b..ee04af839e 100644
--- a/system/docker-proxy/docker-proxy.SlackBuild
+++ b/system/docker-proxy/docker-proxy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for docker-proxy
 
-# Copyright 2017-2020 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=docker-proxy
-VERSION=${VERSION:-20200102_9fd385b}
-GITHASH=${GITHASH:-9fd385be8302dbe1071a3ce124891893ff27f90f}
+VERSION=${VERSION:-20201215_fa125a3}
+GITHASH=${GITHASH:-fa125a3512ee0f6187721c88582bf8c4378bd4d7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/docker-proxy/docker-proxy.info b/system/docker-proxy/docker-proxy.info
index 2388374770..6329993d4c 100644
--- a/system/docker-proxy/docker-proxy.info
+++ b/system/docker-proxy/docker-proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="docker-proxy"
-VERSION="20200102_9fd385b"
+VERSION="20201215_fa125a3"
 HOMEPAGE="https://github.com/moby/libnetwork"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/moby/libnetwork/archive/9fd385b/libnetwork-9fd385be8302dbe1071a3ce124891893ff27f90f.tar.gz"
-MD5SUM_x86_64="01edf8891f46aa4306b32f41732dc39f"
+DOWNLOAD_x86_64="https://github.com/moby/libnetwork/archive/fa125a3/libnetwork-fa125a3512ee0f6187721c88582bf8c4378bd4d7.tar.gz"
+MD5SUM_x86_64="0fa46e48ffcf64148df15a0739c06df4"
 REQUIRES="google-go-lang"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index 7facf93ef6..c6631b2487 100644
--- a/system/docker/docker.SlackBuild
+++ b/system/docker/docker.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for docker
 
 # Copyright 2014-2015 Vincent Batts <vbatts@hashbangbash.com>
-# Copyright 2017-2020 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=docker
-VERSION=${VERSION:-19.03.8}
-GITHASH=${GITHASH:-afacb8b}
+VERSION=${VERSION:-20.10.2}
+GITHASH=${GITHASH:-8891c58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=$PRGNAM-ce
+SRCNAM=moby
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -59,34 +59,18 @@ 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 {} \;
 
-mkdir -p build/src/github.com/docker
-( cd build/src/github.com/docker
-  ln -s $TMP/$SRCNAM-$VERSION/components/engine docker
-  ln -s $TMP/$SRCNAM-$VERSION/components/cli cli
-)
-
-# Build daemon.
-cd components/engine
-  DOCKER_GITCOMMIT=$GITHASH \
-  DOCKER_BUILDTAGS="seccomp" \
-  VERSION=$(cat ../../VERSION) \
-  GOPATH=$TMP/$SRCNAM-$VERSION/build \
-  ./hack/make.sh dynbinary
-
-  install -D -m 0755 bundles/dynbinary-daemon/dockerd-$VERSION \
-    $PKG/usr/bin/dockerd
-cd -
-
-# Build CLI.
-cd components/cli
-  DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-  make dynbinary \
-    GITCOMMIT=$GITHASH \
-    VERSION=$(cat ../../VERSION) \
-    GOPATH=$TMP/$SRCNAM-$VERSION/build
-
-  install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker
-cd -
+mkdir build
+mv vendor build/src
+ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/docker
+
+DOCKER_GITCOMMIT=$GITHASH \
+DOCKER_BUILDTAGS="seccomp" \
+VERSION=$VERSION \
+GOPATH=$TMP/$SRCNAM-$VERSION/build \
+./hack/make.sh dynbinary
+
+install -D -m 0755 bundles/dynbinary-daemon/dockerd-$VERSION \
+  $PKG/usr/bin/dockerd
 
 # Integrate required components.
 ln -s runc $PKG/usr/bin/docker-runc
@@ -95,25 +79,16 @@ ln -s containerd-shim $PKG/usr/bin/docker-containerd-shim
 ln -s ctr $PKG/usr/bin/docker-containerd-ctr
 ln -s tini-static $PKG/usr/bin/docker-init
 
-# Completion.
-( cd components/cli/contrib/completion
-  install -D -m 0644 bash/docker $PKG/usr/share/bash-completion/completions/docker
-  install -D -m 0644 zsh/_docker $PKG/usr/share/zsh/site-functions/_docker
-  install -D -m 0644 fish/docker.fish $PKG/usr/share/fish/vendor_completions.d/docker.fish
-)
-
 install -D -m 0644 $CWD/config/docker.default $PKG/etc/default/docker.new
 install -D -m 0644 $CWD/config/docker.logrotate $PKG/etc/logrotate.d/docker.new
 install -D -m 0644 $CWD/config/rc.docker $PKG/etc/rc.d/rc.docker.new
 
 # Install udev rules.
-install -D -m 0644 components/engine/contrib/udev/80-docker.rules \
+install -D -m 0644 contrib/udev/80-docker.rules \
   $PKG/lib/udev/rules.d/80-docker.rules
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGELOG.md components/engine/LICENSE components/engine/NOTICE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NOTICE 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/system/docker/docker.info b/system/docker/docker.info
index 47886a157c..caf6c4c8b8 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,10 +1,10 @@
 PRGNAM="docker"
-VERSION="19.03.8"
+VERSION="20.10.2"
 HOMEPAGE="https://www.docker.com/products/container-runtime"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/docker/docker-ce/archive/v19.03.8/docker-ce-19.03.8.tar.gz"
-MD5SUM_x86_64="529b9e0767146ba03b6fda5833b5e1f6"
+DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.2/moby-20.10.2.tar.gz"
+MD5SUM_x86_64="4a1025fd2affef73fb32e863ff6873bd"
 REQUIRES="containerd docker-proxy tini"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/dosbox-dev/dosbox-dev.SlackBuild b/system/dosbox-dev/dosbox-dev.SlackBuild
index c6e59c1227..5ef88a37ec 100644
--- a/system/dosbox-dev/dosbox-dev.SlackBuild
+++ b/system/dosbox-dev/dosbox-dev.SlackBuild
@@ -26,8 +26,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dosbox-dev
-REVISION=${REVISION:-4358}
-VERSION=${VERSION:-0.75_pre4358}
+REVISION=${REVISION:-4441}
+VERSION=${VERSION:-0.75_pre4441}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 DOSBOXDEV=${DOSBOXDEV:-no}
diff --git a/system/dosbox-dev/dosbox-dev.info b/system/dosbox-dev/dosbox-dev.info
index 0f112a8aa3..7c9ee5d64b 100644
--- a/system/dosbox-dev/dosbox-dev.info
+++ b/system/dosbox-dev/dosbox-dev.info
@@ -1,8 +1,8 @@
 PRGNAM="dosbox-dev"
-VERSION="0.75_pre4358"
+VERSION="0.75_pre4441"
 HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4358.tar.xz"
-MD5SUM="52bcd0869d402639c10773289c7b8f0f"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4441.tar.xz"
+MD5SUM="885571b284da48fb563161bb8da4abbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dosbox-x/dosbox-x.info b/system/dosbox-x/dosbox-x.info
index fb46598a55..0b95690601 100644
--- a/system/dosbox-x/dosbox-x.info
+++ b/system/dosbox-x/dosbox-x.info
@@ -1,7 +1,7 @@
 PRGNAM="dosbox-x"
 VERSION="0.83.2"
 HOMEPAGE="http://dosbox-x.com/"
-DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.2.tar.gz"
+DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.2/dosbox-x-dosbox-x-v0.83.2.tar.gz"
 MD5SUM="3da8a408deaf9518da1423dff8021f53"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/drbd-utils/drbd-utils.SlackBuild b/system/drbd-utils/drbd-utils.SlackBuild
index 74d34e0a5a..e6eeb7f4ae 100644
--- a/system/drbd-utils/drbd-utils.SlackBuild
+++ b/system/drbd-utils/drbd-utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for drbd-utils
 
-# Copyright 2014, 2015, 2016, 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2014, 2015, 2016, 2017, 2018, 2019, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=drbd-utils
-VERSION=${VERSION:-9.8.0}
+VERSION=${VERSION:-9.15.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/drbd-utils/drbd-utils.info b/system/drbd-utils/drbd-utils.info
index 9934ce8b3c..49f7312a95 100644
--- a/system/drbd-utils/drbd-utils.info
+++ b/system/drbd-utils/drbd-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="drbd-utils"
-VERSION="9.8.0"
+VERSION="9.15.1"
 HOMEPAGE="http://www.drbd.org"
-DOWNLOAD="https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.8.0.tar.gz"
-MD5SUM="c9e079504f15e07166de9a3704eb63f5"
+DOWNLOAD="https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz"
+MD5SUM="5ff3c956aab8f022f676455162c91b21"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dust/dust.SlackBuild b/system/dust/dust.SlackBuild
index 1712b992b6..0ff62de60d 100644
--- a/system/dust/dust.SlackBuild
+++ b/system/dust/dust.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dust
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dust
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dust/dust.info b/system/dust/dust.info
index ea1e027c51..3e2a8987e2 100644
--- a/system/dust/dust.info
+++ b/system/dust/dust.info
@@ -1,139 +1,125 @@
 PRGNAM="dust"
-VERSION="0.5.1"
+VERSION="0.5.4"
 HOMEPAGE="https://github.com/bootandy/dust/"
-DOWNLOAD="https://github.com/bootandy/dust/archive/v0.5.1/dust-0.5.1.tar.gz \
+DOWNLOAD="https://github.com/bootandy/dust/archive/v0.5.4/dust-0.5.4.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cli/assert_cli-0.6.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.32.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/c2-chacha/c2-chacha-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.50.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.14.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/colored/colored-1.9.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam/crossbeam-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/environment/environment-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jwalk/jwalk-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/du-dust/du-dust-0.5.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.17.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.66.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.12.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.104.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.47.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.82.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.13.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.22.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stfu8/stfu8-0.2.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thousands/thousands-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/treeline/treeline-0.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.1+wasi-snapshot-preview1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate"
-MD5SUM="ba876e453f31c30ee2994fff958fc5fb \
+MD5SUM="4949eb0c64996079eab79162ab5d2df1 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         f44e8d1d2e61974b268852797530ea41 \
-        7f199920cf3b7727341cae8de60ddc45 \
+        f06a942b7e3e0b3a5eb3fb86dfb27605 \
         142cb4b9a653e56e56311f0c883b8582 \
-        898079c1c795b5aa847169137918c7bc \
-        a97ccbf3cb5f0b2dce19f89d64019266 \
-        8dc7791342326d4c157c5b1e8a211336 \
+        c6443ec8d007c729ba5482008d0c864d \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        a470cd1ad90d21544de1cead32c54307 \
-        9b688de84c233898a6e2492174b3ea26 \
+        0df9d76acda993ef38665e5e254f500c \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        135f6d6306e50606f0475ada50c33ce2 \
-        6a2ba89b844d995f7cd9bfd28e4ef4ce \
-        22ed3b5d9a15917e74e09d7f600b1608 \
-        17208d6f2ad0d920716b2e7ef5e3c75d \
-        7143e7a2ff358eb52c5f7c3b0656685a \
-        70a93b2ff4eb6c23d7119e7f3d241b97 \
-        838338f3d7b79bce56475183ccf76072 \
-        bad68d30eb69cbff26eb1eb6adef6994 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        093c5099d3cef0f418550fe28788d34d \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        9e1f73325eeb9647ee68eeaa4bff975c \
         5e49f4c3f9076fe30ae207fe951f9195 \
-        82241b59d4b793d862900b62220cf05a \
-        85dccd4e066c6af106413425928bc9c1 \
-        de2d3d836fb5c8c6897f2b4e16b65d29 \
-        a2e69999db212f31024f21ae7a62ccec \
-        de1228e571c94ef53ec4c21db57279ab \
-        9c17966c8f18434e9803081edb9d0d05 \
-        493f4bd45cf2a6c3963f66f58884f622 \
-        d0354329449c69e80f77d2c1d9c51cc6 \
+        dd1e49c76e9d5853e673a3b41ba02917 \
+        1e34572c42ac9f55fbf404b5d1437c11 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        41b82342dee92cae37b3b731ad83e5aa \
+        1b94f32581a557963eecb29761e9c0eb \
+        553b325a602b701eb7eaef228e69d0f2 \
+        88b4e3e28ea8527c2b0e7124d6d5766f \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        36ccbe3ad01b8cdf8ae1f0e28568eae5 \
-        540b5e6ca7ac76694986b4ed898589c8 \
-        72471699c92a9ef34d491f1375fc0fa7 \
-        09931e9b99240bb850c9e9c9ccb22668 \
-        7c4bfd315ee9de1c1b2f2d56163567cf \
-        551df04c2ee93802b6fc50fc012ae78c \
-        ad271964ee0641ce512d5ca5ac4f5b41 \
-        66d1cb32dce999907409f636f004b884 \
-        156a171385b476b5a63459398419c803 \
-        a0f55fda89c0f97784edb18f4c253a49 \
-        b269356e8646f3184a0e8d52a58cee69 \
-        85b5b8dfdd530231acb56c39a5f6d275 \
-        0e3401322d8d9c7fa6a93064c9e47669 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        526f5ebac8d794185afbc71959c5c968 \
-        94136c77f70313d3162e031638fc67ed \
-        4d101ab24d14c54937c5f45ece8fad5f \
-        7254eab0007564ebfaaed3a586c9919b \
-        dad6b55e158861f8c4e199d498efe162 \
-        64111c20b69aa1532fb66b70c4660b55 \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        41f86328d71bfca707af1cf7fb14460c \
-        f486433c178bbf808f569c8dd46366d2 \
+        a59d2449c2538c87a5a6aac25e852220 \
+        667d0475d8eb79899b3f511e9acd7c4d \
+        f3373fd861a0066fa446a8ab3dabc749 \
+        b5cf10e268e8a3bee2de8a734104245e \
+        fa3630e5867493e09296155763e4f4a0 \
+        c36d452e37c73b1e99f40bae18cddfdb \
+        a4ff7abd41c57dfd24bbd4b50edb848f \
+        b966c0b76d66f779eb93e0f0a490912a \
+        7cb6e5d606fb3a5987be4e135baea727 \
+        a045d820c7167768e155123b5a985360 \
+        98aea9dd15bb412a38837b668e020e1f \
+        bacea6e63b5b0b7a55a8881b47d80f3a \
+        7514db098d4a8e624178b2732ce3c4ab \
+        69e9436d5c9889a6fdf199dfc5c3d3fe \
+        381ebb79fffdf657a666ee577323039e \
+        26d687e0e0e8b04fafabfcd88f594a53 \
+        bef05db0f0e720c1fd56505850065ae1 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        c58c5d6565be5a35674117b9826795b4 \
         781d4ccf5d04c98fa02af207a9639249 \
-        086919d6dcf1d040b2ab18cdfb6eb876 \
-        bd5f9d9900731be1a4e4df05db231991 \
-        bb3ae104a9fa1b31568cc98c920a4653 \
-        4d07098d47f74f359666e4c29897334d \
+        6e328718765f2352dd34f10215488fbb \
+        a949194aa8c4d54f31bdda76da660982 \
         a8de006fe0c7e373c560dd51599287a8 \
-        0f65fd26370e1fd67c8e8812cabea574 \
-        e628ca8adb2b572bffb210f014656b6f \
-        0eedbc32447f40b3045d6de3910b5415 \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        ce68e06a2cd4f180747cf169fc388a95 \
+        eca4f78f2f4293611dccd41ad47a3be9 \
+        bf8e3f0acd783c8554afb599d7d36817 \
+        8f1da9ba3b7b793efa8a39a159d06035 \
+        4272c279b06b88f8b0ffce7109348e27 \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        6708629acf3d2ecb7404e43255d2df85 \
+        1092a4a24e80f8856efc71af51a06114 \
+        f95e376ec9ce794a747aba5b8ec3d940 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
         db96b50050277bf05a3c68534bbb9586 \
-        050f25d04677ff1a36ebdec55ea9df23 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/epson-inkjet-printer-escpr/README.models b/system/epson-inkjet-printer-escpr/README.models
index 53100c2d8c..b5b5fdb956 100644
--- a/system/epson-inkjet-printer-escpr/README.models
+++ b/system/epson-inkjet-printer-escpr/README.models
@@ -6,71 +6,71 @@ E-500, E-520, E-530, E-530P, E-530S, E-600, E-700, E-720, E-800, E-810,
 E-820, E-830 Series, E-840 Series, E-850 Series, EC-C110 Series, EP-10VA 
 Series, EP-306 Series, EP-30VA Series, EP-4004, EP-702A, EP-703A, 
 EP-704A, EP-705A Series, EP-706A Series, EP-707A Series, EP-708A Series, 
-EP-709A Series, EP-710A Series, EP-711A Series, EP-712A Series, EP-774A, 
-EP-775A Series, EP-776A Series, EP-777A Series, EP-801A, EP-802A, 
-EP-803A, EP-804A, EP-805A Series, EP-806A Series, EP-807A Series, 
-EP-808A Series, EP-810A Series, EP-811A Series, EP-812A Series, EP-901A, 
-EP-901F, EP-902A, EP-903A, EP-903F, EP-904A, EP-904F, EP-905A Series, 
-EP-905F Series, EP-906F Series, EP-907F Series, EP-976A3 Series, 
-EP-977A3 Series, EP-978A3 Series, EP-979A3 Series, EP-M552T Series, 
-EP-M570T Series, ET-1110 Series, ET-16500 Series, ET-2500 Series, 
-ET-2550 Series, ET-2600 Series, ET-2610 Series, ET-2650 Series, ET-2700 
-Series, ET-2710 Series, ET-2720 Series, ET-2750 Series, ET-2760 Series, 
-ET-4500 Series, ET-4550 Series, ET-4700 Series, ET-7700 Series, ET-7750 
-Series, ET-M1100 Series, ET-M1120 Series, ET-M2120 Series, EW-052A 
-Series, EW-452A Series, EW-M5071FT Series, EW-M571T Series, EW-M660FT 
-Series, EW-M770T Series, EW-M970A3T Series, K200, K300, L1110 Series, 
-L1455 Series, L3050 Series, L3060 Series, L3070 Series, L3100 Series, 
-L3110 Series, L3150 Series, L3160 Series, L364 Series, L375 Series, L385 
-Series, L386 Series, L395 Series, L396 Series, L405 Series, L4150 
-Series, L4160 Series, L475 Series, L485 Series, L486 Series, L495 
-Series, L5190 Series, L565 Series, L566 Series, L575 Series, L605 
-Series, L655 Series, L7160 Series, L7180 Series, L805 Series, L810 
-Series, L850 Series, M1100 Series, M1120 Series, M200 Series, M205 
-Series, M2110 Series, M2120 Series, ME 200, ME OFFICE 520, ME OFFICE 
-530, ME OFFICE 560W, ME OFFICE 570, ME OFFICE 620F, ME OFFICE 900WD, ME 
-OFFICE 940FW, ME OFFICE 960FWD, ME Office 510, ME Office 600F, ME Office 
-650FN, ME Office 700FW, ME-301 Series, ME-303 Series, ME-400 Series, 
-NX230 TX230, NX430 TX435, PF-70 Series, PF-71 Series, PF-81 Series, 
-PM-400 Series, PM-A750, PM-A820, PM-A840, PM-A840S, PM-A890, PM-A920, 
-PM-A940, PM-A950, PM-A970, PM-D600, PM-D800, PM-D870, PM-G4500, PM-G850, 
-PM-T960, PM-T990, PX-046A Series, PX-047A Series, PX-048A Series, 
-PX-049A Series, PX-1600F, PX-1700F, PX-205 Series, PX-404A, PX-405A 
-Series, PX-434A, PX-435A Series, PX-436A Series, PX-437A Series, 
-PX-501A, PX-502A, PX-503A, PX-504A, PX-505F Series, PX-535F Series, 
-PX-5600, PX-5V, PX-601F, PX-602F, PX-603F, PX-605F Series, PX-673F, 
-PX-675F Series, PX-7V, PX-A620, PX-A640, PX-A650, PX-A720, PX-A740, 
-PX-B700, PX-B750F, PX-FA700, PX-G5300, PX-M160T Series, PX-M350F, 
-PX-M5040F, PX-M5041F, PX-M650A, PX-M650F, PX-M7050 Series, PX-M7050FP, 
-PX-M7050FX, PX-M740F, PX-M741F, PX-M840F, PX-M840FX, PX-M860F, PX-S05 
-Series, PX-S06 Series, PX-S160T Series, PX-S170T Series, PX-S170UT 
-Series, PX-S350, PX-S5040, PX-S7050 Series, PX-S7050PS, PX-S740, 
-PX-S840, PX-S860, PictureMate 500, PictureMate Deluxe, PictureMate PM 
-200, PictureMate PM 210, PictureMate PM 215, PictureMate PM 225, 
-PictureMate PM 235, PictureMate PM 240, PictureMate PM 245, PictureMate 
-PM 250, PictureMate PM 260, PictureMate PM 270, PictureMate PM 280, 
-PictureMate PM 290, PictureMate PM 300, PictureMate PM 310, ST-2000 
-Series, Epson Stylus CX2800, Epson Stylus CX2900, Epson Stylus CX3700, 
-Epson Stylus CX3800, Epson Stylus CX3900, Epson Stylus CX4200, Epson 
-Stylus CX4800, Epson Stylus CX4900, Epson Stylus CX5000, Epson Stylus 
-CX5900, Epson Stylus CX6000, Epson Stylus CX7300, Epson Stylus CX7400, 
-Epson Stylus CX7700, Epson Stylus CX7800, Epson Stylus CX8300, Epson 
-Stylus CX8400, Epson Stylus CX9300F, Epson Stylus CX9400Fax, Epson 
-Stylus DX3800, Epson Stylus DX4000, Epson Stylus DX4200, Epson Stylus 
-DX4800, Epson Stylus DX5000, Epson Stylus DX7400, Epson Stylus DX8400, 
-Epson Stylus DX9400F, Epson Stylus NX200, Epson Stylus NX210, Epson 
-Stylus NX215, Epson Stylus NX230, Epson Stylus NX300, Epson Stylus 
-NX330, Epson Stylus NX400, Epson Stylus NX410, Epson Stylus NX420, Epson 
-Stylus NX430, Epson Stylus NX510, Epson Stylus NX530, Epson Stylus 
-NX620, Epson Stylus NX635, Epson Stylus Office BX300F, Epson Stylus 
-Office BX305, Epson Stylus Office BX305 Plus, Epson Stylus Office 
-BX310FN, Epson Stylus Office BX320FW, Epson Stylus Office BX525WD, Epson 
-Stylus Office BX535WD, Epson Stylus Office BX600FW, Epson Stylus Office 
-BX610FW, Epson Stylus Office BX620FWD, Epson Stylus Office BX630FW, 
-Epson Stylus Office BX635FWD, Epson Stylus Office BX925, Epson Stylus 
-Office BX935FWD, Epson Stylus Office TX300F, Epson Stylus Office TX320F, 
-Epson Stylus Office TX510FN, Epson Stylus Office TX515FN, Epson Stylus 
-Office TX525FW, Epson Stylus Office TX600FW, Epson Stylus Office 
+EP-709A Series, EP-710A Series, EP-711A Series, EP-712A Series, EP-713A 
+Series, EP-774A, EP-775A Series, EP-776A Series, EP-777A Series, 
+EP-801A, EP-802A, EP-803A, EP-804A, EP-805A Series, EP-806A Series, 
+EP-807A Series, EP-808A Series, EP-810A Series, EP-811A Series, EP-812A 
+Series, EP-813A Series, EP-901A, EP-901F, EP-902A, EP-903A, EP-903F, 
+EP-904A, EP-904F, EP-905A Series, EP-905F Series, EP-906F Series, 
+EP-907F Series, EP-976A3 Series, EP-977A3 Series, EP-978A3 Series, 
+EP-979A3 Series, EP-M552T Series, EP-M570T Series, ET-1110 Series, 
+ET-16500 Series, ET-2500 Series, ET-2550 Series, ET-2600 Series, ET-2610 
+Series, ET-2650 Series, ET-2700 Series, ET-2710 Series, ET-2720 Series, 
+ET-2750 Series, ET-2760 Series, ET-4500 Series, ET-4550 Series, ET-4700 
+Series, ET-7700 Series, ET-7750 Series, ET-M1100 Series, ET-M1120 
+Series, ET-M2120 Series, EW-052A Series, EW-452A Series, EW-M5071FT 
+Series, EW-M571T Series, EW-M660FT Series, EW-M770T Series, EW-M970A3T 
+Series, K200, K300, L1110 Series, L1455 Series, L3050 Series, L3060 
+Series, L3070 Series, L3100 Series, L3110 Series, L3150 Series, L3160 
+Series, L364 Series, L375 Series, L385 Series, L386 Series, L395 Series, 
+L396 Series, L405 Series, L4150 Series, L4160 Series, L475 Series, L485 
+Series, L486 Series, L495 Series, L5190 Series, L565 Series, L566 
+Series, L575 Series, L605 Series, L655 Series, L7160 Series, L7180 
+Series, L805 Series, L810 Series, L850 Series, M1100 Series, M1120 
+Series, M200 Series, M205 Series, M2110 Series, M2120 Series, ME 200, ME 
+OFFICE 520, ME OFFICE 530, ME OFFICE 560W, ME OFFICE 570, ME OFFICE 
+620F, ME OFFICE 900WD, ME OFFICE 940FW, ME OFFICE 960FWD, ME Office 510, 
+ME Office 600F, ME Office 650FN, ME Office 700FW, ME-301 Series, ME-303 
+Series, ME-400 Series, NX230 TX230, NX430 TX435, PF-70 Series, PF-71 
+Series, PF-81 Series, PM-400 Series, PM-A750, PM-A820, PM-A840, 
+PM-A840S, PM-A890, PM-A920, PM-A940, PM-A950, PM-A970, PM-D600, PM-D800, 
+PM-D870, PM-G4500, PM-G850, PM-T960, PM-T990, PX-046A Series, PX-047A 
+Series, PX-048A Series, PX-049A Series, PX-1600F, PX-1700F, PX-205 
+Series, PX-404A, PX-405A Series, PX-434A, PX-435A Series, PX-436A 
+Series, PX-437A Series, PX-501A, PX-502A, PX-503A, PX-504A, PX-505F 
+Series, PX-535F Series, PX-5600, PX-5V, PX-601F, PX-602F, PX-603F, 
+PX-605F Series, PX-673F, PX-675F Series, PX-7V, PX-A620, PX-A640, 
+PX-A650, PX-A720, PX-A740, PX-B700, PX-B750F, PX-FA700, PX-G5300, 
+PX-M160T Series, PX-M350F, PX-M5040F, PX-M5041F, PX-M650A, PX-M650F, 
+PX-M7050 Series, PX-M7050FP, PX-M7050FX, PX-M740F, PX-M741F, PX-M840F, 
+PX-M840FX, PX-M860F, PX-S05 Series, PX-S06 Series, PX-S160T Series, 
+PX-S170T Series, PX-S170UT Series, PX-S350, PX-S5040, PX-S7050 Series, 
+PX-S7050PS, PX-S740, PX-S840, PX-S860, PictureMate 500, PictureMate 
+Deluxe, PictureMate PM 200, PictureMate PM 210, PictureMate PM 215, 
+PictureMate PM 225, PictureMate PM 235, PictureMate PM 240, PictureMate 
+PM 245, PictureMate PM 250, PictureMate PM 260, PictureMate PM 270, 
+PictureMate PM 280, PictureMate PM 290, PictureMate PM 300, PictureMate 
+PM 310, ST-2000 Series, Epson Stylus CX2800, Epson Stylus CX2900, Epson 
+Stylus CX3700, Epson Stylus CX3800, Epson Stylus CX3900, Epson Stylus 
+CX4200, Epson Stylus CX4800, Epson Stylus CX4900, Epson Stylus CX5000, 
+Epson Stylus CX5900, Epson Stylus CX6000, Epson Stylus CX7300, Epson 
+Stylus CX7400, Epson Stylus CX7700, Epson Stylus CX7800, Epson Stylus 
+CX8300, Epson Stylus CX8400, Epson Stylus CX9300F, Epson Stylus 
+CX9400Fax, Epson Stylus DX3800, Epson Stylus DX4000, Epson Stylus 
+DX4200, Epson Stylus DX4800, Epson Stylus DX5000, Epson Stylus DX7400, 
+Epson Stylus DX8400, Epson Stylus DX9400F, Epson Stylus NX200, Epson 
+Stylus NX210, Epson Stylus NX215, Epson Stylus NX230, Epson Stylus 
+NX300, Epson Stylus NX330, Epson Stylus NX400, Epson Stylus NX410, Epson 
+Stylus NX420, Epson Stylus NX430, Epson Stylus NX510, Epson Stylus 
+NX530, Epson Stylus NX620, Epson Stylus NX635, Epson Stylus Office 
+BX300F, Epson Stylus Office BX305, Epson Stylus Office BX305 Plus, Epson 
+Stylus Office BX310FN, Epson Stylus Office BX320FW, Epson Stylus Office 
+BX525WD, Epson Stylus Office BX535WD, Epson Stylus Office BX600FW, Epson 
+Stylus Office BX610FW, Epson Stylus Office BX620FWD, Epson Stylus Office 
+BX630FW, Epson Stylus Office BX635FWD, Epson Stylus Office BX925, Epson 
+Stylus Office BX935FWD, Epson Stylus Office TX300F, Epson Stylus Office 
+TX320F, Epson Stylus Office TX510FN, Epson Stylus Office TX515FN, Epson 
+Stylus Office TX525FW, Epson Stylus Office TX600FW, Epson Stylus Office 
 TX610FW, Epson Stylus Office TX620FWD, Epson Stylus Photo 1400, Epson 
 Stylus Photo 1410, Epson Stylus Photo 1430, Epson Stylus Photo 1500, 
 Epson Stylus Photo PX650, Epson Stylus Photo PX660, Epson Stylus Photo 
@@ -116,23 +116,23 @@ Series, WP-4092 Series, WP-4095 Series, WP-4511 Series, WP-4515 Series,
 WP-4520 Series, WP-4521 Series, WP-4525 Series, WP-4530 Series, WP-4531 
 Series, WP-4532 Series, WP-4533 Series, WP-4535 Series, WP-4540 Series, 
 WP-4545 Series, WP-4590 Series, WP-4592 Series, WP-4595 Series, WP-M4011 
-Series, WP-M4015 Series, WP-M4095 Series, WP-M4521 Series, WP-M4525 
-Series, WP-M4595 Series, WorkForce 310, WorkForce 320, WorkForce 435, 
-WorkForce 500, WorkForce 520, WorkForce 545, WorkForce 600, WorkForce 
-610, WorkForce 620, WorkForce 630, WorkForce 645, WorkForce 840, 
-WorkForce 845, XP-200 Series, XP-201 204 208 Series, XP-202 203 206 
-Series, XP-205 207 Series, XP-2100 Series, XP-211 214 216 Series, XP-212 
-213 Series, XP-215 217 Series, XP-220 Series, XP-225 Series, XP-235 
-Series, XP-240 Series, XP-243 245 247 Series, XP-255 257 Series, XP-300 
-Series, XP-302 303 305 306 Series, XP-310 Series, XP-3100 Series, XP-312 
-313 315 Series, XP-320 Series, XP-322 323 325 Series, XP-330 Series, 
-XP-332 335 Series, XP-340 Series, XP-342 343 345 Series, XP-352 355 
-Series, XP-400 Series, XP-402 403 405 406 Series, XP-410 Series, XP-4100 
-Series, XP-412 413 415 Series, XP-420 Series, XP-422 423 425 Series, 
-XP-430 Series, XP-432 435 Series, XP-440 Series, XP-442 445 Series, 
-XP-452 455 Series, XP-510 Series, XP-520 Series, XP-530 Series, XP-540 
-Series, XP-55 Series, XP-600 Series, XP-610 Series, XP-620 Series, 
-XP-630 Series, XP-640 Series, XP-700 Series, XP-710 Series, XP-7100 
-Series, XP-720 Series, XP-750 Series, XP-760 Series, XP-800 Series, 
-XP-810 Series, XP-820 Series, XP-830 Series, XP-850 Series, XP-860 
+Series, WP-M4015 Series, WP-M4095 Series, WP-M4521 Series, WP-M4525
+Series, WP-M4595 Series, WorkForce 310, WorkForce 320, WorkForce 435,
+WorkForce 500, WorkForce 520, WorkForce 545, WorkForce 600, WorkForce
+610, WorkForce 620, WorkForce 630, WorkForce 645, WorkForce 840,
+WorkForce 845, XP-200 Series, XP-201 204 208 Series, XP-202 203 206
+Series, XP-205 207 Series, XP-2100 Series, XP-211 214 216 Series, XP-212
+213 Series, XP-215 217 Series, XP-220 Series, XP-225 Series, XP-235
+Series, XP-240 Series, XP-243 245 247 Series, XP-255 257 Series, XP-300
+Series, XP-302 303 305 306 Series, XP-310 Series, XP-3100 Series, XP-312
+313 315 Series, XP-320 Series, XP-322 323 325 Series, XP-330 Series,
+XP-332 335 Series, XP-340 Series, XP-342 343 345 Series, XP-352 355
+Series, XP-400 Series, XP-402 403 405 406 Series, XP-410 Series, XP-4100
+Series, XP-412 413 415 Series, XP-420 Series, XP-422 423 425 Series,
+XP-430 Series, XP-432 435 Series, XP-440 Series, XP-442 445 Series,
+XP-452 455 Series, XP-510 Series, XP-520 Series, XP-530 Series, XP-540
+Series, XP-55 Series, XP-600 Series, XP-610 Series, XP-620 Series,
+XP-630 Series, XP-640 Series, XP-700 Series, XP-710 Series, XP-7100
+Series, XP-720 Series, XP-750 Series, XP-760 Series, XP-800 Series,
+XP-810 Series, XP-820 Series, XP-830 Series, XP-850 Series, XP-860
 Series, XP-900 Series, XP-950 Series, XP-960 Series
diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
index ec1d397619..88dbdefd43 100644
--- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
+++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
@@ -25,7 +25,7 @@
 # Update by: blizzack <slackbuilds@blizzack.com>
 
 PRGNAM=epson-inkjet-printer-escpr
-VERSION=${VERSION:-1.7.7}
+VERSION=${VERSION:-1.7.8}
 TARNAM=$PRGNAM-$VERSION-1lsb3.2.tar.gz
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info
index 87da3124e0..f88bde0aac 100644
--- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info
+++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info
@@ -1,8 +1,8 @@
 PRGNAM="epson-inkjet-printer-escpr"
-VERSION="1.7.7"
+VERSION="1.7.8"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6d9cb64872f817bce1920b8/epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz"
-MD5SUM="1d951cc738b285886288a16c11725523"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz"
+MD5SUM="1631fef39f62e368d95b3823121bf8a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models
index 712e2cb59f..13f4944464 100644
--- a/system/epson-inkjet-printer-escpr2/README.models
+++ b/system/epson-inkjet-printer-escpr2/README.models
@@ -4,32 +4,33 @@ EP-882A Series, EP-883A Series, EP-982A3 Series, ET-15000 Series
 ET-16150 Series, ET-16600 Series, ET-16650 Series, ET-3700 Series
 ET-3710 Series, ET-3750 Series, ET-3760 Series, ET-4750 Series
 ET-4760 Series, ET-5150 Series, ET-5170 Series, ET-5800 Series
-ET-5850 Series, ET-5880 Series, ET-8700 Series, ET-M1140 Series
-ET-M1170 Series, ET-M1180 Series, ET-M16600 Series, ET-M2140 Series
-ET-M2170 Series, ET-M3140 Series, ET-M3170 Series, ET-M3180 Series
-EW-M530F Series, EW-M5610FT Series, EW-M630T Series, EW-M670FT Series
-EW-M752T Series, L11160 Series, L14150 Series, L15150 Series
-L15160 Series, L6160 Series, L6170 Series, L6190 Series, L6550 Series
-L6570 Series, L6580 Series, M1140 Series, M1170 Series, M1180 Series
-M15140 Series, M2140 Series, M2170 Series, M3140 Series, M3170 Series
-M3180 Series, PM-520 Series, PX-M270FT Series, PX-M270T Series
-PX-M380F, PX-M381FL, PX-M5080F Series, PX-M5081F Series
-PX-M6010F Series, PX-M6011F Series, PX-M6711FT Series
-PX-M6712FT Series, PX-M680F Series, PX-M7070FX, PX-M7080FX, PX-M7090FX
-PX-M7110F, PX-M7110FP, PX-M730F Series, PX-M780F Series
-PX-M781F Series, PX-M791FT Series, PX-M880FX, PX-M884F, PX-M885F
-PX-M886FL, PX-S270T Series, PX-S380, PX-S381L, PX-S5010 Series
-PX-S5080 Series, PX-S6710T Series, PX-S7070X, PX-S7090X, PX-S7110
-PX-S7110P, PX-S880X, PX-S884, PX-S885, ST-3000 Series, ST-4000 Series
-ST-C8000 Series, ST-M1000 Series, ST-M3000 Series, WF-2860 Series
-WF-3720 Series, WF-3730 Series, WF-3820 Series, WF-4720 Series
-WF-4730 Series, WF-4740 Series, WF-4820 Series, WF-4830 Series
-WF-7210 Series, WF-7710 Series, WF-7720 Series, WF-7820 Series
-WF-7830 Series, WF-7840 Series, WF-C5210 Series, WF-C5290 Series
-WF-C5290BA, WF-C529R Series, WF-C529RB, WF-C5710 Series
-WF-C5790 Series, WF-C5790BA, WF-C579R Series, WF-C579RB
-WF-C8190 Series, WF-C8190B, WF-C8610 Series, WF-C8690 Series, WF-C8690B
-WF-C869R Series, WF-C878R Series, WF-C878RB, WF-C879R Series, WF-C879RB
-WF-M5298 Series, WF-M5299 Series, WF-M5799 Series, XP-15000 Series
-XP-5100 Series, XP-6000 Series, XP-6100 Series, XP-8500 Series
-XP-8600 Series, XP-970 Series
+ET-5850 Series, ET-5880 Series, ET-8500 Series, ET-8550 Series
+ET-8700 Series, ET-M1140 Series, ET-M1170 Series, ET-M1180 Series
+ET-M16600 Series, ET-M2140 Series, ET-M2170 Series, ET-M3140 Series
+ET-M3170 Series, ET-M3180 Series, EW-M530F Series, EW-M5610FT Series
+EW-M630T Series, EW-M670FT Series, EW-M752T Series, EW-M873T Series
+EW-M973A3T Series, L11160 Series, L14150 Series, L15150 Series
+L15160 Series, L15180 Series, L6160 Series, L6170 Series, L6190 Series
+L6550 Series, L6570 Series, L6580 Series, L8160 Series, L8180 Series
+M1140 Series, M1170 Series, M1180 Series, M15140 Series, M2140 Series
+M2170 Series, M3140 Series, M3170 Series, M3180 Series, PM-520 Series
+PX-M270FT Series, PX-M270T Series, PX-M380F, PX-M381FL
+PX-M5080F Series, PX-M5081F Series, PX-M6010F Series, PX-M6011F Series
+PX-M6711FT Series, PX-M6712FT Series, PX-M680F Series, PX-M7070FX
+PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M730F Series
+PX-M780F Series, PX-M781F Series, PX-M791FT Series, PX-M880FX, PX-M884F
+PX-M885F, PX-M886FL, PX-S270T Series, PX-S380, PX-S381L
+PX-S5010 Series, PX-S5080 Series, PX-S6710T Series, PX-S7070X
+PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885
+ST-3000 Series, ST-4000 Series, ST-C8000 Series, ST-M1000 Series
+ST-M3000 Series, WF-2860 Series, WF-3720 Series, WF-3730 Series
+WF-3820 Series, WF-4720 Series, WF-4730 Series, WF-4740 Series
+WF-4820 Series, WF-4830 Series, WF-7210 Series, WF-7710 Series
+WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series
+WF-C5210 Series, WF-C5290 Series, WF-C5290BA, WF-C529R Series
+WF-C529RB, WF-C5710 Series, WF-C5790 Series, WF-C5790BA
+WF-C579R Series, WF-C579RB, WF-C8190 Series, WF-C8190B, WF-C8610 Series
+WF-C8690 Series, WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB
+WF-C879R Series, WF-C879RB, WF-M5298 Series, WF-M5299 Series
+WF-M5799 Series, XP-15000 Series, XP-5100 Series, XP-6000 Series
+XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-970 Series
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
index c4970e9bea..2fcc1e0c7e 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -27,9 +27,10 @@
 
 #note to self. paste list of supported models into first line of empty README.models
 #file. run sh ./fixrm to spread the model list evenly over as many lines as needed
+#also request upload of source to slackbuildsdirectlinks.
 
 PRGNAM=epson-inkjet-printer-escpr2
-VERSION=${VERSION:-1.1.23}
+VERSION=${VERSION:-1.1.29}
 EXTRABIT=1lsb3.2
 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz
 BUILD=${BUILD:-1}
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
index 2e306d610c..37af85947e 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
@@ -1,8 +1,8 @@
 PRGNAM="epson-inkjet-printer-escpr2"
-VERSION="1.1.23"
+VERSION="1.1.29"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
-MD5SUM="67a9944cbc95bd6d0779b7eca204acbc"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.1.29-1lsb3.2.src.rpm"
+MD5SUM="b36f12fadc8db81050982ad3901c1b4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/esekeyd/README b/system/esekeyd/README
new file mode 100644
index 0000000000..3c5817bd65
--- /dev/null
+++ b/system/esekeyd/README
@@ -0,0 +1,26 @@
+esekeyd (multimedia keyboard daemon for Linux)
+
+ESE Key Daemon is a multimedia keyboard daemon for Linux. With
+the 2.6 kernel series it can also handle remote controls, as they
+are presented as keyboards. It's a userspace program that polls
+/dev/input/event? interfaces for incoming keypresses, and executes
+commands as defined in its config file.
+
+esekeyd is also useful for keyboards without multimedia keys. Its
+functionality is similar to xbindkeys, but (a) it doesn't require X
+(works in the console), and (b) it doesn't "eat" the keystrokes it
+receives, so you'll want to disable those keycodes in your keymap
+if you don't want applications to react to them (see loadkeys(1) and
+keymaps(5)).
+
+To start using esekeyd, first edit /etc/esekeyd.conf to define your
+keys and the programs that will be run (use "learnkeys" to get
+the names of the keys). Then start the esekeyd daemon by running
+"/usr/sbin/esekeyd /etc/esekeyd.conf" (as root, or as a user in the
+input group). To start esekeyd at boot, just add that command to
+/etc/rc.d/rc.local.
+
+If esekeyd never sees your keystrokes, you may have to explicitly set
+the input device for it to use on the command line (see the esekeyd(1)
+man page). Also, for testing purposes, see the "Simple test" section
+at the end of /etc/esekeyd.conf.
diff --git a/system/esekeyd/config.snippet b/system/esekeyd/config.snippet
new file mode 100644
index 0000000000..4b01f3bce5
--- /dev/null
+++ b/system/esekeyd/config.snippet
@@ -0,0 +1,22 @@
+
+###
+# Simple test: Uncomment the next two lines:
+
+#KEY_87:touch /tmp/esekeyd_works
+#KEY_88:rm -f /tmp/esekeyd_works
+
+# Then start up esekeyd with this config file:
+#  esekeyd /etc/esekeyd.conf
+# Then run:
+#  watch -n 1 ls /tmp/esekeyd_works
+# Press F11 and F12 to see the file get created and deleted.
+# If you can't use F11 and F12 for some reason, run "keytest" and
+# press e.g. A and Z, change the KEY_ numbers to the ones you see
+# for those keys.
+
+# If nothing happens, you may have to find out which
+# /dev/input/event* device is your keyboard and add that to the
+# esekeyd command line. Try something like:
+#  ls -l /dev/input/by-id/*-kbd
+# ...or install and run evtest.
+###
diff --git a/system/esekeyd/doinst.sh b/system/esekeyd/doinst.sh
new file mode 100644
index 0000000000..b1bc6d67f6
--- /dev/null
+++ b/system/esekeyd/doinst.sh
@@ -0,0 +1,11 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/esekeyd.conf.new
diff --git a/system/esekeyd/esekeyd.SlackBuild b/system/esekeyd/esekeyd.SlackBuild
new file mode 100644
index 0000000000..aca4698c74
--- /dev/null
+++ b/system/esekeyd/esekeyd.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for esekeyd
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=esekeyd
+VERSION=${VERSION:-1.2.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
+
+# The license is supposed to be GPL3, but it's shipped as a symlink
+# to /usr/share/automake-1.10/COPYING, which doesn't even exist on
+# Slackware 14.2. Use a copy that does exist.
+rm -f COPYING
+cp $( /bin/ls /usr/share/automake-*/COPYING | head -1 ) .
+
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Typo in man pages.
+sed -i 's,pools,polls,g' doc/*.1
+
+# The keyboard autodetection code is outdated and broken. Patch has
+# been sent upstream and will hopefully be incorporated in the next
+# release.
+patch -p1 < $CWD/keyboard_detection.diff
+
+[ -e configure ] || sh bootstrap
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man?/*.?
+
+# Example config. As shipped, but with all the commands commented out.
+# Also add a simpler example that everyone should be able to use.
+mkdir -p $PKG/etc
+sed 's,^.,#&,' examples/example.conf > $PKG/etc/$PRGNAM.conf.new
+cat $CWD/config.snippet >> $PKG/etc/$PRGNAM.conf.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/system/esekeyd/esekeyd.info b/system/esekeyd/esekeyd.info
new file mode 100644
index 0000000000..385c0e8a92
--- /dev/null
+++ b/system/esekeyd/esekeyd.info
@@ -0,0 +1,10 @@
+PRGNAM="esekeyd"
+VERSION="1.2.7"
+HOMEPAGE="https://github.com/burghardt/esekeyd"
+DOWNLOAD="https://github.com/burghardt/esekeyd/archive/esekeyd-1.2.7/esekeyd-esekeyd-1.2.7.tar.gz"
+MD5SUM="e8ba0f4f0bc2080f1a9da17b52f86805"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/esekeyd/keyboard_detection.diff b/system/esekeyd/keyboard_detection.diff
new file mode 100644
index 0000000000..97e93bcdce
--- /dev/null
+++ b/system/esekeyd/keyboard_detection.diff
@@ -0,0 +1,101 @@
+diff -Naur esekeyd-esekeyd-1.2.7/src/input.c esekeyd-esekeyd-1.2.7.patched/src/input.c
+--- esekeyd-esekeyd-1.2.7/src/input.c	2010-07-04 16:23:51.000000000 -0400
++++ esekeyd-esekeyd-1.2.7.patched/src/input.c	2020-11-01 20:22:49.777498592 -0500
+@@ -10,6 +10,14 @@
+ 
+ #include "esekey.h"
+ 
++#include <dirent.h>
++#define CLASS_DIR "/sys/class/input"
++#define DEV_DIR "/dev/input"
++
++#ifndef PATH_MAX
++#  define PATH_MAX 1024
++#endif
++
+ signed char check_handlers (void)
+ {
+     FILE *fp = NULL;
+@@ -45,32 +53,63 @@
+     return 0;
+ }
+ 
+-signed char find_input_dev (void)
++/* return true if /dev/input/event<devno> is a keyboard.
++    This could also have been done by way of ioctls instead of reading
++    from /sys files. Hopefully the /sys API doesn't change...
++    It's documented thoroughly here:
++    https://unix.stackexchange.com/questions/74903/explain-ev-in-proc-bus-input-devices-data
++ */
++int is_keyboard(int devno)
+ {
+-    FILE *fp = NULL;
+-    signed char have_evdev = -2;
++    char filename[PATH_MAX + 1];
++    char *buf = NULL;
++    size_t len = 0, caps = 0;
++    size_t wantcaps = (1 << EV_SYN | 1 << EV_KEY | 1 << EV_MSC | 1 << EV_LED | 1 << EV_REP);
++    FILE *fp;
++
++    sprintf(filename, "%s/event%d/device/capabilities/ev", CLASS_DIR, devno);
++    if(!(fp = fopen(filename, "r"))) return 0;
++
++    getline(&buf, &len, fp);
++    fclose(fp);
++    if(!buf) return 0;
+ 
+-    fp = fopen (INPUT_DEVICES, "r");
++    caps = strtol(buf, NULL, 16);
++    free(buf);
+ 
+-    if (!fp)
++    return (caps & wantcaps) == wantcaps;
++}
++
++/* returns the highest-numbered keyboard found. The common case is
++    that the internal keyboard on a laptop is numbered lower than an external
++    keyboard, and we assume that if there's an external, it's the one the
++    user actually uses. If no keyboards are found, returns -1. */
++signed char find_input_dev (void)
++{
++    DIR *dir;
++    struct dirent *entry;
++    int last_kbd = -1;
++    char buf[PATH_MAX + 1];
++
++    dir = opendir(CLASS_DIR);
++    if(!dir) {
++        perror(CLASS_DIR);
+         return -1;
++    }
+ 
+-    while (!feof (fp))
+-    {
+-        char *buff = NULL;
+-        size_t len = 0;
+-        short int number = -2;
+-        getline (&buff, &len, fp);
+-        sscanf (buff, "H: Handlers=kbd event%hu", &number);
+-        free (buff);
+-        if (number > -1)
+-        {
+-            have_evdev = number;
+-            break;
++    while( (entry = readdir(dir)) ) {
++        sprintf(buf, "%s/%s", CLASS_DIR, entry->d_name);
++        if(strncmp(entry->d_name, "event", 5) == 0) {
++            int devno = atoi(entry->d_name + 5);
++            if(is_keyboard(devno)) {
++                fprintf(stderr, "event%d is a keyboard\n", devno);
++                if(devno > last_kbd) last_kbd = devno;
++            }
+         }
+     }
++    closedir(dir);
+ 
+-    fclose (fp);
++    fprintf(stderr, "Autodetected keyboard: %s/event%d\n", DEV_DIR, last_kbd);
+ 
+-    return have_evdev;
++    return last_kbd;
+ }
diff --git a/system/esekeyd/slack-desc b/system/esekeyd/slack-desc
new file mode 100644
index 0000000000..60a565adc5
--- /dev/null
+++ b/system/esekeyd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+esekeyd: esekeyd (multimedia keyboard daemon for Linux)
+esekeyd:
+esekeyd: ESE Key Daemon is a multimedia keyboard daemon for Linux. With
+esekeyd: the 2.6 kernel series it can also handle remote controls, as they
+esekeyd: are presented as keyboards. It's a userspace program that polls
+esekeyd: /dev/input/event? interfaces for incoming keypresses, and executes
+esekeyd: commands as defined in its config file.
+esekeyd:
+esekeyd: esekeyd is also useful for keyboards without multimedia keys. Its
+esekeyd: functionality is similar to xbindkeys, but it doesn't require X
+esekeyd: (works in the console).
diff --git a/system/exa/exa.SlackBuild b/system/exa/exa.SlackBuild
index 48b039ed4b..2ebd5f52e1 100644
--- a/system/exa/exa.SlackBuild
+++ b/system/exa/exa.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for exa
 
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exa
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -132,18 +132,11 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-cargo build --release --no-default-features --features default $CARGOTARGET
+cargo build --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin
-find target -name exa -exec install -m 755 {} $PKG/usr/bin/exa \;
 
-mkdir -p $PKG/usr/share/bash-completion/completions
-mkdir -p $PKG/usr/share/zsh/site-functions
-make install-man install-bash-completions install-zsh-completions DESTDIR=$PKG PREFIX=/usr BASHDIR=/usr/share/bash-completion/completions ZSHDIR=/usr/share/zsh/site-functions
-
-mv $PKG/usr/share/man/ $PKG/usr
-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
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
 
 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
diff --git a/system/exa/exa.info b/system/exa/exa.info
index bf7123b84c..7eaff285a4 100644
--- a/system/exa/exa.info
+++ b/system/exa/exa.info
@@ -1,134 +1,92 @@
 PRGNAM="exa"
-VERSION="0.9.0"
+VERSION="0.10.0"
 HOMEPAGE="https://github.com/ogham/exa"
-DOWNLOAD="https://github.com/ogham/exa/archive/v0.9.0/exa-0.9.0.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.35.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/datetime/datetime-0.4.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.9.1.crate \
+DOWNLOAD="https://github.com/ogham/exa/archive/v0.10.0/exa-0.10.0.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.61.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/datetime/datetime-0.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.13.11.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/iso8601/iso8601-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.51.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.79.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.12.14+1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/locale/locale-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/natord/natord-1.0.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-1.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/number_prefix/number_prefix-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-src/openssl-src-111.3.0+1.1.1c.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.47.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pad/pad-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.54.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.1.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/number_prefix/number_prefix-0.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-src/openssl-src-111.12.0+1.1.1h.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.58.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pad/pad-0.1.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-0.6.9.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/term_grid/term_grid-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-0.3.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-1.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.9.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.13.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.10.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/zoneinfo_compiled/zoneinfo_compiled-0.4.8.crate"
-MD5SUM="7eff17e086fe4a809dbf8c612945eabe \
-        cb23a78f4c35abcb2d8d1394645674fe \
-        badb073223ca5a3a22f1dbf0267808a0 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        3664ceb4b5c686f1adabe1f57931c425 \
-        e5767560aad375059c975285c07022c0 \
-        85562346cef4a44a32cc1fadcdd06b50 \
-        9ffb6955a3e044b99bd60c1ea934bcc2 \
-        0cd2bb93a82da2e4ca526b40ae8b341e \
-        244e19eb0ab4ad90aa523890f7104465 \
-        a52ad1aa4f05f96817c8c8e66deebf29 \
-        1df8c7ed6101088c436ca467160fb646 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/zoneinfo_compiled/zoneinfo_compiled-0.5.1.crate"
+MD5SUM="e8064cba42ae5692a85365074761ef88 \
+        f44e8d1d2e61974b268852797530ea41 \
+        c6443ec8d007c729ba5482008d0c864d \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        e502e6c6b0dca9c1ae2d99e92b26f645 \
+        87343079a03b28726b323c5c40c9167c \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        483eecc236461c493fd1aab629cee9e2 \
+        5cd52aaa12a180c9e090f40a30cd2a99 \
         e7c07242a95ee1df865efe9534e10a34 \
-        4583a67acf00a437e5cd27857210a526 \
-        89cabfcb37602a7b200b1a9cd660ee2e \
-        4867b6387128434a377e6ab91ea65af8 \
-        9d033cc2daa6924420a4a89e6705773f \
-        1c9fee8f180b6f3402849983a45bbd6d \
-        0d58929587967a437054a48d3df3d74f \
-        c754f4e4df5f266482842053824f53a4 \
-        8a79353ba205d0a86f695053dd4d15be \
+        553b325a602b701eb7eaef228e69d0f2 \
+        54ac4c56d9ec2800b8428020f24be67c \
+        04a84513cdad48c92d8363d627904227 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        7aef65438636d8662cd61e77c42c28f0 \
+        486fd4e3f2db566414f9d0b66e377fb6 \
+        e5768043e447a7423f030c1394440502 \
         4b6711425b661ef923c9ff3ef9ba8c67 \
-        cc65f96341390c0f60f5216e829486e7 \
+        f50d2e280b4a3491fffda43b90982544 \
         7916dcd738a8fa6a2798754c20d6e146 \
-        514a89ff59a9bf0671d7db4812725459 \
         5a9b94ba54ea1f52f2a496ba982e3282 \
-        3796b5abe0f8c5f3a9e9441c5757a52c \
-        4667779e8bc2c1c564a2f8ee1d431b35 \
-        cbdebc326641fcab42bc92a113548740 \
-        9fc51e79791f918b643e3802a2e0e88f \
-        0951beec2d7a0016cfdc535649c58fc6 \
-        116a226eb8cbd3e1f7feec24f51dba15 \
-        e9841fe3647cb717ba37bd36d17eee22 \
-        127403beb2fe017f7ad1b153b1538882 \
-        8a5fc6ba84f3ac8a7e43ecb99322866c \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        4563373184ff931ec276dc1a659d52d2 \
-        14fab6ea3c2c94779d3c50dd2dffd10e \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        4ee4b798e15d09f65c6e66c7d3c503fd \
-        9d1baf9d7576dd51ecd02dcc76810678 \
+        c36d452e37c73b1e99f40bae18cddfdb \
+        4bbea6a7f7b7715c2e4eb553cf62913c \
+        57230f576c93046e708d3afcff7ac682 \
+        48067cc7d8ace5851af5f3ea557fee17 \
+        9ef4dc6ae75b107b9b8eb13d5824bba8 \
+        f490982aceabdbd515348f63e638a782 \
+        448bc61aee07661464d98da7660e9a1d \
+        3cc3a4bd5861ca93d7c0d19129334703 \
         b492e0a70603c3903a44ec5cabd3ba21 \
-        decf47fcc527d6ff7315570be2a9de0f \
         225ea4b479317c9db74e6e74db8ef198 \
-        adf9d2250c2a622c6274514e38d1f559 \
-        6b70927d96d7e02a00964cbd0732dec3 \
-        de04800c89d374b8a843f91d26fa05ad \
-        baaa166f66e90e94b76b7418afd5df90 \
-        d34a9f507f3ecf7d93c07deb74f1cd7c \
+        73d602cc41e3e431bf4fabd129ae1616 \
+        253a33d4577293cbeb852f14069b4a84 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
-        60eec117e8efaa29b898e43319da2b05 \
-        d7c493ca4f84a7d50b53646421a37487 \
-        32f0ced8a8881d2c0572b879bf15b91e \
-        4e027f7213c520594ef3a334d44f162c \
-        9c27232c12abb96c68e10e21f2012639 \
-        e75c0721667b6bc86472ecf7b286d9fc \
-        c900e7dbce808ff8ced375077b17a163 \
+        c3be058b692f0e9b25a3219b7b5d940c \
+        4272c279b06b88f8b0ffce7109348e27 \
+        81821d39675a1f584546b9920e5d6b5d \
+        d4c929fc9daf131daef04ee7eaa91fd4 \
+        bff823ec07c5fbcc3e425c9c9e4b38a6 \
         db96b50050277bf05a3c68534bbb9586 \
-        4724370f3179d1ab61f3fd8fa60a2368 \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        38569b37293d94fc57b6e1449a1c38aa \
-        2f9f840bd479751f715a8f530976b6bf \
-        800e62b2bcdb24b8095ea9d6ba70ddea"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        cebfcf2c00532e4559ecad9c9ebaca0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild
index f52427a4db..1394c1bfd1 100644
--- a/system/execline/execline.SlackBuild
+++ b/system/execline/execline.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=execline
-VERSION=${VERSION:-2.6.1.1}
+VERSION=${VERSION:-2.8.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/execline/execline.info b/system/execline/execline.info
index e50b4954d9..4325cd74e9 100644
--- a/system/execline/execline.info
+++ b/system/execline/execline.info
@@ -1,8 +1,8 @@
 PRGNAM="execline"
-VERSION="2.6.1.1"
+VERSION="2.8.0.1"
 HOMEPAGE="https://skarnet.org/software/execline/"
-DOWNLOAD="https://skarnet.org/software/execline/execline-2.6.1.1.tar.gz"
-MD5SUM="6ec1bcb862d789021fdd411c719eb57d"
+DOWNLOAD="https://skarnet.org/software/execline/execline-2.8.0.1.tar.gz"
+MD5SUM="1db2962b05f2566826ad9da4e3b5c475"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="skalibs"
diff --git a/system/exomizer/exomizer.SlackBuild b/system/exomizer/exomizer.SlackBuild
index a945e68be4..fba03086b4 100644
--- a/system/exomizer/exomizer.SlackBuild
+++ b/system/exomizer/exomizer.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210225 bkw: update for v3.1.0, try using upstream's download
+# URL again. Handle bitbucket adding ?rev=<hash> to the filename, by
+# using .zip* as the source filename. Not ideal, but workable.
+
 # 20191201 bkw: update for v3.0.2
 # 20180829 bkw: update for v3.0.1
 
@@ -17,7 +21,7 @@
 # - can still build with VERSION=2.0.9 or VERSION=2.0.10, if needed
 
 PRGNAM=exomizer
-VERSION=${VERSION:-3.0.2}
+VERSION=${VERSION:-3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,8 +60,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/${PRGNAM}${VERSION//./}.zip -x dos/\* win32/\* || \
-  unzip $CWD/$PRGNAM-$VERSION.zip -x dos/\* win32/\*
+unzip $CWD/${PRGNAM}${VERSION//./}.zip* -x dos/\* win32/\* || \
+  unzip $CWD/$PRGNAM-$VERSION.zip* -x dos/\* win32/\*
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
diff --git a/system/exomizer/exomizer.info b/system/exomizer/exomizer.info
index 0333729a20..8ce26be2ec 100644
--- a/system/exomizer/exomizer.info
+++ b/system/exomizer/exomizer.info
@@ -1,8 +1,8 @@
 PRGNAM="exomizer"
-VERSION="3.0.2"
+VERSION="3.1.0"
 HOMEPAGE="https://bitbucket.org/magli143/exomizer/wiki/Home"
-DOWNLOAD="https://slackware.uk/~urchlay/src/exomizer-3.0.2.zip"
-MD5SUM="5fa0cbb09ed83a6f1898e8a9879508a6"
+DOWNLOAD="https://bitbucket.org/magli143/exomizer/wiki/downloads/exomizer-3.1.0.zip"
+MD5SUM="ea39dde72aa703324e27a4ee8b6ad1b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/f2fs_tools/f2fs_tools.SlackBuild b/system/f2fs_tools/f2fs_tools.SlackBuild
index 198eb74854..cfc322e817 100644
--- a/system/f2fs_tools/f2fs_tools.SlackBuild
+++ b/system/f2fs_tools/f2fs_tools.SlackBuild
@@ -5,7 +5,7 @@
 
 PRGNAM=f2fs_tools
 SRCNAM=f2fs-tools
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/f2fs_tools/f2fs_tools.info b/system/f2fs_tools/f2fs_tools.info
index cda93b1788..d3c8afa5b2 100644
--- a/system/f2fs_tools/f2fs_tools.info
+++ b/system/f2fs_tools/f2fs_tools.info
@@ -1,8 +1,8 @@
 PRGNAM="f2fs_tools"
-VERSION="1.6.1"
+VERSION="1.14.0"
 HOMEPAGE="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
-DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.6.1.tar.gz"
-MD5SUM="3fc6caa14569e059fc41807e42641a11"
+DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.14.0.tar.gz"
+MD5SUM="b8be45bb2903d9c89d33f3dda630f7b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild
index e3d5946626..e842053adb 100644
--- a/system/fd/fd.SlackBuild
+++ b/system/fd/fd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fd
-VERSION=${VERSION:-8.1.1}
+VERSION=${VERSION:-8.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fd/fd.info b/system/fd/fd.info
index 8298b53d32..bb79177da2 100644
--- a/system/fd/fd.info
+++ b/system/fd/fd.info
@@ -1,140 +1,128 @@
 PRGNAM="fd"
-VERSION="8.1.1"
+VERSION="8.2.1"
 HOMEPAGE="https://github.com/sharkdp/fd"
-DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.1.1/fd-8.1.1.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
+DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.2.1/fd-8.2.1.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/anyhow/anyhow-1.0.31.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/anyhow/anyhow-1.0.35.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.53.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ctrlc/ctrlc-3.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ctrlc/ctrlc-3.1.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/diff/diff-0.1.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-next/dirs-next-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys-next/dirs-sys-next-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.13.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.2.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-2.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.17.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.70.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.17.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.80.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.18.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.10.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
-MD5SUM="5a18528c91b4e81b99803d1bda5a8e08 \
-        abc51f82118d86e83165ba87e2521e96 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate"
+MD5SUM="be6243e578e2313578bb0cf1e713b5e9 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         f44e8d1d2e61974b268852797530ea41 \
-        1aa9e9e92de1f9c295f0918ae12cbd28 \
-        6ff474dd60c839a9c788844b7a42c72c \
-        38a5278571eefda86428a8ebfc1cedc2 \
+        6f628b386c5dfe62ffa9b017d8ed7c38 \
         142cb4b9a653e56e56311f0c883b8582 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        bbaf2cabce203fecd54c0c294eb7fb2b \
+        c6443ec8d007c729ba5482008d0c864d \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        085f6f44e54f62691bf3cf3365f5544a \
-        d25e25d08adce75c63f3969191141f28 \
-        547dbf225c61b70c81f74f79a83affc9 \
+        0df9d76acda993ef38665e5e254f500c \
+        b3ebb5d4433417e998d982d46334a6f4 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        42af3a1e965585d80dcc1e0324fda6eb \
-        ec9751a4c0d35e7313e52ddb7147376b \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        6c739a6c270468297135cd4bfeadbdd1 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        9e1f73325eeb9647ee68eeaa4bff975c \
+        ed8fbdb220a7435e83c34d46151182f0 \
         06fc5cd841a576b0bc969fb13ba22b4c \
-        1946cef415cbf82cdcb975d813dd9696 \
-        8b418106a3968619300a2af8f6b4f200 \
-        b9f03f84345e22eae7858abc75dea31c \
+        3681f813c502d911e9eea940dddd26a5 \
+        c1922365b80dcdf50342e7640eea27ce \
+        d2c45f1ab11c072f28d2087f0af9870f \
         8dab3b3ec00dc56cffde0b0c410d47b5 \
-        8b98db48d2cecf5843b75e2f668c58fa \
+        11bdaeb718e5577104b0697c89cf9311 \
         27260b46db6b9ac40318143d70a80ba3 \
-        de1228e571c94ef53ec4c21db57279ab \
-        976eacc1e28ff6a04a08e7f4a2a5466a \
-        be4d52524ec8485abc40efba317b1e4c \
-        361bd9fd6988aa4ac291c63336fb29c3 \
-        02da164370fb6f7e2cf46cfffc1311a7 \
+        704babd757a22f163230a36fa5474890 \
+        1b94f32581a557963eecb29761e9c0eb \
+        553b325a602b701eb7eaef228e69d0f2 \
+        3f94dd669aafea2fcd7c8c63236029c4 \
+        88b4e3e28ea8527c2b0e7124d6d5766f \
         85dae509b4cda41fa820b3ad3b302479 \
         9f10bcc7b3ab24a0cdbaa0addc65b88d \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        6db136a3e060ff39fc699991b77b0170 \
-        61e508ca2eee543023c5e1ba777e5ede \
-        ac934b05bd666cf0ee46a72e558f0b4b \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        c45800f4dfb888a928c772b081065214 \
+        3845eb009d59a1e90a749e50fadfd2d3 \
+        f50d2e280b4a3491fffda43b90982544 \
+        f3373fd861a0066fa446a8ab3dabc749 \
+        fa3630e5867493e09296155763e4f4a0 \
+        d0daed97b20f4a6b23c8d4e2ac7b77a8 \
         c36d452e37c73b1e99f40bae18cddfdb \
         9e99a37f8c37bb953732ef46ac2b12a1 \
         8cab41822d03dfa674870315308fa392 \
         35ddcd36701a1a6711cc3aec85909f41 \
         c8d655d206cbe48b84a22544d6fc6d15 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        31d088af3982b271b2afdda37e963518 \
-        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
-        26e3fed1cf505f5fd65b98fb149ca1aa \
-        526f5ebac8d794185afbc71959c5c968 \
-        c9a135ad3406eeeffb425d585d4567d7 \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        870008bba2e68db4988c31e511fbd9c4 \
+        13373372c7ce2e894925d846625a7987 \
+        40d1ab8fd9b6e5e376b0839a9132abe1 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
         781d4ccf5d04c98fa02af207a9639249 \
         918b2d65f7489e154483e3d6e54118a0 \
         73d602cc41e3e431bf4fabd129ae1616 \
         a8de006fe0c7e373c560dd51599287a8 \
         a5dd75e77c7324f5c1d2d372c990d0a7 \
-        0f65fd26370e1fd67c8e8812cabea574 \
-        366ef4d8678e49c3d0dd4f8e7dd753d4 \
+        4272c279b06b88f8b0ffce7109348e27 \
+        d4c929fc9daf131daef04ee7eaa91fd4 \
         333b4ba3f64c35b6f89b521e8d64548b \
-        0d6976e8a1a1e69abc8ba8f6966cddb8 \
-        689203efc084fc0f1d1f74f5d354ae75 \
+        8b01b016a9b6deebc1b43f296057efb5 \
         1092a4a24e80f8856efc71af51a06114 \
         6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         db96b50050277bf05a3c68534bbb9586 \
         b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
-        ce68e06a2cd4f180747cf169fc388a95"
+        0498c4a11448bfc35dc7bb2caa64c753"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fdclone/01_previous_changes.patch b/system/fdclone/01_previous_changes.patch
new file mode 100644
index 0000000000..af32350eaf
--- /dev/null
+++ b/system/fdclone/01_previous_changes.patch
@@ -0,0 +1,85 @@
+Description: configure fdclone for works properly under Debian
+ This allows for customize fdclone configuration for works 
+ properly under Debian. Originally 01_previous_changes.dpatch
+Author: Sandro Tosi <matrixhasu@gmail.com>
+
+Index: fdclone/Configur
+===================================================================
+--- fdclone.orig/Configur
++++ fdclone/Configur
+@@ -679,12 +679,7 @@ fi
+ if isexist "sysconf(0)"; then
+ 	echo "#define	USESYSCONF"
+ fi
+-if isexist "_llseek(0,0,0,0,0)" linux/unistd "static _syscall5(int, _llseek,
+-	unsigned int, fd,
+-	unsigned long, ofs_h,
+-	unsigned long, ofs_l,
+-	long long *, result,
+-	unsigned int, whence);
++if isexist "_llseek(0,0,0,0,0)" "sys/syscall" "#define _llseek(fd, ofs_h, ofs_l, result, whence) syscall(SYS__llseek, fd, ofs_h, ofs_l, result, whence)
+ "; then
+ 	echo "#define	USELLSEEK"
+ fi
+Index: fdclone/config.hin
+===================================================================
+--- fdclone.orig/config.hin
++++ fdclone/config.hin
+@@ -3,4 +3,4 @@
+  *
+  *	definitions for each OS
+  */
+-
++#define USEDATADIR
+Index: fdclone/dosdisk.c
+===================================================================
+--- fdclone.orig/dosdisk.c
++++ fdclone/dosdisk.c
+@@ -23,6 +23,7 @@
+ #include "mntinfo.h"
+ #include <sys/mount.h>
+ #include <linux/unistd.h>
++#include <sys/syscall.h>
+ # ifndef	BLKFLSBUF
+ # include <linux/fs.h>
+ # endif
+@@ -378,12 +379,7 @@ static CONST char *inhibitname[] = INHIB
+ #ifdef	USELLSEEK
+ # ifdef	_syscall5
+ # undef	_llseek
+-static _syscall5(int, _llseek,
+-	u_int, fd,
+-	u_long, ofs_h,
+-	u_long, ofs_l,
+-	l_off_t *, result,
+-	u_int, whence);
++#define _llseek(fd, ofs_h, ofs_l, result, whence) syscall(SYS__llseek, fd, ofs_h, ofs_l, result, whence)
+ # endif
+ 
+ static l_off_t NEAR Xllseek(fd, offset, whence)
+Index: fdclone/fd.h
+===================================================================
+--- fdclone.orig/fd.h
++++ fdclone/fd.h
+@@ -95,8 +95,8 @@ extern char *_mtrace_file;
+  *	If you don't like the following tools as each uses,	*
+  *	you should rewrite another suitable command name.	*
+  ****************************************************************/
+-#define	PAGER			"more%K"	/* to view file */
+-#define	EDITOR			"vi"		/* to edit file */
++#define	PAGER			"/usr/bin/pager"	/* to view file */
++#define	EDITOR			"/usr/bin/editor"	/* to edit file */
+ 
+ 
+ /****************************************************************
+Index: fdclone/version.h
+===================================================================
+--- fdclone.orig/version.h
++++ fdclone/version.h
+@@ -4,5 +4,5 @@
+  *	version number
+  */
+ 
+-char *distributor = NULL;
++char *distributor = "sano@debian.org (Taketoshi Sano)";
+ static char version[] = "@(#)fd.c  3.01j 07/27/19";
diff --git a/system/fdclone/30_makefilein_setting.patch b/system/fdclone/30_makefilein_setting.patch
new file mode 100644
index 0000000000..fd5e9c74f3
--- /dev/null
+++ b/system/fdclone/30_makefilein_setting.patch
@@ -0,0 +1,53 @@
+Description: install files in the correctly Debian's path
+ This setting values to install files in the correctly Debian's path.
+
+Index: fdclone/Makefile.in
+===================================================================
+--- fdclone.orig/Makefile.in
++++ fdclone/Makefile.in
+@@ -12,7 +12,7 @@ MANSEC	= 1
+ BINTOP	= $(PREFIX)/bin
+ BINDIR	= $(BUILD)$(BINTOP)
+ DATATOP	= $(PREFIX)/share
+-DATADIR	= $(BUILD)$(DATATOP)/fd
++DATADIR	= $(BUILD)$(DATATOP)/fdclone
+ MANTOP	= $(PREFIX)/man
+ MANDIR	= $(BUILD)$(MANTOP)/man$(MANSEC)
+ CATDIR	= $(BUILD)$(MANTOP)/cat$(MANSEC)
+@@ -484,24 +484,24 @@ install-runcom:
+ 
+ install-table: $(TABLE) mkdir_p$(EXE)
+ 	-if [ -f $(UNITBL) ]; then \
+-		[ -d __DATADIR__ ] || ./mkdir_p$(EXE) __DATADIR__; \
+-		$(INSTALL) $(UNITBL) __DATADIR__; \
+-		$(CHMOD) a+r-x __DATADIR__/$(UNITBL); \
++		[ -d $(DATADIR) ] || ./mkdir_p$(EXE) $(DATADIR); \
++		$(INSTALL) $(UNITBL) $(DATADIR); \
++		$(CHMOD) a+r-x $(DATADIR)/$(UNITBL); \
+ 	fi
+ 	-if [ -f $(DICTTBL) ]; then \
+-		[ -d __DATADIR__ ] || ./mkdir_p$(EXE) __DATADIR__; \
+-		$(INSTALL) $(DICTTBL) __DATADIR__; \
+-		$(CHMOD) a+r-x __DATADIR__/$(DICTTBL); \
++		[ -d $(DATADIR) ] || ./mkdir_p$(EXE) $(DATADIR); \
++		$(INSTALL) $(DICTTBL) $(DATADIR); \
++		$(CHMOD) a+r-x $(DATADIR)/$(DICTTBL); \
+ 	fi
+ 	-if [ -f $(CATTBL) ]; then \
+-		[ -d __DATADIR2__ ] || ./mkdir_p$(EXE) __DATADIR2__; \
+-		$(INSTALL) $(CATTBL) __DATADIR2__; \
+-		$(CHMOD) a+r-x __DATADIR2__/$(CATTBL); \
++		[ -d $(DATADIR)/$(VERSION) ] || ./mkdir_p$(EXE) $(DATADIR)/$(VERSION); \
++		$(INSTALL) $(CATTBL) $(DATADIR)/$(VERSION); \
++		$(CHMOD) a+r-x $(DATADIR)/$(VERSION)/$(CATTBL); \
+ 	fi
+ 	-if [ -f $(ECATTBL) ]; then \
+-		[ -d __DATADIR2__ ] || ./mkdir_p$(EXE) __DATADIR2__; \
+-		$(INSTALL) $(ECATTBL) __DATADIR2__; \
+-		$(CHMOD) a+r-x __DATADIR2__/$(ECATTBL); \
++		[ -d $(DATADIR)/$(VERSION) ] || ./mkdir_p$(EXE) $(DATADIR)/$(VERSION); \
++		$(INSTALL) $(ECATTBL) $(DATADIR)/$(VERSION) ; \
++		$(CHMOD) a+r-x $(DATADIR)/$(VERSION)/$(ECATTBL); \
+ 	fi
+ 
+ install-man: $(MANSRC) mkdir_p$(EXE)
diff --git a/system/fdclone/README b/system/fdclone/README
new file mode 100644
index 0000000000..dfb23f42fb
--- /dev/null
+++ b/system/fdclone/README
@@ -0,0 +1,12 @@
+fdclone (two-pane textmode file manager)
+
+FDclone is a file & directory maintenance tool for UNIX-based OSes. It
+is a clone of "FD" for MS-DOS, made by Mr. A.Idei in 1989.
+
+fdclone has excellent Japanese language UI, documentation, and
+character encoding support, since it originates in Japan.
+
+The executable is installed as /usr/bin/fdclone, which means this
+build doesn't conflict with system/fd. However, if you don't have fd
+installed, a symlink /usr/bin/fd is created so you can just type "fd"
+to run this.
diff --git a/system/fdclone/doinst.sh b/system/fdclone/doinst.sh
new file mode 100644
index 0000000000..35eeb79424
--- /dev/null
+++ b/system/fdclone/doinst.sh
@@ -0,0 +1,22 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+}
+
+config etc/fdclone/fd2rc.siteconfig.new
+
+# If there's no fd link, take over:
+if [ ! -r usr/bin/fd ]; then
+  ( cd usr/bin ; rm -rf fd )
+  ( cd usr/bin ; ln -sf fdclone fd )
+  ( cd usr/man/man1 ; rm -rf fd.1.gz )
+  ( cd usr/man/man1 ; ln -sf fdclone.1.gz fd.1.gz )
+  ( cd usr/man/ja/man1 ; rm -rf fd.1.gz )
+  ( cd usr/man/ja/man1 ; ln -sf fdclone.1.gz fd.1.gz )
+fi
diff --git a/system/fdclone/fd2rc b/system/fdclone/fd2rc
new file mode 100644
index 0000000000..4f24272d1e
--- /dev/null
+++ b/system/fdclone/fd2rc
@@ -0,0 +1,613 @@
+# /etc/fdclone/fd2rc: Initialize file for FD
+#
+#  This Slackware package provides /etc/fdclone/fd2rc.siteconfig for 
+#  site specific settings.  Please use it for your customization,
+#  and leave this file alone for smooth upgrade.
+#
+#  20201118 bkw:
+#  This file was taken from the Debian package, and modified slightly.
+#  To see the changes, search within the file for the string "bkw:".
+#
+#  There are some settings in this configuration file
+#  which differ from the upstream default:
+#
+#     DISPLAYMODE=3 (sym-link status & file type symbol)
+#     ADJTTY=1 (adjust TTY when exiting)
+#     TMPDIR=$HOME   (for security reasons)
+#     TMPUMASK=077   (same above)
+#     LANGUAGE=$LANG (bkw: and MESSAGELANG=$LANG)
+#     INPUTKCODE=$LANG
+#     FNAMEKCODE=$LANG
+#
+#     Launcher settings
+#        for files with suffix as .zip, .Z, .gz. .bz2
+#        for deb package (.deb) and rpm package (.rpm)
+#     Archiver settings
+#        for files with suffix as .zip
+#        for deb package (.deb) and rpm package (.rpm)
+#
+#     Some keycode settings for linux console, xterm, and kterm.
+#
+#  fdclone can use the environment variables PAGER and EDITOR,
+#  but the settings from the configuration file such as 
+#  /etc/fdclone/fd2rc or $HOME/.fd2rc will be prefered and
+#  the settings in the environment variables are ignored in
+#  this case.
+#  (/etc/fdclone/fd2rc includes /etc/fdclone/fd2rc.siteconfig)
+#
+#  So the default runcom file (i.e. this file, /etc/fdclone/fd2rc)
+#  in this package don't set these variables as default.
+#  If you like to set the PAGER&EDITOR settings as the site default,
+#  plese put the following 2 lines in /etc/fdclone/fd2rc.siteconfig.
+#
+#    PAGER=/usr/bin/pager%K  (or the pager which you like)
+#    EDITOR=/usr/bin/editor  (or the editor which you like)
+#
+#  `%K' means that fd waits for the key input when the pager finishes.
+#  This is useful for simple pagers such like `more', since they just
+#  quits soon when they show all the contents of the specified file.
+#  But if you use others such like `less' or `lv', then you wish to
+#  disable this by eliminating `%K' at the end, since the pager itself
+#  prompts user to quit. 
+#  Please refer the manual page of `fd' for more detail.
+
+# to set default sort type
+#	0: not sort (Default)
+#	1: alphabetical	9: alphabetical (reversal)
+#	2: extension	10: extension (reversal)
+#	3: size		11: size (reversal)
+#	4: date		12: date (reversal)
+#	5: length	13: length (reversal)
+#	100-113: preserve previous sort type
+#		(the least 2 digits are effective just after initialize)
+#SORTTYPE=0
+
+# to set default display mode
+#	0: normal (Default)
+#	1: sym-link status
+#	2: 			file type symbol
+#	3: sym-link status &	file type symbol
+#	4: 						invisible dot file
+#	5: sym-link status &				invisible dot file
+#	6: 			file type symbol &	invisible dot file
+#	7: sym-link status &	file type symbol &	invisible dot file
+DISPLAYMODE=3
+
+# whether if sort or not in tree mode
+#	0: not sort (Default)
+#	>= 1: sort according to SORTTYPE
+#SORTTREE=0
+
+# behavior about writing over directory on file system
+#	0: confirm to write or not, after directory arranged (Default)
+#	1: write directory only if commanded
+#	2: never write over directory even if commanded
+#WRITEFS=0
+
+# whether if ignore uppercase or lowercase in filename comparison
+#	0: not ignore (Default)
+#	>= 1: ignore
+#IGNORECASE=0
+
+# whether if inherit timestamp or not when copying
+#	0: not inherit (Default)
+#	>= 1: inherit
+#INHERITCOPY=0
+
+# whether if adjust tty or not when exiting
+#	0: not adjust (Default)
+#	>= 1: adjust
+ADJTTY=1
+
+# whether if prioritize VT100 escape sequence or not for getting terminal size
+#	0: not prioritize (Default)
+#	>= 1: prioritize
+#USEGETCURSOR=0
+
+# to set default columns of file in 1 line
+#	1: 1 column
+#	2: 2 columns (Default)
+#	3: 3 columns
+#	5: 5 columns
+#DEFCOLUMNS=2
+
+# minimum columns of filename field
+#	Default: 12
+#MINFILENAME=12
+
+# history file of sh mode
+#	Default: ~/.fd_history
+#HISTFILE=~/.fd_history
+
+# history size of sh mode
+#	Default: 50
+#HISTSIZE=50
+
+# history size of path input
+#	Default: 50
+#DIRHIST=50
+
+# size of saved history
+#	Default: 50
+#SAVEHIST=50
+
+# limit of counting files in directory, on tree mode
+#	Default: 50
+#DIRCOUNTLIMIT=50
+
+# whether if make MS-DOS drive effective
+#	0: not use (Default)
+#	>= 1: effective
+#DOSDRIVE=0
+
+# whether if display the second hand of clock
+#	0: not display (Default)
+#	>= 1: display
+#SECOND=0
+
+# whether if use the screen layout based on the traditional "FD"
+#	0: original layout (Default)
+#	>= 1: traditional layout
+#TRADLAYOUT=0
+
+# whether if show the info. of filesize
+#	0: not show (Default)
+#	>= 1: show
+#SIZEINFO=0
+
+# whether if support ANSI color escape sequence
+#	0: monochrome (Default)
+#	1: color
+#	2: color & force background to blacken
+#	3: color & force foreground to blacken
+# 20201118 bkw: enable this by default, it's 2020 and you should be using
+# a terminal that supports color by now.
+ANSICOLOR=2
+
+# specify color palette in the ANSI color mode
+#	Default: none
+#	0: black
+#	1: red
+#	2: green
+#	3: yellow
+#	4: blue
+#	5: magenta
+#	6: cyan
+#	7: white
+#	8: default color for foreground
+#	9: default color for background
+#	default palette: 8962435188
+#	                 ||||||||||
+#	normal file -----+|||||||||
+#	background -------+||||||||
+#	directory ---------+|||||||
+#	unwritable ---------+||||||
+#	unreadable ----------+|||||
+#	symbolic link --------+||||
+#	socket ----------------+|||
+#	fifo (named pipe) ------+||
+#	block device ------------+|
+#	character device ---------+
+# 20201118 bkw: set the default here
+ANSIPALETTE="8962435188"
+
+# select edit mode with your favorite editor type
+#	emacs: ^P, ^N, ^F, ^B, ... (Default)
+#	wordstar ^E, ^X, ^D, ^S, ...
+#	vi: k, j, l, h, ...
+#EDITMODE=emacs
+
+# whether if loop cursor moving within the same page
+#	0: not loop (Default)
+#	>= 1: loop
+#LOOPCURSOR=0
+
+# temporary directory where archive file is unpacked
+#	Default: /tmp
+TMPDIR=$HOME
+
+# file creation mask for the temporary directory
+#	Default: 022
+TMPUMASK=077
+
+# mount point of CD-ROM with iso-9660 rock ridge format
+#	Default: none
+#RRPATH=""
+
+# directories on which browsing precedes getting file status
+#	Default: none
+#PRECEDEPATH=""
+
+# shell prompt strings
+#	Default: "$ "
+#PS1="$ "
+
+# continuous shell prompt strings
+#	Default: "> "
+#PS2="> "
+
+# whether if not use control sequences in the internal shell
+#	0: use (Default)
+#	>= 1: not use
+#DUMBSHELL=0
+
+# whether if hold the UNICODE translation table on memory
+#	0: not hold (Default)
+#	>= 1: hold
+#UNICODEBUFFER=0
+
+# language code type to display
+#	Default: No convert
+#	euc, EUC: EUC-JP
+#	sjis, SJIS: Shift JIS
+#	jis, JIS: 7bits JIS
+#	jis8, JIS8: 8bits JIS
+#	junet, JUNET: ISO-2022-JP
+#	ojis, OJIS: old 7bits JIS
+#	ojis8, OJIS8: old 8bits JIS
+#	ojunet, OJUNET: old ISO-2022-JP
+#	utf8, UTF8: UTF-8
+#	utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+#	eng, ENG, C: English
+LANGUAGE=$LANG
+
+# 20201118 bkw: makes no sense not to set this also!
+MESSAGELANG=$LANG
+
+# language code type to input
+#	Default: No convert
+#	euc, EUC: EUC-JP
+#	sjis, SJIS: Shift JIS
+#	utf8, UTF8: UTF-8
+#	utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+INPUTKCODE=$LANG
+
+# language code type in filename
+#	Default: No convert
+#	euc, EUC: EUC-JP
+#	sjis, SJIS: Shift JIS
+#	jis, JIS: 7bits JIS
+#	jis8, JIS8: 8bits JIS
+#	junet, JUNET: ISO-2022-JP
+#	ojis, OJIS: old 7bits JIS
+#	ojis8, OJIS8: old 8bits JIS
+#	ojunet, OJUNET: old ISO-2022-JP
+#	hex, HEX: HEX
+#	cap, CAP: CAP
+#	utf8, UTF8: UTF-8
+#	utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+FNAMEKCODE=$LANG
+
+# directories on which language code type in filename is SJIS
+#	Default: none
+#SJISPATH=""
+
+# directories on which language code type in filename is EUC-JP
+#	Default: none
+#EUCPATH=""
+
+# directories on which language code type in filename is 7bits JIS
+#	Default: none
+#JISPATH=""
+
+# directories on which language code type in filename is 8bits JIS
+#	Default: none
+#JIS8PATH=""
+
+# directories on which language code type in filename is ISO-2022-JP
+#	Default: none
+#JUNETPATH=""
+
+# directories on which language code type in filename is old 7bits JIS
+#	Default: none
+#OJISPATH=""
+
+# directories on which language code type in filename is old 8bits JIS
+#	Default: none
+#OJIS8PATH=""
+
+# directories on which language code type in filename is old ISO-2022-JP
+#	Default: none
+#OJUNETPATH=""
+
+# directories on which language code type in filename is HEX
+#	Default: none
+#HEXPATH=""
+
+# directories on which language code type in filename is CAP
+#	Default: none
+#CAPPATH=""
+
+# directories on which language code type in filename is UTF-8
+#	Default: none
+#UTF8PATH=""
+
+# directories on which language code type in filename is UTF-8 for Mac OS X
+#	Default: none
+#UTF8MACPATH=""
+
+# directories on which language code type in filename is not converted
+#	Default: none
+#NOCONVPATH=""
+
+#PAGER=more%K
+#EDITOR=vi
+#SHELL=/bin/sh
+
+# for Mischievous Japanese OS (see `man fd')
+#export	LANG=C
+
+# launcher definition
+#(Default)
+#launch ".lzh"		"lha l" \
+#		-f "%a %u/%g %s %x %m %d %{yt} %*f" \
+#		-f "%9a %u/%g %s %x %m %d %{yt} %*f" \
+#		-i " PERMSSN * UID*GID *" \
+#		-i "----------*" \
+#		-i " Total * file* ???.*%*" \
+#launch ".tar"		"tar tvf" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#launch ".tar.Z"	"zcat %C|tar tvf -" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#launch ".tar.gz"	"gzip -cd %C|tar tvf -" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#launch ".tar.bz2"	"bzip2 -cd %C|tar tvf -" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#launch ".taZ"		"zcat %C|tar tvf -" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#launch ".taz"		"gzip -cd %C|tar tvf -" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#launch ".tgz"		"gzip -cd %C|tar tvf -" \
+#		-f "%a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" \
+#		-f "%a %l %u %g %s %m %d %{yt} %*f" \
+#		-f "%10a %u/%g %s %m %d %t %y %*f" \
+#		-f "%9a %u/%g %s %m %d %t %y %*f" \
+#		-f "%a %u/%g %m %d %t %y %*f"
+#(Examples)
+launch ".zip"	"unzip -lqq"		" %s %m-%d-%y %t %*f"
+#launch ".zoo"	"zoo lq"		" %s %x %x %d %m %y %t %*f"
+#launch ".rar"	"unrar v" \
+#		-f " %*f\n%s %x %x %d-%m-%y %t %a" \
+#		-i "UNRAR *" \
+#		-i "RAR *" \
+#		-i "Shareware version *" \
+#		-i "Verifying authenticity *" \
+#		-i "Solid archive *" \
+#		-i "Archive *" \
+#		-i "Pathname/Comment" \
+#		-i "Size * Packed *" \
+#		-i "----------*" \
+#		-i "* * * ??%" \
+#		-i "Old style *" \
+#		-i "Archive *.rar" \
+#		-i "created at ??:??:?? *" \
+#		-i "by * *" \
+#		-i ""
+launch ".Z"	"zcat %C|$PAGER"
+launch ".gz"	"gzip -cd %C|$PAGER"
+launch ".bz2"	"bzip2 -cd %C|$PAGER"
+
+# examples for MS-DOS
+#launch ".lzh"		"lha v %S" %
+#		-f "%*f\n%s %x %x %y-%m-%d %t %a" %
+#		-f "%1x %12f %s %x %x %y-%m-%d %t %a" %
+#		-i "Listing of archive : *" %
+#		-i "  Name          Original *" %
+#		-i "--------------*" %
+#		-i "* files * ???.?%%%% ??-??-?? ??:??:??" %
+#		-i ""
+#launch ".tar.Z"	"gzip -cd %S|tar tvf -" %
+#		-f "%a %u/%g %s %m %d %t %y %*f" %
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" %
+#		-f "%a %u/%g %s %m %d %y %t %*f" %
+#launch ".tar.gz"	"gzip -cd %S|tar tvf -" %
+#		-f "%a %u/%g %s %m %d %t %y %*f" %
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" %
+#		-f "%a %u/%g %s %m %d %y %t %*f" %
+#launch ".tar.bz2"	"bzip2 -cd %S|tar tvf -" %
+#		-f "%a %u/%g %s %m %d %t %y %*f" %
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" %
+#		-f "%a %u/%g %s %m %d %y %t %*f" %
+#launch ".taz"		"gzip -cd %S|tar tvf -" %
+#		-f "%a %u/%g %s %m %d %t %y %*f" %
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" %
+#		-f "%a %u/%g %s %m %d %y %t %*f" %
+#launch ".tgz"		"gzip -cd %S|tar tvf -" %
+#		-f "%a %u/%g %s %m %d %t %y %*f" %
+#		-f "%a %u/%g %s %y-%m-%d %t %*f" %
+#		-f "%a %u/%g %s %m %d %y %t %*f" %
+#launch ".zip"	"unzip -lqq %S"		" %s %y-%m-%d %t %*f"
+#launch ".zip"	"pkunzip -vb %S"	" %s %x %x %x %y-%m-%d %t %*f" 14 2
+
+#
+# Debian package settings
+launch ".deb" "ar p %C data.tar.gz|gzip -dc|tar tvf - "\
+                   "%a %u/%g %s %y-%m-%d %t %f"
+launch ".rpm" "rpm2cpio %C|cpio -tv"  "%a %x %u %g %s %m %d %y %f"
+
+
+# archiver definition
+#(Default)
+# 20201118 bkw: uncommented these
+arch ".lzh"	"lha aq %C %TA"			"lha xq %C %TA"
+arch ".tar"	"tar cf %C %T"			"tar xf %C %TA"
+arch ".tar.Z"	"tar cf - %T|compress -c > %C"	"zcat %C|tar xf - %TA"
+arch ".tar.gz"	"tar cf - %T|gzip -c > %C"	"gzip -cd %C|tar xf - %TA"
+arch ".tar.bz2" \
+		"tar cf - %T|bzip2 -c > %C"	"bzip2 -cd %C|tar xf - %TA"
+arch ".taZ"	"tar cf - %T|compress -c > %C"	"zcat %C|tar xf - %TA"
+arch ".taz"	"tar cf - %T|gzip -c > %C"	"gzip -cd %C|tar xf - %TA"
+arch ".tgz"	"tar cf - %T|gzip -c > %C"	"gzip -cd %C|tar xf - %TA"
+#(Examples)
+arch ".zip"	"zip -q %C %TA"			"unzip -q %C %TA"
+arch ".zoo"	"zoo aq %C %TA"			"zoo xq %C %TA"
+arch ".rar"	"rar a -inul %C %TA"		"unrar x -inul %C %TA"
+
+# examples for MS-DOS
+#arch ".lzh"	"lha a %S %TA"			"lha x %S %TA"
+#arch ".tar.Z"	"tar cf - %T|compress -c > %C"	"gzip -cd %S|tar xf - %TA"
+#arch ".tar.gz"	"tar cf - %T|gzip -c > %C"	"gzip -cd %S|tar xf - %TA"
+#arch ".tar.bz2" %
+#		"tar cf - %T|bzip2 -c > %C"	"bzip2 -cd %S|tar xf - %TA"
+#arch ".taz"	"tar cf - %T|compress -c > %C"	"gzip -cd %S|tar xf - %TA"
+#arch ".tgz"	"tar cf - %T|gzip -c > %C"	"gzip -cd %S|tar xf - %TA"
+#arch ".zip"	"pkzip %S %TA"			"pkunzip %S %TA"
+
+#
+# Debian package settings
+arch ".deb"    "clear; echo ERROR; false"\
+       "ar p %C data.tar.gz|gzip -dc|tar -xf - %TA"
+arch ".rpm"   "clear; echo ERROR; false"      "rpm2cpio %C|cpio -id %TA"
+
+# key bind definition
+#(Examples)
+#bind 'I'	"dir -d %C"
+#bind 'g'	"gzip %C%K"	WARNING_BELL
+#bind 'G'	"gzip -d %C%K"	WARNING_BELL
+#bind 'R'	"grep %R %C"
+#bind '{'	ROLL_UP
+#bind '}'	ROLL_DOWN
+#bind '~'	"cd ~%N%K"
+#bind 'F1'	"man fd%N%K"	:Manual
+
+# function definition
+#(Example1)
+#rename() {
+#	MARK_ALL 0
+#	MARK_FIND $1
+##	RENAME_FILE $2
+#	evalmacro mv %M $2
+#}
+#
+#(Example2: used in archiver definition)
+#maketaz() {
+#	evalmacro tar cf %X.tar %T
+#	evalmacro $1 %X.tar
+#	evalmacro mv %X.tar.$2 %X.$3
+#}
+#
+#(Example3: ftp browsing)
+#getftp() {
+#	FHOST=$1
+#	FPATH=
+#	browse -@ - <<'EOF0'
+#	'ftp -n $FHOST <<-EOF
+#	user ftp `whoami`@`hostname`
+#	dir $FPATH
+#	quit
+#	EOF'
+#	-f "%a %l %u %g %s %m %d %{yt} %*f"
+#	-i "total *"
+#	-e "Not connected."
+#	-e "Login incorrect."
+#	-e "Login failed."
+#	-p 'FPATH=$1; while [ "$#" -gt 1 ]; do shift; FPATH=$1/$FPATH; done'
+#	-d loop
+#
+#	'dir=`readline "Dir: "` && [ -d "$dir" ] \
+#	&& yesno "copy \"$FPATH\" to \"$dir\" ?" \
+#	&& ftp -n $FHOST <<-EOF \
+#	&& echo "copy \"$FPATH\" to \"$dir\"." %K \
+#	|| echo canceled.
+#	user ftp `whoami`@`hostname`
+#	get $FPATH $dir/${FPATH##*/}
+#	quit
+#	EOF'
+#EOF0
+#}
+
+# MS-DOS drive definition
+#(Example)
+#setdrv B	"/dev/rfd00a"	2, 18, 80
+
+# alias definition
+#(Example)
+#alias dir="ls -laF"
+
+# keymap definition
+#(Example)
+#keymap DEL	"\033[3~"
+
+# common keycode settings for xterm and kterm
+ xtermkey()
+  {
+	keymap HOME	"\033OH"
+	keymap END	"\033OF"
+	#keymap INS	"\033[2~"
+	#keymap DEL	"\033[3~"
+	keymap BS	"\177"
+	#keymap PPAGE	"\033[5~"
+	#keymap NPAGE	"\033[6~"
+	#keymap RET	"\033OM"
+	keymap F5	"\033[15~"
+	keymap F6	"\033[17~"
+	keymap F7	"\033[18~"
+	keymap F8	"\033[19~"
+	keymap F9	"\033[20~"
+	keymap F10	"\033[21~"
+	keymap F11	"\033[23~"
+	keymap F12	"\033[24~"
+	keymap PLUS	"\033Ok"
+	keymap MINUS	"\033Om"
+	keymap ASTER	"\033Oj"
+	keymap SLASH	"\033Oo"
+  }
+
+# keycode settings for various terminals
+ case $TERM in
+   linux)
+	LANGUAGE=eng
+	;;
+   xterm)
+	LANGUAGE=eng
+	keymap F1	"\033OP"
+	keymap F2	"\033OQ"
+	keymap F3	"\033OR"
+	keymap F4	"\033OS"
+	xtermkey
+	;;
+   kterm)
+	keymap F1	"\033[11~"
+	keymap F2	"\033[12~"
+	keymap F3	"\033[13~"
+	keymap F4	"\033[14~"
+	xtermkey
+	;;
+ esac
+
+unset xtermkey
+
+# for site specific settings
+source /etc/fdclone/fd2rc.siteconfig
+
diff --git a/system/fdclone/fdclone.SlackBuild b/system/fdclone/fdclone.SlackBuild
new file mode 100644
index 0000000000..5eb5e8302a
--- /dev/null
+++ b/system/fdclone/fdclone.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Slackware build script for fdclone
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This build script owes a debt to the Debian fdclone build
+# script. Unlike the Debian build though, I install the binary & man
+# pages as "fdclone", not "fd", because SBo already has an "fd". I
+# also don't see the point of the stub fdsh man page.
+
+PRGNAM=fdclone
+SRCNAM=FD
+VERSION=${VERSION:-3.01j}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  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
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Patches from Debian. Not going to apply the one that stops the
+# Makefile from stripping the binary, since that's what we want.
+patch -p1 < $CWD/01_previous_changes.patch
+patch -p1 < $CWD/30_makefilein_setting.patch
+
+# Set the default pager & editor to things that actually exist on
+# Slackware. The user's EDITOR and PAGER will override these, or they
+# can be set system-wide by the admin, in the config file.
+FDPAGER=${FDPAGER:-less}  ; FDPAGER=$( which $FDPAGER )
+FDEDITOR=${FDEDITOR:-vim} ; FDEDITOR=$( which $FDEDITOR )
+
+sed -i -e "s,/usr/bin/pager,$FDPAGER," \
+       -e "s,/usr/bin/editor,$FDEDITOR," \
+       fd.h
+
+make config
+make CFLAGS="$SLKCFLAGS" \
+     PREFIX=/usr \
+     CONFDIR=/etc/$PRGNAM
+
+# make install fails to create this:
+mkdir -p $PKG/usr/man/man1
+
+make install \
+     PREFIX=$PKG/usr \
+     DATADIR=$PKG/usr/share/$PRGNAM \
+     MANDIR=$PKG/usr/man/man1 \
+     EMANDIR=$PKG/usr/man/man1 \
+     JMANDIR=$PKG/usr/man/ja/man1 \
+     JCATDIR=$PKG/usr/man/ja/man1 \
+     DEFRC=$PKG/etc/$PRGNAM/fd2rc
+
+# Rename to avoid conflict with system/fd
+rename /fd /$PRGNAM \
+  $PKG/usr/bin/fd \
+  $PKG/usr/man/man1/fd.1 \
+  $PKG/usr/man/ja/man1/fd.1
+
+# De-hardlinkify
+rm -f $PKG/usr/bin/fdsh
+ln -s $PRGNAM $PKG/usr/bin/fdsh
+rm -f $PKG/usr/man/man1/fdsh.1 $PKG/usr/man/ja/man1/fdsh.1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1 $PKG/usr/man/ja/man1/$PRGNAM.1
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/fdsh.1.gz
+ln -s $PRGNAM.1.gz $PKG/usr/man/ja/man1/fdsh.1.gz
+
+# Don't install fd2rc as a .new config, since it sources
+# fd2rc.siteconfig, which can override anything in fd2rc,
+# and the comments at the top explain this clearly.
+mkdir -p $PKG/etc/$PRGNAM
+cat $CWD/fd2rc > $PKG/etc/$PRGNAM/fd2rc
+echo "# fd2rc.siteconfig - see fd2rc for options you can use here" > \
+  $PKG/etc/$PRGNAM/fd2rc.siteconfig.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a FAQ* HISTORY* LICENSES* README* TECHKNOW* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/system/fdclone/fdclone.info b/system/fdclone/fdclone.info
new file mode 100644
index 0000000000..7172c22de0
--- /dev/null
+++ b/system/fdclone/fdclone.info
@@ -0,0 +1,10 @@
+PRGNAM="fdclone"
+VERSION="3.01j"
+HOMEPAGE="http://hp.vector.co.jp/authors/VA012337/soft/fd/"
+DOWNLOAD="http://hp.vector.co.jp/authors/VA012337/soft/fd/FD-3.01j.tar.gz"
+MD5SUM="81f4b5a2aa50afac8c1677d34a646a7e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/fdclone/slack-desc b/system/fdclone/slack-desc
new file mode 100644
index 0000000000..0a69b2b38e
--- /dev/null
+++ b/system/fdclone/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+fdclone: fdclone (two-pane textmode file manager)
+fdclone:
+fdclone: FDclone is a file & directory maintenance tool for UNIX-based OSes. It
+fdclone: is a clone of "FD" for MS-DOS, made by Mr. A.Idei in 1989.
+fdclone:
+fdclone: fdclone has excellent Japanese language UI, documentation, and
+fdclone: character encoding support, since it originates in Japan.
+fdclone:
+fdclone:
+fdclone:
+fdclone:
diff --git a/system/firejail/firejail.SlackBuild b/system/firejail/firejail.SlackBuild
index 24b746d703..d4779d311d 100644
--- a/system/firejail/firejail.SlackBuild
+++ b/system/firejail/firejail.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for firejail
 
 # Copyright 2015 mwgg
-# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=firejail
-VERSION=${VERSION:-0.9.64}
+VERSION=${VERSION:-0.9.64.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/firejail/firejail.info b/system/firejail/firejail.info
index cac56f3b7a..a13f37b3ae 100644
--- a/system/firejail/firejail.info
+++ b/system/firejail/firejail.info
@@ -1,8 +1,8 @@
 PRGNAM="firejail"
-VERSION="0.9.64"
+VERSION="0.9.64.4"
 HOMEPAGE="https://firejail.wordpress.com/"
-DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.64.tar.xz"
-MD5SUM="c3bdc7f0c6a86b910a333041fd6bd9c4"
+DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.64.4.tar.xz"
+MD5SUM="e3be55266472dc8ac373c9fcfba4f9f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/firetools/firetools.SlackBuild b/system/firetools/firetools.SlackBuild
index 8d9b43ddb6..f5c930d902 100644
--- a/system/firetools/firetools.SlackBuild
+++ b/system/firetools/firetools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for firetools
 
-# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=firetools
-VERSION=${VERSION:-0.9.62}
+VERSION=${VERSION:-0.9.64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-qmake=/usr/lib${LIBDIRSUFFIX}/qt5/bin/qmake \
   --build=$ARCH-slackware-linux
 
 sed -i "s|share/man|man|g" Makefile
diff --git a/system/firetools/firetools.info b/system/firetools/firetools.info
index c0026c4338..04d18c6f79 100644
--- a/system/firetools/firetools.info
+++ b/system/firetools/firetools.info
@@ -1,10 +1,10 @@
 PRGNAM="firetools"
-VERSION="0.9.62"
+VERSION="0.9.64"
 HOMEPAGE="https://l3net.wordpress.com/projects/firejail/#firetools"
-DOWNLOAD="https://sourceforge.net/projects/firejail/files/firetools/firetools-0.9.62.tar.xz"
-MD5SUM="182684754c94088a8791c16c5f4c296e"
+DOWNLOAD="https://sourceforge.net/projects/firejail/files/firetools/firetools-0.9.64.tar.xz"
+MD5SUM="a95af117c8bd1c78a67de450a8ecb97a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="firejail"
+REQUIRES="firejail qt5"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/fuse3/README b/system/fuse3/README
index 533ab44440..fedc4c62b9 100644
--- a/system/fuse3/README
+++ b/system/fuse3/README
@@ -8,3 +8,8 @@ repository). libfuse provides the reference implementation for communicating
 with the FUSE kernel module.
 
 This ought not collide with the "fuse" package in stock slackware install.
+
+The package can optionally install extensive developer documentation. If this
+is needed, run the SlackBuild like this:
+
+FUSE3_DEVDOCS=yes ./fuse3.SlackBuild
diff --git a/system/fuse3/fuse3.SlackBuild b/system/fuse3/fuse3.SlackBuild
index 5b75bae99c..da4fbda772 100644
--- a/system/fuse3/fuse3.SlackBuild
+++ b/system/fuse3/fuse3.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fuse3
-VERSION=${VERSION:-3.9.0}
+VERSION=${VERSION:-3.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +57,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+FUSE3_DEVDOCS=${FUSE3_DEVDOCS:-no}
+
 set -e
 
 rm -rf $PKG
@@ -88,8 +90,12 @@ 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
+if [ "$FUSE3_DEVDOCS" = "yes" ]; then
+  cp -a doc/ example/ $PKG/usr/doc/$PRGNAM-$VERSION
+fi
+
 cp -a \
-  README.md LICENSE LGPL2.txt GPL2.txt doc/ example/ \
+  README.md LICENSE LGPL2.txt GPL2.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/fuse3/fuse3.info b/system/fuse3/fuse3.info
index de334d4735..25599ccf6a 100644
--- a/system/fuse3/fuse3.info
+++ b/system/fuse3/fuse3.info
@@ -1,10 +1,10 @@
 PRGNAM="fuse3"
-VERSION="3.9.0"
+VERSION="3.10.1"
 HOMEPAGE="https://github.com/libfuse/libfuse"
-DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.9.0/fuse-3.9.0.tar.xz"
-MD5SUM="5dc2be21c0d06c7eace340996e8a37e2"
+DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.10.1/fuse-3.10.1.tar.xz"
+MD5SUM="e973012119e98b048307558271b5b296"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson"
 MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbanghbash.com"
+EMAIL="vbatts@hashbangbash.com"
diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild
index 08bfb55575..ae700c1ceb 100644
--- a/system/fzf/fzf.SlackBuild
+++ b/system/fzf/fzf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fzf
 
-# Copyright 2016-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fzf
-VERSION=${VERSION:-0.23.1}
+VERSION=${VERSION:-0.27.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,12 +54,14 @@ sed -i '/^BUILD_FLAGS/s/$/ -mod=vendor/' Makefile
 
 mkdir -p vendor/github.com
 
-for DEPENDENCY in gdamore/tcell/1.3.0 \
-                  lucasb-eyer/go-colorful/1.0.3 \
+for DEPENDENCY in gdamore/encoding/1.0.0 \
+                  gdamore/tcell/1.3.0 \
+                  lucasb-eyer/go-colorful/1.2.0 \
                   mattn/go-isatty/0.0.12 \
-                  mattn/go-runewidth/0.0.8 \
-                  mattn/go-shellwords/1.0.9 \
-                  saracen/walker/324a081bae7e580aa0bf3afe8164acb16634afca ; do
+                  mattn/go-runewidth/0.0.12 \
+                  mattn/go-shellwords/1.0.11 \
+                  rivo/uniseg/0.2.0 \
+                  saracen/walker/0.1.2 ; do
   DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
   DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
   DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
@@ -71,11 +73,11 @@ for DEPENDENCY in gdamore/tcell/1.3.0 \
 done
 
 mkdir -p vendor/golang.org/x
-for DEPENDENCY in crypto/69ecbb4d6d5dab05e49161c6e77ea40a030884e1 \
+for DEPENDENCY in sync/036812b2e83c0ddf193dd5a34e034151da389d09 \
                   sys/d101bd2416d505c0448a6ce8a282482678040a89 \
-                  text/0.3.2 \
-                  sync/cd5d95a43a6e21273425c7ae415d3df9ea832eeb \
-                  xerrors/a985d3407aa71f30cf86696ee0a2f409709f22e1 ; do
+                  term/de623e64d2a6562fa463152da80477d4aa07fca0 \
+                  text/0.3.6 \
+                  tools/90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d ; do
   DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)"
   DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)"
 
@@ -90,7 +92,7 @@ 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 {} \;
 
-make
+FZF_VERSION="$VERSION" FZF_REVISION="$VERSION" make
 
 mkdir -p $PKG/usr/bin
 install -m 0755 target/fzf-linux_* $PKG/usr/bin/fzf
@@ -128,16 +130,23 @@ if [ "$WITH_VIM" = "yes" ] ; then
   mkdir -p $PKG/usr/share/vim/vimfiles/plugin
   install -m 0644 plugin/fzf.vim $PKG/usr/share/vim/vimfiles/plugin
 
+  mkdir -p $PKG/usr/share/vim/vimfiles/doc/
+  install -m 0644 doc/fzf.txt $PKG/usr/share/vim/vimfiles/doc/
+
   # neovim support
   mkdir -p $PKG/usr/share/nvim/runtime/plugin
+  mkdir -p $PKG/usr/share/nvim/runtime/doc
   (
     cd $PKG/usr/share/nvim/runtime
 
+
     ln -s ../../../vim/vimfiles/plugin/fzf.vim plugin/fzf.vim
+    ln -s ../../../vim/vimfiles/doc/fzf.txt doc/fzf.txt
   )
 else
   mkdir -p $PKG/usr/share/fzf/vim/
   install -m 0644 plugin/fzf.vim $PKG/usr/share/fzf/vim/
+  install -m 0644 doc/fzf.txt $PKG/usr/share/fzf/vim/
 fi
 
 mkdir -p $PKG/install
diff --git a/system/fzf/fzf.info b/system/fzf/fzf.info
index a064fd82a5..5f1c696425 100644
--- a/system/fzf/fzf.info
+++ b/system/fzf/fzf.info
@@ -1,30 +1,34 @@
 PRGNAM="fzf"
-VERSION="0.23.1"
+VERSION="0.27.0"
 HOMEPAGE="https://github.com/junegunn/fzf"
-DOWNLOAD="https://github.com/junegunn/fzf/archive/0.23.1/fzf-0.23.1.tar.gz \
+DOWNLOAD="https://github.com/junegunn/fzf/archive/0.27.0/fzf-0.27.0.tar.gz \
+          https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \
           https://github.com/gdamore/tcell/archive/v1.3.0/tcell-1.3.0.tar.gz \
-          https://github.com/lucasb-eyer/go-colorful/archive/v1.0.3/go-colorful-1.0.3.tar.gz \
+          https://github.com/lucasb-eyer/go-colorful/archive/v1.2.0/go-colorful-1.2.0.tar.gz \
           https://github.com/mattn/go-isatty/archive/v0.0.12/go-isatty-0.0.12.tar.gz \
-          https://github.com/mattn/go-runewidth/archive/v0.0.8/go-runewidth-0.0.8.tar.gz \
-          https://github.com/mattn/go-shellwords/archive/v1.0.9/go-shellwords-1.0.9.tar.gz \
-          https://github.com/saracen/walker/archive/324a081bae7e580aa0bf3afe8164acb16634afca/walker-324a081bae7e580aa0bf3afe8164acb16634afca.tar.gz \
-          https://github.com/golang/crypto/archive/69ecbb4d6d5dab05e49161c6e77ea40a030884e1/crypto-69ecbb4d6d5dab05e49161c6e77ea40a030884e1.tar.gz \
+          https://github.com/mattn/go-runewidth/archive/v0.0.12/go-runewidth-0.0.12.tar.gz \
+          https://github.com/mattn/go-shellwords/archive/v1.0.11/go-shellwords-1.0.11.tar.gz \
+          https://github.com/rivo/uniseg/archive/v0.2.0/uniseg-0.2.0.tar.gz \
+          https://github.com/saracen/walker/archive/v0.1.2/walker-0.1.2.tar.gz \
+          https://github.com/golang/sync/archive/036812b2e83c0ddf193dd5a34e034151da389d09/sync-036812b2e83c0ddf193dd5a34e034151da389d09.tar.gz \
           https://github.com/golang/sys/archive/d101bd2416d505c0448a6ce8a282482678040a89/sys-d101bd2416d505c0448a6ce8a282482678040a89.tar.gz \
-          https://github.com/golang/text/archive/v0.3.2/text-0.3.2.tar.gz \
-          https://github.com/golang/sync/archive/cd5d95a43a6e21273425c7ae415d3df9ea832eeb/sync-cd5d95a43a6e21273425c7ae415d3df9ea832eeb.tar.gz \
-          https://github.com/golang/xerrors/archive/a985d3407aa71f30cf86696ee0a2f409709f22e1/xerrors-a985d3407aa71f30cf86696ee0a2f409709f22e1.tar.gz"
-MD5SUM="33fbd278f9301ff0b6641fab5ed2178e \
+          https://github.com/golang/term/archive/de623e64d2a6562fa463152da80477d4aa07fca0/term-de623e64d2a6562fa463152da80477d4aa07fca0.tar.gz \
+          https://github.com/golang/text/archive/v0.3.6/text-0.3.6.tar.gz \
+          https://github.com/golang/tools/archive/90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d/tools-90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d.tar.gz"
+MD5SUM="498b121f93733e45b4c432c3549b68f8 \
+        fbadc383bc1ace79fa769fe2de36b87b \
         ad4f913e9293c655c5b7cdeba02429e8 \
-        2a1b88991050673c3928342c11d404ae \
+        191fe5cfcb58e480ff4045c82a06091a \
         56a6121ba7ae8a13dad2925edd9f11b5 \
-        af51a12aa8aaf342d266d8ede5bbc919 \
-        2bc4ce5a2fb261259ea3fd9626a1c56f \
-        59d2a11dd00e6f405ebdebe0ec22e7ee \
-        8b46ea618fa02e5c8c5a836ebf9d3960 \
+        ff86c8f58d907d46399df06b7d5565bb \
+        ca0ba2f62a0ce9d20fe9939d18135e45 \
+        71d5e8800299a85ecfd72a1833eefa4c \
+        2b8de2c0180b772eac09f19ed7cb264a \
+        45a3bb00e962f5ba158827f54bbdce4a \
         09d78ad8306fb264ebecd65e309e33ef \
-        5c3d2e3c8af2436fea967042a9623ba1 \
-        08d1d3802285a880954da8041653ad28 \
-        6396c1c7307899882c28f3938d4e6d18"
+        4fae21a5000857ef943f4f9f93d8727a \
+        f406aa34e4555c0bac8c2f00f2ab729b \
+        aa1fd192d5fd5f11f7d552eea120d495"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/gnu-unifont/README b/system/gnu-unifont/README
index 1e4ed63f18..1e7e3058f1 100644
--- a/system/gnu-unifont/README
+++ b/system/gnu-unifont/README
@@ -3,9 +3,20 @@ Unicode Basic Multilinguial Plane(BMP). The BMP is the first Unicode
 "plane" of 65,536(16bit) code points, and includes character encoding
 for most of the world's modern scripts.
 
-This package installs precompiled fonts only.
+By default, the package will include precompiled versions of the font in
+TTF (TrueType), PCF (X Window bitmap) and PSF (console) formats. This can be
+changed using FONTFORMATS environment variable, which should be set to
+comma-separated list of font formats to include in the package.
 
-By default, the package will include TTF (TrueType), PCF (X Window bitmap)
-and PSF (console) fonts. This can be changed using FONTFORMATS environment
-variable. Its default value is "ttf,pcf,psf". For example, setting
-FONTFORMATS=pcf,psf will include only PCF and PSF fonts.
+Available formats are:
+
+ttf = TrueType
+pcf = X Window bitmap
+psf = Console fonts
+otb = OpenType Bitmap fonts, compatible with recent versions of Pango which
+      don't support PCF fonts. Fonts in this format are generated by
+      converting precompiled PCF fonts using fonttosfnt tool.
+
+For example, setting FONTFORMATS=pcf,psf will include only PCF and PSF fonts.
+If FONTFORMATS variable is not set the default value "ttf,pcf,psf" is
+assumed.
diff --git a/system/gnu-unifont/gnu-unifont.SlackBuild b/system/gnu-unifont/gnu-unifont.SlackBuild
index 8fb1ec918f..85ea602913 100644
--- a/system/gnu-unifont/gnu-unifont.SlackBuild
+++ b/system/gnu-unifont/gnu-unifont.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnu-unifont
-VERSION=${VERSION:-13.0.03}
+VERSION=${VERSION:-13.0.06}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,6 +85,17 @@ if contains "$FONTFORMATS" "psf"; then
     FONTSCOPIED=1
 fi
 
+if contains "$FONTFORMATS" "otb"; then
+    mkdir -p $PKG/usr/share/fonts/misc
+    for pcf_file in *.pcf.gz; do
+        echo "Converting '$pcf_file' to OTB format."
+        otb_file=$(echo "$pcf_file" | sed 's/\.pcf\.gz$/.otb/g')
+        fonttosfnt -o "$PKG/usr/share/fonts/misc/$otb_file" "$pcf_file"
+    done
+
+    FONTSCOPIED=1
+fi
+
 cd -
 
 if [ "$FONTSCOPIED" -eq 0 ]; then
@@ -94,6 +105,9 @@ if [ "$FONTSCOPIED" -eq 0 ]; then
     exit 1
 fi
 
+# Keep the fonts names unversioned
+find -L $PKG/usr/share -type f -name "*-$VERSION*" -exec rename -- "-$VERSION" '' {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/gnu-unifont/gnu-unifont.info b/system/gnu-unifont/gnu-unifont.info
index 170cfc9bcc..fbcf5b0e78 100644
--- a/system/gnu-unifont/gnu-unifont.info
+++ b/system/gnu-unifont/gnu-unifont.info
@@ -1,8 +1,8 @@
 PRGNAM="gnu-unifont"
-VERSION="13.0.03"
+VERSION="13.0.06"
 HOMEPAGE="http://unifoundry.com/unifont/index.html"
-DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-13.0.03/unifont-13.0.03.tar.gz"
-MD5SUM="ea585627fce8b5d798161403fbfaef06"
+DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-13.0.06/unifont-13.0.06.tar.gz"
+MD5SUM="60971929464ceb99bbcca55b9ad7c796"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gnu-unifont/slack-desc b/system/gnu-unifont/slack-desc
index 3c3c36c945..259c4b902e 100644
--- a/system/gnu-unifont/slack-desc
+++ b/system/gnu-unifont/slack-desc
@@ -13,7 +13,7 @@ gnu-unifont: Unicode Basic Multilinguial Plane (BMP). The BMP is the first
 gnu-unifont: Unicode "plane" of 65,536(16bit) code points, and includes character
 gnu-unifont: encoding for most of the world's modern scripts.
 gnu-unifont:
-gnu-unifont: Homepage: http://unifoundry.com/unifont.html
+gnu-unifont: Homepage: http://unifoundry.com/unifont/index.html
 gnu-unifont:
 gnu-unifont:
 gnu-unifont:
diff --git a/system/hexec/README b/system/hexec/README
new file mode 100644
index 0000000000..c073d38384
--- /dev/null
+++ b/system/hexec/README
@@ -0,0 +1,12 @@
+hexec (hook into exec calls)
+
+hexec can be used to hook into exec system calls. It evaluates a user
+defined expression against all hooked exec calls. This expression can
+contain simple path checks (e.g. -path "*/name") and even complex bash
+scripts.
+
+As an example: hexec -name ls -exec echo {} \; bash
+
+This will run a shell, but any time you try to run "ls", you'll run
+"echo" instead. The syntax is similar to "find"; see the man page for
+details.
diff --git a/system/hexec/hexec.SlackBuild b/system/hexec/hexec.SlackBuild
new file mode 100644
index 0000000000..eebdeeefcd
--- /dev/null
+++ b/system/hexec/hexec.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for hexec
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=hexec
+VERSION=${VERSION:-0.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Why is this hardcoded in the configure script? It takes --libdir, but
+# doesn't use it for this...
+sed -i "s,/lib/$PRGNAM,/lib$LIBDIRSUFFIX/$PRGNAM," configure
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man?/*.?
+
+# NEWS and README are 0-byte placeholders. GNU thinks it can force
+# people to write documentation by requiring these files to exist...
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hexec/hexec.info b/system/hexec/hexec.info
new file mode 100644
index 0000000000..38aa37ca5f
--- /dev/null
+++ b/system/hexec/hexec.info
@@ -0,0 +1,10 @@
+PRGNAM="hexec"
+VERSION="0.2.1"
+HOMEPAGE="https://packages.debian.org/sid/hexec"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/h/hexec/hexec_0.2.1.orig.tar.gz"
+MD5SUM="ceec7e57107efecf10d943137b0f5180"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/hexec/slack-desc b/system/hexec/slack-desc
new file mode 100644
index 0000000000..ec51937b43
--- /dev/null
+++ b/system/hexec/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+hexec: hexec (hook into exec calls)
+hexec:
+hexec: hexec can be used to hook into exec system calls. It evaluates a user
+hexec: defined expression against all hooked exec calls. This expression can
+hexec: contain simple path checks (e.g. -path "*/name") and even complex bash
+hexec: scripts.
+hexec:
+hexec:
+hexec:
+hexec:
+hexec:
diff --git a/system/ifuse/ifuse.SlackBuild b/system/ifuse/ifuse.SlackBuild
index a5c9c415cc..03aecf9f2d 100644
--- a/system/ifuse/ifuse.SlackBuild
+++ b/system/ifuse/ifuse.SlackBuild
@@ -27,13 +27,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ifuse
-VERSION=${VERSION:-1.1.3}
+VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ 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"
@@ -68,10 +68,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -87,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -95,7 +95,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING* README AUTHORS \
+  COPYING* README* AUTHORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/ifuse/ifuse.info b/system/ifuse/ifuse.info
index 70d5c564d6..9270966ce9 100644
--- a/system/ifuse/ifuse.info
+++ b/system/ifuse/ifuse.info
@@ -1,8 +1,8 @@
 PRGNAM="ifuse"
-VERSION="1.1.3"
+VERSION="1.1.4"
 HOMEPAGE="http://www.libimobiledevice.org"
-DOWNLOAD="http://www.libimobiledevice.org/downloads/ifuse-1.1.3.tar.bz2"
-MD5SUM="83478c7b531b26db286c293bb25bd917"
+DOWNLOAD="https://github.com/libimobiledevice/ifuse/releases/download/1.1.4/ifuse-1.1.4.tar.bz2"
+MD5SUM="cd31fbd0ea945b2ff1e39eac8d198fdd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/info2man/README b/system/info2man/README
index 7573dd917c..2cc5940532 100644
--- a/system/info2man/README
+++ b/system/info2man/README
@@ -2,4 +2,4 @@ info2man (convert GNU info files into man pages)
 
 info2pod converts GNU info data to POD format for easy transcription to
 various formats like HTML. info2man is a wrapper for info2pod to convert
-info files into nroff -man format.
+info files into nroff/man format.
diff --git a/system/info2man/flush.pl b/system/info2man/flush.pl
deleted file mode 100644
index 8aa6d5580c..0000000000
--- a/system/info2man/flush.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This library is no longer being maintained, and is included for backward
-# compatibility with Perl 4 programs which may require it.
-#
-# In particular, this should not be used as an example of modern Perl
-# programming techniques.
-#
-# Suggested alternative: IO::Handle
-#
-;# Usage: &flush(FILEHANDLE)
-;# flushes the named filehandle
-
-;# Usage: &printflush(FILEHANDLE, "prompt: ")
-;# prints arguments and flushes filehandle
-
-sub flush {
-    local($old) = select(shift);
-    $| = 1;
-    print "";
-    $| = 0;
-    select($old);
-}
-
-sub printflush {
-    local($old) = select(shift);
-    $| = 1;
-    print @_;
-    $| = 0;
-    select($old);
-}
-
-1;
diff --git a/system/info2man/info2man.SlackBuild b/system/info2man/info2man.SlackBuild
index 385cfd6ff8..54c56d52ca 100644
--- a/system/info2man/info2man.SlackBuild
+++ b/system/info2man/info2man.SlackBuild
@@ -6,8 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# The version number below is the modification time of the newest file
-# in the source tarball.
+# 20201102 bkw: update for v1.1_9 (debian's 1.1-9)
 
 # 20140907 bkw: original site blocks downloads based on user-agent. Host
 # the src on my own server. Only the .info file changed, not the script, so
@@ -15,7 +14,7 @@
 # Original download link: http://www.cskk.ezoshosting.com/cs/css/info2man.tar.gz
 
 PRGNAM=info2man
-VERSION=${VERSION:-20040717}
+VERSION=${VERSION:-1.1_9}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -27,36 +26,46 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
+# Trying to teach myself to use bash string stuff instead of echoing
+# to 'cut' or whatever. But this is really hard to remember and read:
+SRCVER=${VERSION%%_*}
+DEBVER=${VERSION##*_}
+
 PERLMODDIR=/usr/share/info2pod
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM.tar.gz
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.gz
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/${PRGNAM}_${SRCVER}-${DEBVER}.debian.tar.xz
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Apply debian patches
+for i in $( cat debian/patches/series); do
+  patch -p1 < debian/patches/$i
+done
 
-# make the script use its own private perl module dir, so we don't
+# Make the script use its own private perl module dir, so we don't
 # pollute /usr/lib/perl5.
 sed -i -e '2iuse lib "'$PERLMODDIR'";' info2pod
 
-# this uses an ancient Perl 4 module called flush.pl. The damn thing is less
-# than 1KB in size, so I included it in the SlackBuild tarball. It came from
-# here: http://www.opensource.apple.com/source/perl/perl-21/perl/lib/flush.pl
-
 mkdir -p $PKG/usr/bin $PKG/$PERLMODDIR
 install -m0755 -oroot -groot $PRGNAM $PKG/usr/bin
 install -m0755 -oroot -groot info2pod $PKG/usr/bin
-install -m0644 -oroot -groot $CWD/flush.pl $PKG/$PERLMODDIR
 cp -r cs $PKG/$PERLMODDIR/cs
 
+# Include debian's man pages
+mkdir -p $PKG/usr/man/man1
+gzip -9c < debian/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+gzip -9c < debian/info2pod.1 > $PKG/usr/man/man1/info2pod.1.gz
+
+# 1.1_9 has 0README.txt, but it's mostly install instructions,
+# plus a bunch of cruft culled from the original author's other
+# projects. Don't bother.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/info2man/info2man.info b/system/info2man/info2man.info
index 4b94899821..d2349216cc 100644
--- a/system/info2man/info2man.info
+++ b/system/info2man/info2man.info
@@ -1,8 +1,10 @@
 PRGNAM="info2man"
-VERSION="20040717"
+VERSION="1.1_9"
 HOMEPAGE="https://packages.debian.org/sid/info2man"
-DOWNLOAD="https://slackware.uk/~urchlay/src/info2man.tar.gz"
-MD5SUM="303b9bf313e88558ff577806398f6c4c"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1-9.debian.tar.xz"
+MD5SUM="37e9cd74683e1832a4f27ad5c7961a7b \
+        0610fec52815b003df8732d3ab21f0f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/info2man/slack-desc b/system/info2man/slack-desc
index c70b27f087..4ba295af51 100644
--- a/system/info2man/slack-desc
+++ b/system/info2man/slack-desc
@@ -10,7 +10,7 @@ info2man: info2man (convert GNU info files into man pages)
 info2man:
 info2man: info2pod converts GNU info data to POD format for easy transcription
 info2man: to various formats like HTML. info2man is a wrapper for info2pod to
-info2man: convert info files into nroff -man format.
+info2man: convert info files into nroff/man format.
 info2man:
 info2man:
 info2man:
diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild
index ccb4181ef1..a2e6cacf9d 100644
--- a/system/intel-microcode/intel-microcode.SlackBuild
+++ b/system/intel-microcode/intel-microcode.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for intel-microcode
 
-# Copyright 2020 Andrzej Telszewski, Szczecin
+# Copyright 2021 Andrzej Telszewski, Szczecin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=intel-microcode
 SRCNAM=Intel-Linux-Processor-Microcode-Data-Files-microcode
-VERSION=${VERSION:-20200616}
+VERSION=${VERSION:-20210216}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
@@ -71,8 +71,7 @@ iucode_tool -v --write-earlyfw=$PKG/boot/intel-ucode.cpio \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat license > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
-cat releasenote > $PKG/usr/doc/$PRGNAM-$VERSION/RELEASE_NOTE
+cp -a license {README,releasenote,security}.md $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/intel-microcode/intel-microcode.info b/system/intel-microcode/intel-microcode.info
index c1ecd0d2f3..9d177df889 100644
--- a/system/intel-microcode/intel-microcode.info
+++ b/system/intel-microcode/intel-microcode.info
@@ -1,10 +1,10 @@
 PRGNAM="intel-microcode"
-VERSION="20200616"
+VERSION="20210216"
 HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
-DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20200616/Intel-Linux-Processor-Microcode-Data-Files-microcode-20200616.tar.gz"
-MD5SUM="b5e2f0cc9db2ed3d2760a5a859a0a387"
+DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216/Intel-Linux-Processor-Microcode-Data-Files-microcode-20210216.tar.gz"
+MD5SUM="855253d4543a4cf0a40c7fb733c4dcae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="iucode_tool"
 MAINTAINER="Andrzej Telszewski"
-EMAIL="atelszewski@gmail.com"
+EMAIL="andrzej@telszewski.com"
diff --git a/system/intelmas/intelmas.SlackBuild b/system/intelmas/intelmas.SlackBuild
index bf37bc2c97..1f385966c1 100644
--- a/system/intelmas/intelmas.SlackBuild
+++ b/system/intelmas/intelmas.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for intelmas
 
-# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2020-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=intelmas
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,7 @@ rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-unzip "$CWD/Intel*MAS_CLI_Tool_${VERSION}*Linux*.zip"
+unzip "$CWD/Intel*MAS_CLI_Tool_*Linux*.zip"
 rpm2cpio intelmas-${VERSION}*.$RPMARCH.rpm | cpio -imdv
 
 chown -R root:root .
diff --git a/system/intelmas/intelmas.info b/system/intelmas/intelmas.info
index cfaa11da57..3fe80dd80c 100644
--- a/system/intelmas/intelmas.info
+++ b/system/intelmas/intelmas.info
@@ -1,8 +1,8 @@
 PRGNAM="intelmas"
-VERSION="1.3"
-HOMEPAGE="https://downloadcenter.intel.com/download/29917"
-DOWNLOAD="https://downloadmirror.intel.com/29917/eng/Intel%C2%AE_MAS_CLI_Tool_1.3_Linux.zip"
-MD5SUM="3a632028cb23fed5c161d27c9b4e5d73"
+VERSION="1.7"
+HOMEPAGE="https://downloadcenter.intel.com/download/30379"
+DOWNLOAD="https://downloadmirror.intel.com/30379/eng/Intel%C2%AE_MAS_CLI_Tool_Linux_1.7.zip"
+MD5SUM="c07beb6b400ae2bf583c5b9fdbbb1bd3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/intelmas/slack-desc b/system/intelmas/slack-desc
index f6ce1aa6d1..8591c17410 100644
--- a/system/intelmas/slack-desc
+++ b/system/intelmas/slack-desc
@@ -13,7 +13,7 @@ intelmas: and Optane memory devices. It provides firmware update capability as
 intelmas: well as reading and setting many configuration settings.
 intelmas:
 intelmas:
-intelmas: Homepage: https://downloadcenter.intel.com/download/29917
+intelmas: Homepage: https://downloadcenter.intel.com/download/30379
 intelmas:
 intelmas:
 intelmas:
diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild
index 97ced62617..9ef57a215c 100644
--- a/system/jdupes/jdupes.SlackBuild
+++ b/system/jdupes/jdupes.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jdupes
-VERSION=${VERSION:-1.18.2}
+VERSION=${VERSION:-1.19.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +62,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+rm testdir/recursed_a/symlink_infinite_loop
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/jdupes/jdupes.info b/system/jdupes/jdupes.info
index 540e0de8a0..2193d76102 100644
--- a/system/jdupes/jdupes.info
+++ b/system/jdupes/jdupes.info
@@ -1,8 +1,8 @@
 PRGNAM="jdupes"
-VERSION="1.18.2"
+VERSION="1.19.2"
 HOMEPAGE="https://github.com/jbruchon/jdupes"
-DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.18.2/jdupes-1.18.2.tar.gz"
-MD5SUM="25d4a22383fdf26ff910a8ca02309d55"
+DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.19.2/jdupes-1.19.2.tar.gz"
+MD5SUM="db9c05aa7a1c61390cbdb41ad1ab8fb4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/jenkins/README b/system/jenkins/README
index a28a3572db..e900430c79 100644
--- a/system/jenkins/README
+++ b/system/jenkins/README
@@ -1,9 +1,11 @@
-Jenkins monitors executions of repeated jobs, such as building a software
-project or jobs run by cron. Among those things, current Jenkins focuses on the
-following two jobs:
+Jenkins monitors executions of repeated jobs, such as building a
+software project or jobs run by cron. Among those things, current
+Jenkins focuses on the following two jobs:
+
 1. Building/testing software projects continuously
 2. Monitoring executions of externally-run jobs,
 
+This slackbuild tracks the Jenkins LTS branch.
 
 Groupname and Username
 
diff --git a/system/jenkins/files/jenkins.conf b/system/jenkins/files/jenkins.conf
index fbdbcb875b..8b9688362b 100644
--- a/system/jenkins/files/jenkins.conf
+++ b/system/jenkins/files/jenkins.conf
@@ -52,6 +52,12 @@ JENKINS_USER="jenkins"
 ## the SSL KeyManagerFactory type (eg SunX509, IbmX509). Default is SunX509
 #JENKINS_HTTPS_KEY_MANAGER="SunX509"
 
+## this along with JENKINS_HTTPS_CERTIFICATE can be used to run HTTPS with
+## OpenSSL secret key file and the corresponding certificate file
+#JENKINS_HTTPS_PRIVATE_KEY=""
+
+#JENKINS_HTTPS_CERTIFICATE=""
+
 ## Default home of jenkins stuffs
 #JENKINS_HOME=/var/lib/jenkins
 
diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh
index 87d6aa432a..0e616bc9aa 100644
--- a/system/jenkins/files/jenkinsd.sh
+++ b/system/jenkins/files/jenkinsd.sh
@@ -79,6 +79,14 @@ if [ "$JENKINS_HTTPS_KEY_MANAGER" != "" ] ; then
   JENKINS_HTTPS_KEY_MANAGER_ARG="--httpsKeyManagerType=$JENKINS_HTTPS_KEY_MANAGER"
 fi
 
+if [ "$JENKINS_HTTPS_PRIVATE_KEY" != "" ] ; then
+  JENKINS_HTTPS_PRIVATE_KEY="--httpsPrivateKey=$JENKINS_HTTPS_PRIVATE_KEY"
+fi
+
+if [ "$JENKINS_HTTPS_CERTIFICATE" != "" ] ; then
+  JENKINS_HTTPS_CERTIFICATE="--httpsCertificate=$JENKINS_HTTPS_CERTIFICATE"
+fi
+
 if [ "$JENKINS_LOG_FILE" != "" ] ; then
   JENKINS_LOG_FILE_ARG="--logfile=$JENKINS_LOG_FILE"
 fi
@@ -106,12 +114,14 @@ su - $JENKINS_USER -c " \
       	$JENKINS_HTTPS_KEYSTORE_ARG \
       	$JENKINS_HTTPS_KEYSTORE_PASSWORD_ARG \
       	$JENKINS_HTTPS_KEY_MANAGER_ARG \
+      	$JENKINS_HTTPS_PRIVATE_KEY \
+      	$JENKINS_HTTPS_CERTIFICATE \
       	$JENKINS_LOG_FILE_ARG \
       	$JENKINS_WEBAPPSDIR_ARG \
       	$JENKINS_WEBROOT_ARG \
       	$OPT_ARGS \
 	</dev/null >> $JENKINS_CONSOLELOG_FILE 2>&1 &
-	
+
 	echo \$! > $JENKINS_PID_FILE
 	disown \$!
 
diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild
index 83323c231d..b87aec3c39 100644
--- a/system/jenkins/jenkins.SlackBuild
+++ b/system/jenkins/jenkins.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for jenkins
 
 # Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2017-2021 Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jenkins
-VERSION=${VERSION:-2.167}
+VERSION=${VERSION:-2.277.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info
index 5816591907..e7e644d4a7 100644
--- a/system/jenkins/jenkins.info
+++ b/system/jenkins/jenkins.info
@@ -1,10 +1,10 @@
 PRGNAM="jenkins"
-VERSION="2.167"
-HOMEPAGE="http://jenkins-ci.org"
-DOWNLOAD="http://mirrors.jenkins.io/war/2.167/jenkins.war"
-MD5SUM="58148bfebf48597905ba79df1c64be52"
+VERSION="2.277.2"
+HOMEPAGE="https://www.jenkins.io/"
+DOWNLOAD="http://mirrors.jenkins.io/war-stable/2.277.2/jenkins.war"
+MD5SUM="28e9cfedc215824551df7c83aee8768d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Giorgio Peron"
-EMAIL="giorgio.peron@gmail.com"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/joyce/joyce.SlackBuild b/system/joyce/joyce.SlackBuild
index 4b8fa156aa..cc860d8ada 100644
--- a/system/joyce/joyce.SlackBuild
+++ b/system/joyce/joyce.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=joyce
-VERSION=${VERSION:-2.2.13}
+VERSION=${VERSION:-2.2.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/joyce/joyce.info b/system/joyce/joyce.info
index 91472e56c7..52f85c71f0 100644
--- a/system/joyce/joyce.info
+++ b/system/joyce/joyce.info
@@ -1,8 +1,8 @@
 PRGNAM="joyce"
-VERSION="2.2.13"
+VERSION="2.2.14"
 HOMEPAGE="http://www.seasip.info/Unix/Joyce/"
-DOWNLOAD="http://www.seasip.info/Unix/Joyce/joyce-2.2.13.tar.gz"
-MD5SUM="c201f7b31198657aeba51a891ca2966b"
+DOWNLOAD="http://www.seasip.info/Unix/Joyce/joyce-2.2.14.tar.gz"
+MD5SUM="acf22e515606091108c1c6acab129617"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/kapacitor/kapacitor.SlackBuild b/system/kapacitor/kapacitor.SlackBuild
index 3e1e1f51ef..100a848ad7 100644
--- a/system/kapacitor/kapacitor.SlackBuild
+++ b/system/kapacitor/kapacitor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Kapacitor
 
-# Copyright 2017-2020 Ebben Aries <e@dscp.org>
+# Copyright 2017-2021 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kapacitor
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-1.5.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/kapacitor/kapacitor.info b/system/kapacitor/kapacitor.info
index 4a42a4bbc4..cb6885d7db 100644
--- a/system/kapacitor/kapacitor.info
+++ b/system/kapacitor/kapacitor.info
@@ -1,10 +1,10 @@
 PRGNAM="kapacitor"
-VERSION="1.5.5"
+VERSION="1.5.9"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.5_linux_i386.tar.gz"
-MD5SUM="9ac05315e2f37638596c561e5b57b40d"
-DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.5_linux_amd64.tar.gz"
-MD5SUM_x86_64="2f97e655febcbddcf683a894ed45b4aa"
+DOWNLOAD="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.9_linux_i386.tar.gz"
+MD5SUM="7f396a3b6ec6133407cdeb01c74eea4e"
+DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.9_linux_amd64.tar.gz"
+MD5SUM_x86_64="c3e8ad4207b2e4f0af63989e55b8c808"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/kbfs/kbfs.SlackBuild b/system/kbfs/kbfs.SlackBuild
index cce1671332..945fa19147 100644
--- a/system/kbfs/kbfs.SlackBuild
+++ b/system/kbfs/kbfs.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM=kbfs
 SRCNAM=keybase
-VERSION=${VERSION:-5.5.2_20201016183637}
-COMMITVER=d4ebf7d999
+VERSION=${VERSION:-5.6.1_20210125164223}
+COMMITVER=f3b21527b9
 SRCVER=$(echo $VERSION | tr _ - )
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/kbfs/kbfs.info b/system/kbfs/kbfs.info
index 479427eed7..dfce4bbd30 100644
--- a/system/kbfs/kbfs.info
+++ b/system/kbfs/kbfs.info
@@ -1,10 +1,10 @@
 PRGNAM="kbfs"
-VERSION="5.5.2_20201016183637"
+VERSION="5.6.1_20210125164223"
 HOMEPAGE="https://github.com/keybase/kbfs"
-DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.5.2-20201016183637.d4ebf7d999_i386.deb"
-MD5SUM="e1448443dc869ab60e760f18ed896a0b"
-DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.5.2-20201016183637.d4ebf7d999_amd64.deb"
-MD5SUM_x86_64="07074217c9ee15d18149f096730a51f3"
+DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.6.1-20210125164223.f3b21527b9_i386.deb"
+MD5SUM="1b22b307c41a3f914d51c2084b3de400"
+DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.6.1-20210125164223.f3b21527b9_amd64.deb"
+MD5SUM_x86_64="45e4f16d21974008e7a23341d1b27b5f"
 REQUIRES="google-go-lang sshfs-fuse"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/kegs/README.Slackware b/system/kegs/README.Slackware
index 03e0ebf940..7a66ba8fb8 100644
--- a/system/kegs/README.Slackware
+++ b/system/kegs/README.Slackware
@@ -1,34 +1,23 @@
 ROM Images
 ==========
 
-KEGS requires a ROM image dumped from an Apple IIgs. This will typically
-be called either "rom01" (131072 bytes) or "rom03" (262144 bytes),
-and will often be distributed in zip files called apple2g1.zip and
-apple2gs.zip (for use with MESS). This package can optionally include
-the ROM file. To do this, place the ROM image in the slackbuild
-directory before running the script. The image will be installed
-as /usr/share/kegs/rom03 (or rom01). If you do not include the ROM
-in the package, you will need to manually copy the rom03 image to
-/usr/share/kegs/rom03 before the emulator will work properly.
+KEGS requires a ROM image dumped from an Apple IIgs. This will
+typically be called either "rom01" (131072 bytes) or "rom03" (262144
+bytes), and will often be distributed in zip files called apple2g1.zip
+and apple2gs.zip (for use with MESS). This package includes the
+"rom03" file. If you want to also use the older ROM01 file, copy it to
+/usr/share/kegs after the package is installed, and select it from the
+config menu (F4) or edit the path in ~/.config.kegs.
 
 Audio
 =====
 
-kegs uses OSS for audio. To get sound working, you have 3 options:
+As of version 1.05, kegs uses PulseAudio by default. This is the default
+in the SlackBuild, so most users won't have to do anything special.
 
-1. Run kegs as "aoss xkegs", or launch it from your desktop's application
-   menu (which does the same thing).
-
-2. Enable ALSA OSS emulation:
-   # chmod +x /etc/rc.d/rc.alsa-oss
-   # /etc/rc.d/rc.alsa-oss
-
-   However, this may interfere with other applications' use of the
-   sound card.
-
-3. If you already use OSSv4 (audio/oss from slackbuilds.org), kegs
-   should be able to use it. It's not recommended to switch to OSSv4
-   just to get audio working in kegs, though.
+It's also possible to build kegs for OSS audio, or ALSA using the
+aoss "shim" layer. To do this, set 'AUDIO=oss' or 'AUDIO=alsa' in the
+script's environment.
 
 GS/OS Disk Images
 =================
diff --git a/system/kegs/allow_sound_open_fail.diff b/system/kegs/allow_sound_open_fail.diff
deleted file mode 100644
index bf9086f72d..0000000000
--- a/system/kegs/allow_sound_open_fail.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur kegs.0.91/src/sound.c kegs.0.91.patched/src/sound.c
---- kegs.0.91/src/sound.c	2004-12-06 19:42:47.000000000 -0500
-+++ kegs.0.91.patched/src/sound.c	2015-06-21 17:48:21.000000000 -0400
-@@ -363,9 +363,9 @@
- 
- 	ret = read(read_fd, &tmp, 4);
- 	if(ret != 4) {
--		printf("parent dying, could not get sample rate from child\n");
-+		printf("parent could not get audio sample rate from child, disabling sound.\n");
- 		printf("ret: %d, fd: %d errno:%d\n", ret, read_fd, errno);
--		exit(1);
-+		g_audio_enable = 0;
- 	}
- 	close(read_fd);
- 
diff --git a/system/kegs/allow_window_close.diff b/system/kegs/allow_window_close.diff
index 538022e044..b1343b2e89 100644
--- a/system/kegs/allow_window_close.diff
+++ b/system/kegs/allow_window_close.diff
@@ -1,35 +1,36 @@
-diff -Naur kegs.0.91/src/xdriver.c kegs.0.91.patched//src/xdriver.c
---- kegs.0.91/src/xdriver.c	2004-12-06 19:42:47.000000000 -0500
-+++ kegs.0.91.patched//src/xdriver.c	2011-01-27 04:28:42.000000000 -0500
-@@ -57,6 +57,7 @@
- Display *g_display = 0;
- Visual	*g_vis = 0;
- Window g_a2_win;
-+Atom g_wmdelete_atom;
- GC g_a2_winGC;
- XFontStruct *g_text_FontSt;
- Colormap g_a2_colormap = 0;
-@@ -582,6 +583,9 @@
+diff -Naur kegs.1.05/src/xdriver.c kegs.1.05.patched/src/xdriver.c
+--- kegs.1.05/src/xdriver.c	2021-01-24 18:37:34.000000000 -0500
++++ kegs.1.05.patched/src/xdriver.c	2021-02-25 17:53:28.054595900 -0500
+@@ -629,13 +629,10 @@
  		0, &my_winSizeHints, 0, &my_winClassHint);
- 	XMapRaised(g_display, g_a2_win);
+ 	XMapRaised(g_display, x_win);
+ 
+-	if(win_info_ptr != &g_mainwin_info) {
+-		// Debugger window
+ 		win_info_ptr->delete_atom = XInternAtom(g_display,
+ 						"WM_DELETE_WINDOW", False);
+ 		XSetWMProtocols(g_display, x_win, &(win_info_ptr->delete_atom),
+ 									1);
+-	}
  
-+	g_wmdelete_atom = XInternAtom(g_display, "WM_DELETE_WINDOW", True);
-+	XSetWMProtocols(g_display, g_a2_win, &g_wmdelete_atom, 1);
-+
  	XSync(g_display, False);
  
- 	g_a2_winGC = XCreateGC(g_display, g_a2_win, 0, (XGCValues *) 0);
-@@ -1086,6 +1090,13 @@
- 				(word32)ev.xcolormap.colormap,
- 				ev.xcolormap.new, ev.xcolormap.state);
- 			break;
-+		case ClientMessage:
-+			if(ev.xclient.data.l[0] == g_wmdelete_atom) {
-+				x_auto_repeat_on(1);
-+				XCloseDisplay(g_display);
-+				exit(0);
-+			}
-+			break;
- 		default:
- 			printf("X event 0x%08x is unknown!\n",
- 				ev.type);
+@@ -1092,9 +1089,15 @@
+ 		case ClientMessage:
+ 			win_info_ptr = x_find_xwin(ev.xclient.window);
+ 			if(ev.xclient.data.l[0] == win_info_ptr->delete_atom) {
+-				// This is a WM_DELETE_WINDOW event
+-				// Just unmap the window
+-				win_info_ptr->kimage_ptr->active = 0;
++				if(win_info_ptr == &g_debugwin_info) {
++					// This is a WM_DELETE_WINDOW event
++					// Just unmap the window
++					win_info_ptr->kimage_ptr->active = 0;
++				} else {
++					x_auto_repeat_on(1);
++					XCloseDisplay(g_display);
++					exit(0);
++				}
+ 			} else {
+ 				printf("unknown ClientMessage\n");
+ 			}
diff --git a/system/kegs/config.kegs.default b/system/kegs/config.kegs.default
index 782bfb8f3a..4408cee760 100644
--- a/system/kegs/config.kegs.default
+++ b/system/kegs/config.kegs.default
@@ -8,4 +8,4 @@ s6d2 =
 
 s7d1 = #NUCLEUS03
 
-g_cfg_rom_path = @ROM@
+g_cfg_rom_path = /usr/share/kegs/rom03
diff --git a/system/kegs/doinst.sh b/system/kegs/doinst.sh
index 5fb28930db..f6a957d203 100644
--- a/system/kegs/doinst.sh
+++ b/system/kegs/doinst.sh
@@ -1,3 +1,9 @@
+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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/system/kegs/kegs.png b/system/kegs/icons/128.png
index 578329931f..578329931f 100644
--- a/system/kegs/kegs.png
+++ b/system/kegs/icons/128.png
diff --git a/system/kegs/icons/16.png b/system/kegs/icons/16.png
new file mode 100644
index 0000000000..7dbbef05e5
--- /dev/null
+++ b/system/kegs/icons/16.png
diff --git a/system/kegs/icons/32.png b/system/kegs/icons/32.png
new file mode 100644
index 0000000000..15b49662ca
--- /dev/null
+++ b/system/kegs/icons/32.png
diff --git a/system/kegs/icons/48.png b/system/kegs/icons/48.png
new file mode 100644
index 0000000000..7caf94efd2
--- /dev/null
+++ b/system/kegs/icons/48.png
diff --git a/system/kegs/kegs.SlackBuild b/system/kegs/kegs.SlackBuild
index 79883b8daa..851b036d01 100644
--- a/system/kegs/kegs.SlackBuild
+++ b/system/kegs/kegs.SlackBuild
@@ -6,6 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210225 bkw: update for v1.05. lots of changes:
+# - include the ROM image in the package (add it to DOWNLOAD)
+# - allow_sound_open_fail.diff no longer required
+# - rework allow_window_close.diff for v1.05
+# - .desktop file no longer needs Terminal=true
+# - upstream now supports pulseaudio, so build with it by default. add
+#   AUDIO variable to build the old OSS sound support or ALSA via aoss
+#   instead.
+
 # 20170305 bkw:
 # - fix building under installwatch, caused by a symlink in the
 #   tarball being listed before its target Why does this choke
@@ -19,8 +28,8 @@
 # - "Exec=aoss xkegs" in .desktop file
 
 PRGNAM=kegs
-VERSION=${VERSION:-0.91}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.05}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -48,45 +57,48 @@ fi
 
 set -e
 
+AUDIO=${AUDIO:-pulse}
+VARS=$CWD/makevars/vars.$AUDIO
+
+if [ ! -e $VARS ]; then
+  echo -n "*** AUDIO=\"$AUDIO\" not supported. Use one of: " 1>&2
+  list="$( ls -1 $CWD/makevars/vars.* | cut -d. -f2 )"
+  echo $list 1>&2
+  exit 1
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM.$VERSION
-tar xvf $CWD/$PRGNAM.$VERSION.tar.gz --exclude vars
+tar xvf $CWD/$PRGNAM.$VERSION.tar.gz \
+  --exclude '*/KEGSMAC.app' \
+  --exclude xkegs
 cd $PRGNAM.$VERSION
 chown -R root:root .
-find -L . \
- \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# device name for joysticks has changed for the 21st century.
+sed -i 's,/dev/js,/dev/input/js,' src/joystick_driver.c
 
 # xkegs refuses to close (close button greyed-out by window manager).
 # Small patch by SlackBuild author fixes this large annoyance (which is
 # extra-annoying because there's also no Quit option in the kegs menu).
 # I've sent this upstream, maybe it'll get integrated in future versions.
+# 20210225 bkw: Years later. Patch had to change for 1.05. The README
+# for kegs *actually says* you can close the main KEGS window to quit,
+# *and you can't fucking close it* without this patch. Apologies if I
+# sound a bit strident, but...
 patch -p1 < $CWD/allow_window_close.diff
 
-# Matthew Miller pointed out this patch to me. Since kegs uses OSS for
-# audio, and modern Slackware has ALSA OSS emulation disabled by default,
-# sound won't work unless xkegs is run via aoss, or OSS modules are
-# loaded. This patch allows the emulator to start with sound disabled if
-# it can't open the OSS audio device (instead of it being a fatal error).
-# I've also updated the README to explain how to get audio to work.
-patch -p1 < $CWD/allow_sound_open_fail.diff
-
 cd src
 rm -f vars
-ln -s vars_x86linux vars
-make CCOPTS="$SLKCFLAGS" x$PRGNAM to_pro partls
+cat $VARS > vars
+make SLKCFLAGS="$SLKCFLAGS" x$PRGNAM to_pro partls
 cd -
 
 # No install target, just stick it all where it goes.
-# The icon was converted from the Mac OSX icon with icns2png.
-# The .desktop has 'Terminal=true' because xkegs *really* wants
-# to be started from a terminal (the debugger uses stdio, and
-# is too easy to accidentally enter by center-clicking the window).
-
 mkdir -p \
   $PKG/usr/bin \
   $PKG/usr/libexec \
@@ -97,12 +109,26 @@ mkdir -p \
 install -s -m0755 x$PRGNAM $PKG/usr/libexec/
 install -s -m0755 src/to_pro src/partls $PKG/usr/bin/
 install -m0755 $CWD/x$PRGNAM.sh $PKG/usr/bin/x$PRGNAM
-install -m0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/
 install -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
+install -m0644 $CWD/config.$PRGNAM.default $PKG/usr/share/$PRGNAM
+
+# The icons were converted from the Mac OSX icon with icns2png.
+for i in 16 32 48 128; do
+  idir=$PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  mkdir -p $idir
+  cat $CWD/icons/$i.png > $idir/$PRGNAM.png
+done
+
+# old-style icon (e.g. windowmaker, fvwm2)
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Include the ROM image in the package. It's been available on the
+# asimov site for at least 20 years now, Apple has never complained.
+unzip -p $CWD/gsrom03.zip > $PKG/usr/share/$PRGNAM/rom03
 
 # Man pages are specific to the SlackBuild, though I've sent
 # them upstream for consideration.
-for file in $CWD/*.1; do
+for file in $CWD/man/*.1; do
   sed "s/@VERSION@/$VERSION/g" $file \
   | gzip -9c \
   > $PKG/usr/man/man1/$( basename $file ).gz
@@ -113,34 +139,12 @@ done
 ln -s x$PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 ln -s x$PRGNAM $PKG/usr/bin/$PRGNAM
 
-# Handle the ROM image, if we find it. Filenames are listed in
-# reverse order of preference.
-for file in ROM01 rom01 ROM03 rom03; do
-  if [ -e "$CWD/$file" ]; then
-    ROMFILE="$CWD/$file"
-  fi
-done
-
-if [ -e "$ROMFILE" ]; then
-  ROMNAME="$( basename "$ROMFILE" )"
-  install -m0644 "$ROMFILE" $PKG/usr/share/$PRGNAM
-else
-  # We don't have a ROM, so we don't include one in the package, but we
-  # do still set the path to /usr/share/kegs/rom03 in the config file,
-  # so all the user has to do is copy the ROM there later.
-  ROMNAME=rom03
-fi
-
-sed "s,@ROM@,/usr/share/$PRGNAM/$ROMNAME," \
-  < $CWD/config.$PRGNAM.default \
-  > $PKG/usr/share/$PRGNAM/config.$PRGNAM.default
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 install -m0644 *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@AUDIO@,$AUDIO," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/system/kegs/kegs.desktop b/system/kegs/kegs.desktop
index 229dc9fe7d..3339d2bafa 100644
--- a/system/kegs/kegs.desktop
+++ b/system/kegs/kegs.desktop
@@ -3,8 +3,8 @@ Version=1.0
 Name=KEGS
 GenericName=Apple IIgs Emulator
 Type=Application
-Exec=aoss xkegs
+Exec=xkegs
 Icon=kegs
-Terminal=true
+Terminal=false
 StartupNotify=false
 Categories=Game;Emulator;
diff --git a/system/kegs/kegs.info b/system/kegs/kegs.info
index db8446cf08..937cf787c0 100644
--- a/system/kegs/kegs.info
+++ b/system/kegs/kegs.info
@@ -1,8 +1,10 @@
 PRGNAM="kegs"
-VERSION="0.91"
+VERSION="1.05"
 HOMEPAGE="http://kegs.sourceforge.net/"
-DOWNLOAD="http://kegs.sourceforge.net/kegs.0.91.tar.gz"
-MD5SUM="ec3967d3276bb3d1dd601c7b8f750df5"
+DOWNLOAD="http://kegs.sourceforge.net/kegs.1.05.tar.gz \
+          https://mirrors.apple2.org.za/ftp.apple.asimov.net/emulators/rom_images/gsrom03.zip"
+MD5SUM="b7f0452bf173eecdfadf9a82c4f75bea \
+        029ebd31845614636f6a34a19730cd57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/kegs/makevars/vars.alsa b/system/kegs/makevars/vars.alsa
new file mode 100644
index 0000000000..c8eb5b26aa
--- /dev/null
+++ b/system/kegs/makevars/vars.alsa
@@ -0,0 +1,7 @@
+TARGET = xkegs
+OBJECTS1 = xdriver.o
+CCOPTS = $(SLKCFLAGS)
+NAME = xkegs
+LD = $(CC)
+EXTRA_LIBS = -lXext -laoss
+EXTRA_SPECIALS =
diff --git a/system/kegs/makevars/vars.oss b/system/kegs/makevars/vars.oss
new file mode 100644
index 0000000000..e71940cd21
--- /dev/null
+++ b/system/kegs/makevars/vars.oss
@@ -0,0 +1,7 @@
+TARGET = xkegs
+OBJECTS1 = xdriver.o
+CCOPTS = $(SLKCFLAGS)
+NAME = xkegs
+LD = $(CC)
+EXTRA_LIBS = -lXext
+EXTRA_SPECIALS =
diff --git a/system/kegs/makevars/vars.pulse b/system/kegs/makevars/vars.pulse
new file mode 100644
index 0000000000..8521ec9b6f
--- /dev/null
+++ b/system/kegs/makevars/vars.pulse
@@ -0,0 +1,7 @@
+TARGET = xkegs
+OBJECTS1 = pulseaudio_driver.o xdriver.o
+CCOPTS = $(SLKCFLAGS) -DPULSE_AUDIO
+NAME = xkegs
+LD = $(CC)
+EXTRA_LIBS = -lXext -lpulse
+EXTRA_SPECIALS =
diff --git a/system/kegs/partls.1 b/system/kegs/man/partls.1
index 1af148532b..1af148532b 100644
--- a/system/kegs/partls.1
+++ b/system/kegs/man/partls.1
diff --git a/system/kegs/to_pro.1 b/system/kegs/man/to_pro.1
index a58fada52d..a58fada52d 100644
--- a/system/kegs/to_pro.1
+++ b/system/kegs/man/to_pro.1
diff --git a/system/kegs/xkegs.1 b/system/kegs/man/xkegs.1
index 907a6095cd..eb14f217e6 100644
--- a/system/kegs/xkegs.1
+++ b/system/kegs/man/xkegs.1
@@ -86,8 +86,7 @@ Unlimited, 1MHz, 2.8MHz, 8.0MHz
 Enter KEGS debugger (can also be done by center\-clicking the mouse on
 the xkegs window).
 .br
-The debugger is tty\-based, and runs on the terminal
-that xkegs was started from.
+The debugger is X\-based, and runs in a separate window.
 .TP
 \fBF7\fR
 Toggle fast_disk_emul on/off
diff --git a/system/kegs/slack-desc b/system/kegs/slack-desc
index 5db61e7330..3ecf8b066b 100644
--- a/system/kegs/slack-desc
+++ b/system/kegs/slack-desc
@@ -13,7 +13,7 @@ kegs: Apple IIgs was the most powerful computer in the Apple II line. It
 kegs: first was sold in 1986. An Apple IIgs has the capability to run almost
 kegs: all Apple II, Apple IIe, and Apple IIc programs.
 kegs:
-kegs:
+kegs: Package built with audio system '@AUDIO@'.
 kegs:
 kegs:
 kegs:
diff --git a/system/kegs/xkegs.sh b/system/kegs/xkegs.sh
index 55f0719b73..a947f07f76 100644
--- a/system/kegs/xkegs.sh
+++ b/system/kegs/xkegs.sh
@@ -8,8 +8,13 @@
 # read it from /usr/share/kegs/config.kegs, but it'll freeze if
 # it doesn't have write permission!
 
+# Update for v1.05: kegs will now start without ~/.config.kegs,
+# but if you do that, it'll save its config in the current dir as
+# "config.kegs" (no leading dot). So this wrapper's still necessary.
+# Added the missing "$@" so options actually get passed to kegs.
+
 if [ ! -e ~/.config.kegs ]; then
 	cat /usr/share/kegs/config.kegs.default > ~/.config.kegs
 fi
 
-exec /usr/libexec/xkegs
+exec /usr/libexec/xkegs "$@"
diff --git a/system/keybase/keybase.SlackBuild b/system/keybase/keybase.SlackBuild
index 8e133a1841..e2f38806ed 100644
--- a/system/keybase/keybase.SlackBuild
+++ b/system/keybase/keybase.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for keybase
 
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=keybase
 SRCNAM=client
-VERSION=${VERSION:-5.5.2}
+VERSION=${VERSION:-5.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/keybase/keybase.info b/system/keybase/keybase.info
index a12d8d4bec..367a1a72bb 100644
--- a/system/keybase/keybase.info
+++ b/system/keybase/keybase.info
@@ -1,8 +1,8 @@
 PRGNAM="keybase"
-VERSION="5.5.2"
+VERSION="5.6.1"
 HOMEPAGE="https://github.com/keybase/client"
-DOWNLOAD="https://github.com/keybase/client/archive/v5.5.2/client-5.5.2.tar.gz"
-MD5SUM="0970e009fb3519cbcda3a0f3bd4c3cc7"
+DOWNLOAD="https://github.com/keybase/client/archive/v5.6.1/client-5.6.1.tar.gz"
+MD5SUM="3acd34467dccfad5a7d93741aeea3724"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/kfc/README b/system/kfc/README
new file mode 100644
index 0000000000..d22ebeff3c
--- /dev/null
+++ b/system/kfc/README
@@ -0,0 +1,4 @@
+kfc (terminal-emulator color palette setter)
+
+kfc uses extended escape codes to set the 16-color ANSI palette in
+supported terminals. Over 300 palettes are included.
diff --git a/system/kfc/kfc.1 b/system/kfc/kfc.1
new file mode 100644
index 0000000000..081636a30c
--- /dev/null
+++ b/system/kfc/kfc.1
@@ -0,0 +1,92 @@
+.\" Man page generated from reStructuredText.
+.
+.TH KFC 1 "2020-11-23" "0.1.2" "SlackBuilds.org"
+.SH NAME
+kfc \- terminal-emulator color palette setter
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for kfc(1) man page. Convert with:
+.
+.\" rst2man.py kfc.rst > kfc.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.\" converting from pod:
+.
+.\" s/B<\([^>]*\)>/**\1**/g
+.
+.\" s/I<\([^>]*\)>/*\1*/g
+.
+.SH SYNOPSIS
+.sp
+kfc [\fI\-L\fP] [\fI\-r\fP | \fI\-s palette\fP] [\fI\-l\fP | \fI\-p\fP | \fI\-v\fP]
+.SH DESCRIPTION
+.sp
+This project was inspired by Dylan Arap\(aqs POSIX shell script,
+okpal, which utilizes 16 ANSI colors to control the color scheme
+of existing terminal\-emulator windows. This allows one to achieve
+consistent colors across all terminal utilities and applications. This
+application has similar functionality to okpal but is designed with
+execution speed in mind. There are currently 300 light and dark color
+palettes offered at this time that can be applied and quickly swapped
+out for others.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-L
+Set light themes (modifier for \-s/\-r)
+.TP
+.B \-r
+Select a random palette (dark theme by default)
+.TP
+.BI \-s \ palette
+Select a palette (dark theme by default)
+.TP
+.B \-l
+List all palettes (dark themes by default)
+.TP
+.B \-p
+Print current palette
+.TP
+.B \-v
+Show version information
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/kfc\-0.1.2/LICENSE for license information.
+.SH AUTHORS
+.sp
+kfc was written by Michael Czigler.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The kfc homepage: \fI\%https://github.com/mcpcpc/kfc\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/kfc/kfc.SlackBuild b/system/kfc/kfc.SlackBuild
new file mode 100644
index 0000000000..29eb4f508f
--- /dev/null
+++ b/system/kfc/kfc.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Slackware build script for kfc
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=kfc
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Squelch this pointless warning.
+sed -i '/"XDG_CONFIG_HOME is not defined/d' $PRGNAM.c
+
+make CFLAGS="$SLKCFLAGS -Wl,-s"
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# man page by SlackBuild author, culled from README and usage output
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kfc/kfc.info b/system/kfc/kfc.info
new file mode 100644
index 0000000000..1f0fd9dec2
--- /dev/null
+++ b/system/kfc/kfc.info
@@ -0,0 +1,10 @@
+PRGNAM="kfc"
+VERSION="0.1.2"
+HOMEPAGE="https://github.com/mcpcpc/kfc"
+DOWNLOAD="https://github.com/mcpcpc/kfc/archive/0.1.2/kfc-0.1.2.tar.gz"
+MD5SUM="edd5b6eb81d85f4e1f7623f623f7c083"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/kfc/kfc.rst b/system/kfc/kfc.rst
new file mode 100644
index 0000000000..2fa08b524c
--- /dev/null
+++ b/system/kfc/kfc.rst
@@ -0,0 +1,68 @@
+.. RST source for kfc(1) man page. Convert with:
+..   rst2man.py kfc.rst > kfc.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.1.2
+.. |date| date::
+
+.. converting from pod:
+.. s/B<\([^>]*\)>/**\1**/g
+.. s/I<\([^>]*\)>/*\1*/g
+
+===
+kfc
+===
+
+--------------------------------------
+terminal-emulator color palette setter
+--------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+kfc [*-L*] [*-r* | *-s palette*] [*-l* | *-p* | *-v*]
+
+DESCRIPTION
+===========
+
+This project was inspired by Dylan Arap's POSIX shell script,
+okpal, which utilizes 16 ANSI colors to control the color scheme
+of existing terminal-emulator windows. This allows one to achieve
+consistent colors across all terminal utilities and applications. This
+application has similar functionality to okpal but is designed with
+execution speed in mind. There are currently 300 light and dark color
+palettes offered at this time that can be applied and quickly swapped
+out for others.
+
+OPTIONS
+=======
+
+-L          Set light themes (modifier for -s/-r)
+-r          Select a random palette (dark theme by default)
+-s palette  Select a palette (dark theme by default)
+-l          List all palettes (dark themes by default)
+-p          Print current palette
+-v          Show version information
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/kfc-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+kfc was written by Michael Czigler.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The kfc homepage: https://github.com/mcpcpc/kfc
diff --git a/system/kfc/slack-desc b/system/kfc/slack-desc
new file mode 100644
index 0000000000..fda7fdcf00
--- /dev/null
+++ b/system/kfc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+kfc: kfc (terminal-emulator color palette setter)
+kfc:
+kfc: kfc uses extended escape codes to set the 16-color ANSI palette in
+kfc: supported terminals. Over 300 palettes are included.
+kfc:
+kfc:
+kfc:
+kfc:
+kfc:
+kfc:
+kfc:
diff --git a/system/kitchen-sync/kitchen-sync.SlackBuild b/system/kitchen-sync/kitchen-sync.SlackBuild
index bb1d2b1f7d..7d85b220aa 100644
--- a/system/kitchen-sync/kitchen-sync.SlackBuild
+++ b/system/kitchen-sync/kitchen-sync.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=kitchen-sync
 SRCNAM=$(echo "$PRGNAM" | tr '-' '_')
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-2.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/kitchen-sync/kitchen-sync.info b/system/kitchen-sync/kitchen-sync.info
index 2a9a64fe05..0ef6843485 100644
--- a/system/kitchen-sync/kitchen-sync.info
+++ b/system/kitchen-sync/kitchen-sync.info
@@ -1,8 +1,8 @@
 PRGNAM="kitchen-sync"
-VERSION="2.8"
+VERSION="2.10"
 HOMEPAGE="https://github.com/willbryant/kitchen_sync"
-DOWNLOAD="https://github.com/willbryant/kitchen_sync/archive/v2.8/kitchen_sync-2.8.tar.gz"
-MD5SUM="ef75c1761d402dd2b1a9e1d53d369086"
+DOWNLOAD="https://github.com/willbryant/kitchen_sync/archive/v2.10/kitchen_sync-2.10.tar.gz"
+MD5SUM="e5c7a8a83966e41e16b2ee37c10365ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/kitty/README b/system/kitty/README
new file mode 100644
index 0000000000..a4cb22c88e
--- /dev/null
+++ b/system/kitty/README
@@ -0,0 +1,14 @@
+kitty (fast, featureful, GPU-based terminal emulator)
+
+kitty is a terminal emulator for X11 and Wayland[1], which offloads
+the rendering to the GPU[2] and supports modern terminal features. It
+also supports tiling multiple terminal windows without using an extra
+program like screen or tmux.
+
+[1] For Wayland support, install wayland-protocols before building
+    kitty. It will be auto-detected. It may be necessary to add the
+    following line to ~/.config/kitty/kitty.conf:
+
+      linux_display_server wayland
+
+[2] Requires hardware-accelerated OpenGL support.
diff --git a/system/kitty/doinst.sh b/system/kitty/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/kitty/doinst.sh
@@ -0,0 +1,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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/kitty/kitty.SlackBuild b/system/kitty/kitty.SlackBuild
new file mode 100644
index 0000000000..7a6708062d
--- /dev/null
+++ b/system/kitty/kitty.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for kitty
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=kitty
+VERSION=${VERSION:-0.19.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# The Makefile ain't a real Makefile, everything's done in setup.py. Which
+# has issues:
+# - upstream claims harfbuzz >= 1.5 is required, but 14.2's 1.2 seems to work
+#   just fine.
+# - CFLAGS not supported, -O3 hardcoded. The OVERRIDE stuff works, but the
+#   hardcoded -O3 comes *after* them on the gcc command line. Grr.
+# - -Werror is used when compiling launcher.c, no way to disable. This assumes
+#   upstream is perfect at writing code that compiles without warnings on every
+#   version of gcc we might ever happen to use, and I don't believe it.
+# So, sed surgery.
+
+sed -i \
+    -e "/at_least_version('harfbuzz/s,5,2," \
+    -e 's,-O3,-O2,g' \
+    -e 's,-Werror , ,g' \
+    setup.py
+
+# The -Wl,-s makes the linker strip the binaries.
+OVERRIDE_CPPFLAGS="$SLKCFLAGS -Wl,-s" \
+OVERRIDE_CFLAGS="$SLKCFLAGS -Wl,-s" \
+  python3 setup.py --libdir-name lib$LIBDIRSUFFIX --verbose linux-package
+
+mkdir -p $PKG/usr/bin $PKG/usr/share $PKG/usr/lib$LIBDIRSUFFIX
+cp -a linux-package/bin/* $PKG/usr/bin
+cp -a linux-package/share/* $PKG/usr/share
+cp -a linux-package/lib*/* $PKG/usr/lib$LIBDIRSUFFIX
+
+mv $PKG/usr/share/man $PKG/usr/man
+gzip $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/html $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc/
+cp -a CHANGELOG* CONTRIBUTING* README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# make slack-desc reflect the display types the package is built for
+L=$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/$PRGNAM
+[ -e $L/glfw-x11.so ] && DISPLAYS+=" X11"
+[ -e $L/glfw-wayland.so ] && DISPLAYS+=" Wayland"
+
+mkdir -p $PKG/install
+sed "s,@DISPLAYS@,$DISPLAYS," $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}
diff --git a/system/kitty/kitty.info b/system/kitty/kitty.info
new file mode 100644
index 0000000000..2047627277
--- /dev/null
+++ b/system/kitty/kitty.info
@@ -0,0 +1,10 @@
+PRGNAM="kitty"
+VERSION="0.19.3"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+DOWNLOAD="https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz"
+MD5SUM="262b677889d9b979b9ce609ec7b75186"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 libxkbcommon"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/kitty/slack-desc b/system/kitty/slack-desc
new file mode 100644
index 0000000000..c48660175a
--- /dev/null
+++ b/system/kitty/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+kitty: kitty (fast, featureful, GPU-based terminal emulator)
+kitty:
+kitty: kitty is a terminal emulator for X11 and Wayland, which offloads the
+kitty: rendering to the GPU and supports modern terminal features. It also
+kitty: supports tiling multiple terminal windows without using an extra
+kitty: program like screen or tmux.
+kitty:
+kitty: This package supports:@DISPLAYS@
+kitty:
+kitty:
+kitty:
diff --git a/system/lddsafe/README b/system/lddsafe/README
new file mode 100644
index 0000000000..d1f180e6be
--- /dev/null
+++ b/system/lddsafe/README
@@ -0,0 +1,6 @@
+lddsafe (safe replacement for ldd)
+
+lddsafe prints shared library dependencies for executables and shared
+libraries. However, it uses objdump instead of loading the program,
+hence avoiding the security problems of ldd. lddsafe also includes
+nonrecursive mode (-n option), which lists direct dependencies only.
diff --git a/system/lddsafe/lddsafe.1 b/system/lddsafe/lddsafe.1
new file mode 100644
index 0000000000..9b4ae84fbd
--- /dev/null
+++ b/system/lddsafe/lddsafe.1
@@ -0,0 +1,66 @@
+.\" Man page generated from reStructuredText.
+.
+.TH LDDSAFE 1 "2021-02-28" "20110819_02842ba" "SlackBuilds.org"
+.SH NAME
+lddsafe \- safely print shared library dependencies (similar to ldd)
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for lddsafe(1) man page. Convert with:
+.
+.\" rst2man.py lddsafe.rst > lddsafe.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+lddsafe [\fI\-n\fP] \fBFILE\fP ...
+.SH DESCRIPTION
+.sp
+lddsafe is a shell script written for Linux distributions (tested
+under Slackware Linux) that prints shared library dependencies for
+executable files and shared libraries, similar to ldd. However,
+it uses objdump instead of loading the program, hence avoiding the
+security problems of ldd.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-n
+Nonrecursive mode. List direct dependencies only.
+.UNINDENT
+.SH AUTHORS
+.sp
+lddsafe was written by Ricardo Garcia Gonzalez and Ivan Mironov, and
+released as public domain code.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The lddsafe homepage: \fI\%https://github.com/rg3/lddsafe/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/lddsafe/lddsafe.SlackBuild b/system/lddsafe/lddsafe.SlackBuild
new file mode 100644
index 0000000000..abd02d1575
--- /dev/null
+++ b/system/lddsafe/lddsafe.SlackBuild
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Slackware build script for lddsafe
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210228 bkw: I've been using this for years, never got around
+# to making a SBo build for it until now. Since it's only one
+# self-contained shell script and one README, no point dealing with a
+# tarball at all, just link to the 'raw' files on github.
+
+PRGNAM=lddsafe
+VERSION=${VERSION:-20110819_02842ba}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $OUTPUT \
+  $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install
+install -m0755 -oroot -groot $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+install -m0644 -oroot -groot $CWD/README.textile $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lddsafe/lddsafe.info b/system/lddsafe/lddsafe.info
new file mode 100644
index 0000000000..e782e2e71a
--- /dev/null
+++ b/system/lddsafe/lddsafe.info
@@ -0,0 +1,12 @@
+PRGNAM="lddsafe"
+VERSION="20110819_02842ba"
+HOMEPAGE="https://github.com/rg3/lddsafe/"
+DOWNLOAD="https://raw.githubusercontent.com/rg3/lddsafe/02842bab5b8d1341fb34c632603dbe1c20e7ab51/lddsafe \
+          https://raw.githubusercontent.com/rg3/lddsafe/02842bab5b8d1341fb34c632603dbe1c20e7ab51/README.textile"
+MD5SUM="7c9f3a4035a4b438e2ec44c4d27b158f \
+        6e4fa6979ae375cc60f9c444846bcb8d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/lddsafe/lddsafe.rst b/system/lddsafe/lddsafe.rst
new file mode 100644
index 0000000000..37c15b22b8
--- /dev/null
+++ b/system/lddsafe/lddsafe.rst
@@ -0,0 +1,52 @@
+.. RST source for lddsafe(1) man page. Convert with:
+..   rst2man.py lddsafe.rst > lddsafe.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20110819_02842ba
+.. |date| date::
+
+=======
+lddsafe
+=======
+
+---------------------------------------------------------
+safely print shared library dependencies (similar to ldd)
+---------------------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+lddsafe [*-n*] **FILE** ...
+
+DESCRIPTION
+===========
+
+lddsafe is a shell script written for Linux distributions (tested
+under Slackware Linux) that prints shared library dependencies for
+executable files and shared libraries, similar to ldd. However,
+it uses objdump instead of loading the program, hence avoiding the
+security problems of ldd.
+
+OPTIONS
+=======
+
+-n     Nonrecursive mode. List direct dependencies only.
+
+AUTHORS
+=======
+
+lddsafe was written by Ricardo Garcia Gonzalez and Ivan Mironov, and
+released as public domain code.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The lddsafe homepage: https://github.com/rg3/lddsafe/
diff --git a/system/lddsafe/slack-desc b/system/lddsafe/slack-desc
new file mode 100644
index 0000000000..ddc5f764c2
--- /dev/null
+++ b/system/lddsafe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+lddsafe: lddsafe (safe replacement for ldd)
+lddsafe:
+lddsafe: lddsafe prints shared library dependencies for executables and shared
+lddsafe: libraries. However, it uses objdump instead of loading the program,
+lddsafe: hence avoiding the security problems of ldd. lddsafe also includes
+lddsafe: nonrecursive mode (-n option), which lists direct dependencies only.
+lddsafe:
+lddsafe:
+lddsafe:
+lddsafe:
+lddsafe:
diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild
index 06a3464fcc..09ce608197 100644
--- a/system/letsencrypt/letsencrypt.SlackBuild
+++ b/system/letsencrypt/letsencrypt.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for letsencrypt
 
-# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=letsencrypt
 SRCNAM=certbot
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info
index c06bc269a2..f4d2655a90 100644
--- a/system/letsencrypt/letsencrypt.info
+++ b/system/letsencrypt/letsencrypt.info
@@ -1,10 +1,10 @@
 PRGNAM="letsencrypt"
-VERSION="1.9.0"
+VERSION="1.14.0"
 HOMEPAGE="https://letsencrypt.org/"
-DOWNLOAD="https://github.com/certbot/certbot/archive/v1.9.0/certbot-1.9.0.tar.gz"
-MD5SUM="bc7ba293a93203546d6809a3af37db8d"
+DOWNLOAD="https://github.com/certbot/certbot/archive/v1.14.0/certbot-1.14.0.tar.gz"
+MD5SUM="88f267993e5f887dde34a0b042d84585"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="configobj mock pytz python3-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-distro python3-certifi python3-packaging"
+REQUIRES="configobj mock pytz python3-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-distro python-certifi python3-packaging"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild b/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild
index 0a11bdb3cd..4de196efce 100644
--- a/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild
+++ b/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libsignal-protocol-c
 
-# Copyright 2019-2020 CRTS
+# Copyright 2019- CRTS
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=libsignal-protocol-c
-VERSION=${VERSION:-2.3.2}
+VERSION=${VERSION:-2.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/libsignal-protocol-c/libsignal-protocol-c.info b/system/libsignal-protocol-c/libsignal-protocol-c.info
index 2b065374c7..4ef8c569a2 100644
--- a/system/libsignal-protocol-c/libsignal-protocol-c.info
+++ b/system/libsignal-protocol-c/libsignal-protocol-c.info
@@ -1,8 +1,8 @@
 PRGNAM="libsignal-protocol-c"
-VERSION="2.3.2"
+VERSION="2.3.3"
 HOMEPAGE="https://signal.org"
-DOWNLOAD="https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.2/libsignal-protocol-c-2.3.2.tar.gz"
-MD5SUM="ad742a03263c29a468d00c3dcc0269cf"
+DOWNLOAD="https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.3/libsignal-protocol-c-2.3.3.tar.gz"
+MD5SUM="68dae9b8da58f36dcbf9e10b0138d6f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/linux-vt-setcolors/README b/system/linux-vt-setcolors/README
new file mode 100644
index 0000000000..6f1072302b
--- /dev/null
+++ b/system/linux-vt-setcolors/README
@@ -0,0 +1,8 @@
+linux-vt-setcolors (change color palette in Linux console)
+
+This little utility can be used to change the default color palette
+of the Linux virtual console. The program accepts a configuration file
+containing the colors to use, in hexadecimal form.
+
+The executable is named "setcolors". Sample config files are included
+in the package. See: /usr/doc/linux-vt-setcolors-$VERSION/example-colors
diff --git a/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild b/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild
new file mode 100644
index 0000000000..48957505e6
--- /dev/null
+++ b/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# Slackware build script for linux-vt-setcolors
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# I don't know why upstream refers to the console as a "VT101". The
+# kernel source claims it's a VT102 implementation... but both a VT101
+# and a VT102 are monochrome terminals, so neither name is all that
+# accurate...
+
+PRGNAM=linux-vt-setcolors
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Makefile has too much hard-coded stuff.
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+EXE=setcolors
+gcc -Wall $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$EXE $EXE.c
+gzip -9c < $EXE.1 > $PKG/usr/man/man1/$EXE.1.gz
+
+# Project name and executable name are different, include this symlink
+# in case someone (probably me) forgets.
+ln -s $EXE.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE* README* example-colors $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/linux-vt-setcolors/linux-vt-setcolors.info b/system/linux-vt-setcolors/linux-vt-setcolors.info
new file mode 100644
index 0000000000..92ee0d8c30
--- /dev/null
+++ b/system/linux-vt-setcolors/linux-vt-setcolors.info
@@ -0,0 +1,10 @@
+PRGNAM="linux-vt-setcolors"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/EvanPurkhiser/linux-vt-setcolors"
+DOWNLOAD="https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v1.0.0/linux-vt-setcolors-1.0.0.tar.gz"
+MD5SUM="789b4dc02d1c4f509b3b01450c7ef980"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/linux-vt-setcolors/slack-desc b/system/linux-vt-setcolors/slack-desc
new file mode 100644
index 0000000000..d1eddc0433
--- /dev/null
+++ b/system/linux-vt-setcolors/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+linux-vt-setcolors: linux-vt-setcolors (change color palette in Linux console)
+linux-vt-setcolors:
+linux-vt-setcolors: This little utility can be used to change the default color palette
+linux-vt-setcolors: of the Linux virtual console. The program accepts a configuration file
+linux-vt-setcolors: containing the colors to use, in hexadecimal form.
+linux-vt-setcolors:
+linux-vt-setcolors: The executable is named "setcolors". Sample config files are included
+linux-vt-setcolors: in the package. See:
+linux-vt-setcolors: /usr/doc/linux-vt-setcolors-$VERSION/example-colors
+linux-vt-setcolors:
+linux-vt-setcolors:
diff --git a/system/linuxconsoletools/linuxconsoletools.SlackBuild b/system/linuxconsoletools/linuxconsoletools.SlackBuild
index 9de107a555..e5662ae25a 100644
--- a/system/linuxconsoletools/linuxconsoletools.SlackBuild
+++ b/system/linuxconsoletools/linuxconsoletools.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for linuxconsoletools
 
 # Copyright 2011-2012 Roberto Neri, Palermo, Italy
+# Copyright 2021 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210223 bkw: update for v1.7.1
 # 20191129 bkw: update for v1.7.0, document new optional SDL2 dep.
 # 20181030 bkw: add GPM_COMPAT=yes option, minor cleanups, BUILD=2
 # 20161015 bkw: update for v1.6.0
@@ -31,7 +33,7 @@
 #               replaced patch with a bit of sed.
 
 PRGNAM=linuxconsoletools
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/linuxconsoletools/linuxconsoletools.info b/system/linuxconsoletools/linuxconsoletools.info
index a337df9362..31bd0ef77b 100644
--- a/system/linuxconsoletools/linuxconsoletools.info
+++ b/system/linuxconsoletools/linuxconsoletools.info
@@ -1,8 +1,8 @@
 PRGNAM="linuxconsoletools"
-VERSION="1.7.0"
+VERSION="1.7.1"
 HOMEPAGE="https://sourceforge.net/projects/linuxconsole/"
-DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.7.0.tar.bz2"
-MD5SUM="b30c4daa2329d9af316045657370ee27"
+DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.7.1.tar.bz2"
+MD5SUM="bc9d7178434a2ff53b75dfdf7c34e2c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild
index 20b1e09d51..0180629362 100644
--- a/system/lirc/lirc.SlackBuild
+++ b/system/lirc/lirc.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for lirc
 
 # Copyright 2009  Murat D. Kadirov <banderols@gmail.com>
-# Copyright 2015  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2015-2021  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 
 PRGNAM=lirc
 VERSION=${VERSION:-0.9.3a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info
index 4b5767ee9b..a338a56123 100644
--- a/system/lirc/lirc.info
+++ b/system/lirc/lirc.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a.
 MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyYAML"
+REQUIRES="python3-PyYAML pygobject3-python3"
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo -at- gmail.com"
diff --git a/system/lnav/lnav.SlackBuild b/system/lnav/lnav.SlackBuild
index 55ea25b504..515b0b549c 100644
--- a/system/lnav/lnav.SlackBuild
+++ b/system/lnav/lnav.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lnav
-VERSION=${VERSION:-0.8.5}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lnav/lnav.info b/system/lnav/lnav.info
index d622b13f53..799593cbbf 100644
--- a/system/lnav/lnav.info
+++ b/system/lnav/lnav.info
@@ -1,8 +1,8 @@
 PRGNAM="lnav"
-VERSION="0.8.5"
+VERSION="0.9.0"
 HOMEPAGE="http://lnav.org"
-DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.8.5/lnav-0.8.5.tar.gz"
-MD5SUM="1867b89c6149c15bc6efc938ec48fe64"
+DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz"
+MD5SUM="77e87ccda75ba2c4f223ffac55392716"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/localepurge/localepurge.SlackBuild b/system/localepurge/localepurge.SlackBuild
index 7ca7771c77..a2619e8c5f 100644
--- a/system/localepurge/localepurge.SlackBuild
+++ b/system/localepurge/localepurge.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for localepurge.
 #
-# Copyright 2016-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=localepurge
-VERSION=${VERSION:-0.7.3.8}
+VERSION=${VERSION:-0.7.3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/${PRGNAM}_${VERSION}.tar.xz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -88,7 +88,7 @@ install -D -m644 $CWD/localelist $PKG/var/cache/localepurge/localelist
 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
 
-DOCS="debian/NEWS.Debian debian/README.Debian debian/changelog debian/copyright"
+DOCS="debian/README.Debian debian/changelog debian/copyright"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/localepurge/localepurge.info b/system/localepurge/localepurge.info
index c6a844dfaf..6014256630 100644
--- a/system/localepurge/localepurge.info
+++ b/system/localepurge/localepurge.info
@@ -1,8 +1,8 @@
 PRGNAM="localepurge"
-VERSION="0.7.3.8"
+VERSION="0.7.3.10"
 HOMEPAGE="https://packages.debian.org/search?keywords=localepurge"
-DOWNLOAD="http://snapshot.debian.org/archive/debian/20190901T090537Z/pool/main/l/localepurge/localepurge_0.7.3.8.tar.xz"
-MD5SUM="a3588a6af1e0eb9a65abe137a275952b"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/l/localepurge/localepurge_0.7.3.10.tar.xz"
+MD5SUM="cafa19c565e5156c7947c0094fe76a3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/logwatch/README b/system/logwatch/README
index 2d194d0dfc..c3b26f004d 100644
--- a/system/logwatch/README
+++ b/system/logwatch/README
@@ -1,5 +1,5 @@
 Logwatch is a customizable log analysis system.
 
-Logwatch parses through your system's logs and creates a report analyzing
-areas that you specify. Logwatch is easy to use and will work right out of the
-package on most systems.
+Logwatch parses through your system's logs and creates a report
+analyzing areas that you specify. Logwatch is easy to use and will work
+right out of the package on most systems.
diff --git a/system/logwatch/logwatch.SlackBuild b/system/logwatch/logwatch.SlackBuild
index 72c8dd41c0..01b45f4253 100644
--- a/system/logwatch/logwatch.SlackBuild
+++ b/system/logwatch/logwatch.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=logwatch
-VERSION=${VERSION:-7.5.4}
+VERSION=${VERSION:-7.5.5}
 BUILD=${BUILD:-1}
 ARCH=noarch
 TAG=${TAG:-_SBo}
diff --git a/system/logwatch/logwatch.info b/system/logwatch/logwatch.info
index 32c3c00b23..8adcf7d5ad 100644
--- a/system/logwatch/logwatch.info
+++ b/system/logwatch/logwatch.info
@@ -1,8 +1,8 @@
 PRGNAM="logwatch"
-VERSION="7.5.4"
+VERSION="7.5.5"
 HOMEPAGE="http://logwatch.sourceforge.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/logwatch/logwatch-7.5.4/logwatch-7.5.4.tar.gz"
-MD5SUM="47b35a8e5efc415b4a775415255b8d1f"
+DOWNLOAD="https://downloads.sourceforge.net/project/logwatch/logwatch-7.5.5/logwatch-7.5.5.tar.gz"
+MD5SUM="b658e4db27d905151396ecadcbcb24b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/loksh/loksh.SlackBuild b/system/loksh/loksh.SlackBuild
index 3720480e91..9a57d890d4 100644
--- a/system/loksh/loksh.SlackBuild
+++ b/system/loksh/loksh.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=loksh
-VERSION=${VERSION:-6.7.2}
+VERSION=${VERSION:-6.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -102,9 +102,6 @@ mv -- $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/bin
 ln -s /bin/$PRGNAM $PKG/usr/bin/$PRGNAM
 
-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
-
 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
 
diff --git a/system/loksh/loksh.info b/system/loksh/loksh.info
index 5e3d180812..eb380c2afa 100644
--- a/system/loksh/loksh.info
+++ b/system/loksh/loksh.info
@@ -1,8 +1,8 @@
 PRGNAM="loksh"
-VERSION="6.7.2"
+VERSION="6.8.1"
 HOMEPAGE="https://github.com/dimkr/loksh"
-DOWNLOAD="https://github.com/dimkr/loksh/releases/download/6.7.2/loksh-6.7.2.tar.xz"
-MD5SUM="abe82b1d897e28f55f88fa030a854425"
+DOWNLOAD="https://github.com/dimkr/loksh/releases/download/6.8.1/loksh-6.8.1.tar.xz"
+MD5SUM="aad60aef7562ad4cf029411032892c2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson"
diff --git a/system/lolcat/lolcat.SlackBuild b/system/lolcat/lolcat.SlackBuild
index b35ab4042c..5b591c2421 100644
--- a/system/lolcat/lolcat.SlackBuild
+++ b/system/lolcat/lolcat.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for lolcat.
 #
-# Copyright 2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2019-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lolcat
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lolcat/lolcat.info b/system/lolcat/lolcat.info
index 811945da35..7b8e2bfd3c 100644
--- a/system/lolcat/lolcat.info
+++ b/system/lolcat/lolcat.info
@@ -1,8 +1,8 @@
 PRGNAM="lolcat"
-VERSION="1.0"
+VERSION="1.2"
 HOMEPAGE="https://github.com/jaseg/lolcat"
-DOWNLOAD="https://github.com/jaseg/lolcat/archive/v1.0/lolcat-1.0.tar.gz"
-MD5SUM="480be0ce83b056fe075d59d985d03a6c"
+DOWNLOAD="https://github.com/jaseg/lolcat/archive/v1.2/lolcat-1.2.tar.gz"
+MD5SUM="d1a7f8a4ddee5affe84de2d6ffa055e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lshw/README b/system/lshw/README
index f917315f0f..04d64576eb 100644
--- a/system/lshw/README
+++ b/system/lshw/README
@@ -1,15 +1,27 @@
-lshw (Hardware Lister) is a small tool to provide detailed information on 
-the hardware configuration of the machine. It can report exact memory 
-configuration, firmware version, mainboard configuration, CPU version and 
-speed, cache configuration, bus speed, etc. on DMI-capable x86 or EFI 
-(IA-64) systems and on some PowerPC machines (PowerMac G4 is known to work).
+lshw (Hardware Lister) is a small tool to provide detailed information
+on the hardware configuration of the machine. It can report exact memory
+configuration, firmware version, mainboard configuration, CPU version
+and speed, cache configuration, bus speed, etc. on DMI-capable x86 or
+EFI (IA-64) systems and on some PowerPC machines (PowerMac G4 is known
+to work).
 
 Information can be output in plain text, XML, or HTML.
 
 It currently supports DMI (x86 and EFI only), OpenFirmware device tree
-(PowerPC only), PCI/AGP, ISA PnP (x86), CPUID (x86), IDE/ATA/ATAPI, PCMCIA 
-(only tested on x86), USB, and SCSI.
+(PowerPC only), PCI/AGP, ISA PnP (x86), CPUID (x86), IDE/ATA/ATAPI,
+PCMCIA (only tested on x86), USB, and SCSI.
 
-On x86, lshw needs to be run as root to be able to access DMI information 
-from the BIOS. Running lshw as a non-root user usually gives much less 
-detailed information.
+On x86, lshw needs to be run as root to be able to access DMI
+information from the BIOS. Running lshw as a non-root user usually gives
+much less detailed information.
+
+There several build options available for the SlackBuild:
+
+  GUI=no           Disable GTK GUI support (default: yes)
+  ZLIB=yes         Enable zlib support (default: no)
+  SQLITE=yes       Enable sqlite support (default: no)
+
+where one or more build options are passed to the SlackBuild. For
+example, to disable GUI and enable zlib support use:
+
+  GUI=no ZLIB=yes ./lshw.SlackBuild
diff --git a/system/lshw/lshw.SlackBuild b/system/lshw/lshw.SlackBuild
index 0b24779004..fdd5409b83 100644
--- a/system/lshw/lshw.SlackBuild
+++ b/system/lshw/lshw.SlackBuild
@@ -1,13 +1,45 @@
 #!/bin/sh
 
 # Slackware build script for lshw
-# Written by Iskar Enev <iskar.enev[@]gmail.com>
+
+# Iskar Enev <iskar.enev[@]gmail.com>
+# Copyright 2017,2021 Jason Graham <jgraham@compukix.net> USA
+# 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=lshw
-VERSION=${VERSION:-B.02.18}
+VERSION=${VERSION:-B.02.19.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+GUI=${GUI:-yes}
+if [ "$ZLIB" = "no" ]; then
+    ENABLE_ZLIB=0
+else
+    ENABLE_ZLIB=1
+fi
+if [ "$SQLITE" = "no" ]; then
+    ENABLE_SQLITE=0
+else
+    ENABLE_SQLITE=1
+fi
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -53,10 +85,19 @@ find -L . \
 # Fix the MANDIR variable
 sed -i "s%MANDIR=\$(PREFIX)/share/man%MANDIR=\$(PREFIX)/man%" src/Makefile
 
-RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make
-RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make gui
-make install DESTDIR=$PKG
-make install-gui DESTDIR=$PKG
+VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+  make ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+if [ "$GUI" = "yes" ]; then
+  VERSION=VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+    make gui ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+fi
+
+VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+  make install DESTDIR=$PKG ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+if [ "$GUI" = "yes" ]; then
+  VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+    make install-gui DESTDIR=$PKG ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+fi
 
 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
@@ -64,8 +105,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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/share/applications
-cat $CWD/gtk-lshw.desktop > $PKG/usr/share/applications/gtk-lshw.desktop
+if [ "$GUI" = "yes" ]; then
+  mkdir -p $PKG/usr/share/applications
+  cat $CWD/gtk-lshw.desktop > $PKG/usr/share/applications/gtk-lshw.desktop
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/* COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/lshw/lshw.info b/system/lshw/lshw.info
index 4c8d8ae4c5..d6da2e38a2 100644
--- a/system/lshw/lshw.info
+++ b/system/lshw/lshw.info
@@ -1,10 +1,10 @@
 PRGNAM="lshw"
-VERSION="B.02.18"
+VERSION="B.02.19.2"
 HOMEPAGE="https://ezix.org/project/wiki/HardwareLiSter"
-DOWNLOAD="https://www.ezix.org/software/files/lshw-B.02.18.tar.gz"
-MD5SUM="8671c6d94d6324a744b7f21f1bfecfd2"
+DOWNLOAD="https://www.ezix.org/software/files/lshw-B.02.19.2.tar.gz"
+MD5SUM="8c70d46e906688309095c73ecb9396e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/system/lv/README b/system/lv/README
new file mode 100644
index 0000000000..41dc4fdfaf
--- /dev/null
+++ b/system/lv/README
@@ -0,0 +1,17 @@
+lv (pager, grep, and iconv replacement)
+
+lv is a powerful file viewer like less. lv can decode and encode
+multilingual streams in many encodings, including ISO-8859, ISO-2022,
+EUC, SJIS, Big5, HZ, and Unicode. It recognizes multi-byte patterns
+in regular expressions, and can be run as "lgrep" to act as a grep
+replacement. In addition, lv can recognize ANSI escape sequences for
+text decoration (making it suitable for use as MANPAGER).
+
+lv can also be used as a replacement for iconv(1), by redirecting
+its standard output and using the -I and -O options to set the input
+and output encodings. Although it doesn't support all the features of
+iconv, lv will autodetect the input encoding (which iconv won't).
+
+lv also has one (possibly) unique feature: It can autodetect and
+convert or display multiple character encodings *within the same
+document*.
diff --git a/system/lv/lv.SlackBuild b/system/lv/lv.SlackBuild
new file mode 100644
index 0000000000..eb8c06c100
--- /dev/null
+++ b/system/lv/lv.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Slackware build script for lv
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20201111 bkw: added at v4.51_7. The original upstream for this is
+# long gone (dead website), but the maintainer of the Debian package
+# continues to develop this. So I'm treating Debian as upstream, and
+# the _7 in VERSION is the Debian patchlevel.
+
+# 20201115 bkw: add 2 new patches from Debian git, BUILD=2.
+
+PRGNAM=lv
+VERSION=${VERSION:-4.51_7}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Nothing uses LIBDIRSUFFIX, don't bother with it.
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+SRCVER=${VERSION%_*}  # 1.23_4 => 1.23
+DEBVER=${VERSION#*_}  # 1.23_4 => 4
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER.orig
+tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.?z
+cd $PRGNAM-$SRCVER.orig
+tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Apply all of debian's patches.
+for i in $( cat debian/patches/series ); do
+  patch -p1 < "debian/patches/$i"
+done
+
+# Local patches. 4 of these were written by the SlackBuild author, sent
+# upstream (to the Debian maintainer). The height and filename patches
+# are from Debian's git.
+for i in $( cat $CWD/patches/series ); do
+  patch -p1 < "$CWD/patches/$i"
+done
+
+# I wish there were --disable-termcap and/or --enable-ncurses options.
+# The configure script is hardcoded: if termcap is found, it uses that
+# and never looks for ncurses. Since termcap is pretty well deprecated
+# here in the 21st century, we'd much rather use ncurses...
+sed -i 's,termcap,ncurses,g' src/configure
+
+# libdir is /usr/share because all that gets installed there is the lv
+# help file (which is just a pre-rendered version of the man page).
+cd build
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+../src/configure \
+  --enable-fastio \
+  --prefix=/usr \
+  --libdir=/usr/share \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# binary already stripped
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/lgrep.1.gz
+
+cd ..
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* GPL* hello.* debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Japanese-language sections in the HTML docs are in some kind of
+# non-Unicode encoding. lv autodetects it just fine, but nothing else
+# seems to, so use lv itself to convert them to UTF-8. This is helpful
+# if you're reading the files locally with a browser: there's no HTTP
+# headers to specify the encoding, and UTF-8 is more likely to be
+# autodetected or just guessed at.
+for i in *.html; do
+  $PKG/usr/bin/lv -Ou8 $i > $PKG/usr/doc/$PRGNAM-$VERSION/$i
+done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lv/lv.info b/system/lv/lv.info
new file mode 100644
index 0000000000..3d29aca4a8
--- /dev/null
+++ b/system/lv/lv.info
@@ -0,0 +1,12 @@
+PRGNAM="lv"
+VERSION="4.51_7"
+HOMEPAGE="https://packages.debian.org/sid/lv"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/l/lv/lv_4.51.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/l/lv/lv_4.51-7.debian.tar.xz"
+MD5SUM="893084b35a11eaaee4f71827d0092fa5 \
+        d6d2d0e27a43480b794615a02235b953"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/lv/patches/change-maximum-height-to-144.patch b/system/lv/patches/change-maximum-height-to-144.patch
new file mode 100644
index 0000000000..84b4afe0c2
--- /dev/null
+++ b/system/lv/patches/change-maximum-height-to-144.patch
@@ -0,0 +1,17 @@
+Author: TOMITA Masahiro <tommy@tmtm.org>
+Description: Change maximum height to 144.
+Last-Update: 2020-10-10
+
+Index: lv/src/file.h
+===================================================================
+--- lv.orig/src/file.h
++++ lv/src/file.h
+@@ -16,7 +16,7 @@
+ #include <str.h>
+ #include <stream.h>
+ 
+-#define LV_PAGE_SIZE	32U		/* lines per page */
++#define LV_PAGE_SIZE	48U		/* lines per page */
+ 
+ #ifdef MSDOS
+ #define BLOCK_SIZE	2		/* segments on memory */
diff --git a/system/lv/patches/fix_implicit_decls.diff b/system/lv/patches/fix_implicit_decls.diff
new file mode 100644
index 0000000000..1f9de61b91
--- /dev/null
+++ b/system/lv/patches/fix_implicit_decls.diff
@@ -0,0 +1,41 @@
+Description: Remove implicit declaration warnings by adding
+appropriate #includes, and fix a typo in a prototype.
+Author: B. Watson <yahlcru@gmail.com>
+
+--
+
+diff -Naur lv-4.51.orig/src/file.h lv-4.51.orig.patched/src/file.h
+--- lv-4.51.orig/src/file.h	2020-11-12 02:03:33.560002050 -0500
++++ lv-4.51.orig.patched/src/file.h	2020-11-12 02:04:06.555999050 -0500
+@@ -172,7 +172,7 @@
+ public inline int IobufGetc( iobuf_t *iobuf );
+ public inline int IobufUngetc( int ch, iobuf_t *iobuf );
+ public offset_t IobufFtell( iobuf_t *iobuf );
+-public int IobufFseeko( iobuf_t *iobuf, offset_t off, int mode );
++public int IobufFseek( iobuf_t *iobuf, offset_t off, int mode );
+ public int IobufFeof( iobuf_t *iobuf );
+ #endif
+ #define IobufPutc( a, b )	putc( a, (b)->iop )
+diff -Naur lv-4.51.orig/src/guess.c lv-4.51.orig.patched/src/guess.c
+--- lv-4.51.orig/src/guess.c	2003-11-12 22:08:19.000000000 -0500
++++ lv-4.51.orig.patched/src/guess.c	2020-11-12 02:04:22.621997590 -0500
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include <import.h>
+ #include <decode.h>
+diff -Naur lv-4.51.orig/src/guesslocale.c lv-4.51.orig.patched/src/guesslocale.c
+--- lv-4.51.orig/src/guesslocale.c	2004-01-05 03:41:22.000000000 -0500
++++ lv-4.51.orig.patched/src/guesslocale.c	2020-11-12 02:04:49.294995165 -0500
+@@ -20,6 +20,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <ctype.h>
++
+ #ifdef HAVE_SETLOCALE
+ 
+ #include <stdlib.h>
diff --git a/system/lv/patches/makefile.diff b/system/lv/patches/makefile.diff
new file mode 100644
index 0000000000..4c55d7c5d2
--- /dev/null
+++ b/system/lv/patches/makefile.diff
@@ -0,0 +1,53 @@
+Description: "make install": Support DESTDIR, use symlink for
+lgrep, use more standard default permissions (and make them
+variables). Create bin/man/lib dirs if they don't already exist.
+Author: B. Watson <yahlcru@gmail.com>
+
+--
+
+diff -Naur lv-4.51.orig/src/Makefile.in lv-4.51.orig.patched/src/Makefile.in
+--- lv-4.51.orig/src/Makefile.in	2004-01-06 02:22:17.000000000 -0500
++++ lv-4.51.orig.patched/src/Makefile.in	2020-11-12 01:59:50.646022314 -0500
+@@ -18,6 +18,10 @@
+ lvlibdir=	$(libdir)/lv
+ distdir = lv$(VERSION)
+ 
++DESTDIR=
++BINPERMS= 0755
++DOCPERMS= 0644
++
+ PURIFY=	@PURIFY@
+ CC=	@CC@
+ CFLAGS=	@CFLAGS@ -DLV_HELP_PATH=\"$(lvlibdir)\" -I$(srcdir) @DEFS@
+@@ -64,18 +68,22 @@
+ #
+ 
+ install::
+-	$(INSTALL) -s -m 555 lv $(bindir)
+-	if test -f $(bindir)/lgrep; then \
+-		/bin/rm -f $(bindir)/lgrep; \
++	if test ! -d $(DESTDIR)$(bindir); then \
++		mkdir -p $(DESTDIR)$(bindir); \
++	fi
++	$(INSTALL) -s -m $(BINPERMS) lv $(DESTDIR)$(bindir)
++	if test -f $(DESTDIR)$(bindir)/lgrep; then \
++		/bin/rm -f $(DESTDIR)$(bindir)/lgrep; \
+ 	fi
+-	(cd $(bindir); ln lv lgrep)
+-	if test ! -d $(lvlibdir); then \
+-		mkdir -p $(lvlibdir); \
++	(cd $(DESTDIR)$(bindir); ln -s lv lgrep)
++	if test ! -d $(DESTDIR)$(lvlibdir); then \
++		mkdir -p $(DESTDIR)$(lvlibdir); \
+ 	fi
+-	$(INSTALL) -m 444 $(srcdir)/../lv.hlp $(lvlibdir)
+-	if test -d $(mandir) -a -d $(mandir)/man1; then \
+-		$(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \
++	$(INSTALL) -m $(DOCPERMS) $(srcdir)/../lv.hlp $(DESTDIR)$(lvlibdir)
++	if test ! -d $(DESTDIR)$(mandir)/man1; then \
++		mkdir -p $(DESTDIR)$(mandir)/man1; \
+ 	fi
++	$(INSTALL) -m $(DOCPERMS) $(srcdir)/../lv.1 $(DESTDIR)$(mandir)/man1; \
+ 
+ uninstall::
+ 	for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \
diff --git a/system/lv/patches/man_typos.diff b/system/lv/patches/man_typos.diff
new file mode 100644
index 0000000000..be6e2ad63d
--- /dev/null
+++ b/system/lv/patches/man_typos.diff
@@ -0,0 +1,65 @@
+Description: Fix a few typos in the man & help docs.
+Author: B. Watson <yahlcru@gmail.com>
+
+--
+
+diff -Naur lv-4.51.orig/lv.1 lv-4.51.orig.patched/lv.1
+--- lv-4.51.orig/lv.1	2020-11-12 01:44:33.656105671 -0500
++++ lv-4.51.orig.patched/lv.1	2020-11-12 01:45:58.092097996 -0500
+@@ -47,7 +47,7 @@
+ but also as a coding-system translation filter
+ like \fInkf\fP (1) and \fItcs\fP (1).
+ .IP "\fIMultilingual regular expressions / Multilingual grep\fP"
+-lv can recognize multi-bytes patterns as regular expressions,
++lv can recognize multi-byte patterns as regular expressions,
+ and lv also provides multilingual \fIgrep\fP (1) functionality
+ by giving it another name, \fIlgrep\fP.
+ Pattern matching is conducted in the charset level,
+@@ -203,7 +203,7 @@
+ Allow physical lines of each logical line printed on the screen
+ to be concatenated for cut and paste after screen refresh
+ .IP "-s"
+-Force old pages to be swept out from the screen Smoothly
++Force old pages to be swept out from the screen smoothly
+ .IP "-u"
+ Unify several character sets, eg. JIS X0208 and C6226.
+ In addition, lv equates ISO 646 variants,
+@@ -237,7 +237,7 @@
+ Show this help
+ .SH "CONFIGURATION"
+ Options can be described in configuration file ``.lv'' (``_lv'' on MSDOS)
+-located at you HOME directory.  If and only if you use MSDOS, you can locate
++located in your HOME directory.  If and only if you use MSDOS, you can locate
+ ``_lv'' at current working directory.
+ They can be also described in the environment variable LV.
+ Every configuration will be overloaded in this order if there is. Command line
+diff -Naur lv-4.51.orig/lv.hlp lv-4.51.orig.patched/lv.hlp
+--- lv-4.51.orig/lv.hlp	2020-11-12 01:44:33.635105673 -0500
++++ lv-4.51.orig.patched/lv.hlp	2020-11-12 01:45:58.098097995 -0500
+@@ -37,7 +37,7 @@
+               _t_c_s (1).
+ 
+        _M_u_l_t_i_l_i_n_g_u_a_l _r_e_g_u_l_a_r _e_x_p_r_e_s_s_i_o_n_s _/ _M_u_l_t_i_l_i_n_g_u_a_l _g_r_e_p
+-              lv  can  recognize  multi-bytes patterns as regular expressions,
++              lv  can  recognize  multi-byte patterns as regular expressions,
+               and lv also provides multilingual _g_r_e_p (1) functionality by giv-
+               ing  it  another  name, _l_g_r_e_p.  Pattern matching is conducted in
+               the charset level, so an EUC fragment, for example, can be found
+@@ -183,7 +183,7 @@
+        -l     Allow physical lines of each logical line printed on the  screen
+               to be concatenated for cut and paste after screen refresh
+ 
+-       -s     Force old pages to be swept out from the screen Smoothly
++       -s     Force old pages to be swept out from the screen smoothly
+ 
+        -u     Unify several character sets, eg. JIS X0208 and C6226.  In addi-
+               tion, lv equates ISO 646  variants,  eg.  JIS  X0201-Roman,  and
+@@ -219,7 +219,7 @@
+ 
+ CCOONNFFIIGGUURRAATTIIOONN
+        Options  can  be  described  in  configuration file ``.lv'' (``_lv'' on
+-       MSDOS) located at you HOME directory.  If and only if  you  use  MSDOS,
++       MSDOS) located in your HOME directory.  If and only if  you  use  MSDOS,
+        you  can locate ``_lv'' at current working directory.  They can be also
+        described in the environment variable LV.  Every configuration will  be
+        overloaded  in  this order if there is. Command line options are always
diff --git a/system/lv/patches/no_inline.diff b/system/lv/patches/no_inline.diff
new file mode 100644
index 0000000000..ebc1eb58f6
--- /dev/null
+++ b/system/lv/patches/no_inline.diff
@@ -0,0 +1,19 @@
+Description: Remove inline-related compiler warnings (by not using inline)
+Author: B. Watson <yahlcru@gmail.com>
+
+--
+
+diff -Naur lv-4.51.orig/src/file.h lv-4.51.orig.patched/src/file.h
+--- lv-4.51.orig/src/file.h	2020-11-12 01:41:53.353120244 -0500
++++ lv-4.51.orig.patched/src/file.h	2020-11-12 01:44:33.701105667 -0500
+@@ -169,8 +169,8 @@
+ # endif
+ # define IobufFeof( a )		feof( (a)->iop )
+ #else
+-public inline int IobufGetc( iobuf_t *iobuf );
+-public inline int IobufUngetc( int ch, iobuf_t *iobuf );
++public int IobufGetc( iobuf_t *iobuf );
++public int IobufUngetc( int ch, iobuf_t *iobuf );
+ public offset_t IobufFtell( iobuf_t *iobuf );
+ public int IobufFseek( iobuf_t *iobuf, offset_t off, int mode );
+ public int IobufFeof( iobuf_t *iobuf );
diff --git a/system/lv/patches/series b/system/lv/patches/series
new file mode 100644
index 0000000000..ce324941d9
--- /dev/null
+++ b/system/lv/patches/series
@@ -0,0 +1,6 @@
+change-maximum-height-to-144.patch
+fix_implicit_decls.diff
+no_inline.diff
+man_typos.diff
+makefile.diff
+shows-the-filename-only.diff
diff --git a/system/lv/patches/shows-the-filename-only.diff b/system/lv/patches/shows-the-filename-only.diff
new file mode 100644
index 0000000000..32912b4209
--- /dev/null
+++ b/system/lv/patches/shows-the-filename-only.diff
@@ -0,0 +1,25 @@
+Description: shows the file name only if it is shorter than the width of the screen.
+Author: Oohara Yuuma <oohara@libra.interq.or.jp>
+Last-Update: 2008-01-27
+
+Index: lv/src/command.c
+===================================================================
+--- lv.orig/src/command.c
++++ lv/src/command.c
+@@ -1173,8 +1173,15 @@ public void Command( file_t *file, byte
+ 	else
+ 	  label = "(END)";
+       }
+-      if( TRUE == f->top )
++      if( TRUE == f->top ){
+ 	label = FileName( f );
++        /* if the file name is not shorter than the width of the screen,
++         * it causes scrolling and moves the first line of the file
++         * out of the screen
++         */
++        if ( strlen(label) >= f->width )
++          label = NULL;
++      }
+     }
+ 
+     if( NULL != label ){
diff --git a/system/lv/slack-desc b/system/lv/slack-desc
new file mode 100644
index 0000000000..cf08b44fb5
--- /dev/null
+++ b/system/lv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+lv: lv (pager, grep, and iconv replacement)
+lv:
+lv: lv is a powerful file viewer like less. lv can decode and encode
+lv: multilingual streams in many encodings, including ISO-8859, ISO-2022,
+lv: EUC, SJIS, Big5, HZ, and Unicode. It recognizes multi-byte patterns
+lv: in regular expressions, and can be run as "lgrep" to act as a grep
+lv: replacement. In addition, lv can recognize ANSI escape sequences for
+lv: text decoration (making it suitable for use as MANPAGER).
+lv:
+lv:
+lv:
diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild
index 773b8f900d..3856967c99 100644
--- a/system/lxtask/lxtask.SlackBuild
+++ b/system/lxtask/lxtask.SlackBuild
@@ -51,6 +51,8 @@
 #             * updated.
 # 0.1.9-1:    11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org>
 #             * updated.
+# 0.1.10-1:   10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org>
+#             * updated.
 #
 # Run 'sh lxtask.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -59,7 +61,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxtask
-VERSION=${VERSION:-0.1.9}
+VERSION=${VERSION:-0.1.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lxtask/lxtask.info b/system/lxtask/lxtask.info
index 80d2cb4154..8e9a1f2b23 100644
--- a/system/lxtask/lxtask.info
+++ b/system/lxtask/lxtask.info
@@ -1,8 +1,8 @@
 PRGNAM="lxtask"
-VERSION="0.1.9"
+VERSION="0.1.10"
 HOMEPAGE="https://wiki.lxde.org/en/LXTask"
-DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.9.tar.xz"
-MD5SUM="f19a9e4d22a075f984681a480f0aa886"
+DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.10.tar.xz"
+MD5SUM="27b5258847afc237a5b89666e7a8b45b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lxde-common lxpanel"
diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild
index 5cd1509a1b..ef12fe3f5a 100644
--- a/system/lxterminal/lxterminal.SlackBuild
+++ b/system/lxterminal/lxterminal.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id: lxterminal.SlackBuild,v 1.6 2009/09/11 10:43:05 root Exp root $
 # Copyright (c) 2008-2009  Eric Hameleers, Eindhoven, NL
-# Copyright (c) 2010-2018  Matteo Bernardini, Pisa, IT
+# Copyright (c) 2010-2021  Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -67,6 +67,8 @@
 #             * Update.
 # 0.3.2:      13/oct/2018 by Matteo Bernardini <ponce@slackbuilds.org>
 #             * Update.
+# 0.4.0:      10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org>
+#             * Update.
 #
 # Run 'sh lxterminal.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -75,7 +77,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxterminal
-VERSION=${VERSION:-0.3.2}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index 8f5130af46..d8fecdbf39 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -1,8 +1,8 @@
 PRGNAM="lxterminal"
-VERSION="0.3.2"
+VERSION="0.4.0"
 HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz"
-MD5SUM="62e57c3aafb831505cc1638b2b737cc9"
+DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz"
+MD5SUM="7938dbd50e3826c11f4735a742b278d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lynis/lynis.SlackBuild b/system/lynis/lynis.SlackBuild
index aacef78b5d..ca54fe860a 100644
--- a/system/lynis/lynis.SlackBuild
+++ b/system/lynis/lynis.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lynis
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lynis/lynis.info b/system/lynis/lynis.info
index 30609f9b26..a6d8d16660 100644
--- a/system/lynis/lynis.info
+++ b/system/lynis/lynis.info
@@ -1,8 +1,8 @@
 PRGNAM="lynis"
-VERSION="3.0.1"
+VERSION="3.0.3"
 HOMEPAGE="https://cisofy.com/"
-DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-3.0.1.tar.gz"
-MD5SUM="ac984258e89b88c86e8c1c5395de8a15"
+DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-3.0.3.tar.gz"
+MD5SUM="44b26983029929912d5bab53a083f776"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild
index f164983623..17feed23bd 100644
--- a/system/lz4/lz4.SlackBuild
+++ b/system/lz4/lz4.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201208 bkw: update for 1.9.3
 # 20191127 bkw: update for 1.9.2
 # 20180911 bkw: update for 1.8.3
 # 20180611 bkw: update for 1.8.2. don't try to use the updated script
@@ -18,7 +19,7 @@
 # 20170122 bkw: update for 1.7.5
 
 PRGNAM=lz4
-VERSION=${VERSION:-1.9.2}
+VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lz4/lz4.info b/system/lz4/lz4.info
index dc19a75be8..b6bb9ea084 100644
--- a/system/lz4/lz4.info
+++ b/system/lz4/lz4.info
@@ -1,8 +1,8 @@
 PRGNAM="lz4"
-VERSION="1.9.2"
+VERSION="1.9.3"
 HOMEPAGE="https://lz4.github.io/lz4/"
-DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.2/lz4-1.9.2.tar.gz"
-MD5SUM="3898c56c82fb3d9455aefd48db48eaad"
+DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz"
+MD5SUM="3a1ab1684e14fc1afc66228ce61b2db3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mailfromd/mailfromd.SlackBuild b/system/mailfromd/mailfromd.SlackBuild
index a9c24f9152..18771dd3d2 100644
--- a/system/mailfromd/mailfromd.SlackBuild
+++ b/system/mailfromd/mailfromd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mailfromd
 
-# Copyright 2018 Sergey Poznyakoff <gray@gnu.org>
+# Copyright 2021 Sergey Poznyakoff <gray@gnu.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mailfromd
-VERSION=${VERSION:-8.5}
+VERSION=${VERSION:-8.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/mailfromd/mailfromd.info b/system/mailfromd/mailfromd.info
index a056ef3e6f..52ce5a5963 100644
--- a/system/mailfromd/mailfromd.info
+++ b/system/mailfromd/mailfromd.info
@@ -1,8 +1,8 @@
 PRGNAM="mailfromd"
-VERSION="8.5"
+VERSION="8.9"
 HOMEPAGE="http://puszcza.gnu.org.ua/software/mailfromd"
-DOWNLOAD="http://download.gnu.org.ua/pub/release/mailfromd/mailfromd-8.5.tar.gz"
-MD5SUM="3b2f97b5defe71e46ff8cbdff3990de5"
+DOWNLOAD="http://download.gnu.org.ua/pub/release/mailfromd/mailfromd-8.9.tar.gz"
+MD5SUM="77bb38237483616893b926356bc47103"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mailutils adns"
diff --git a/system/mailutils/mailutils.SlackBuild b/system/mailutils/mailutils.SlackBuild
index a438b253e7..a5bae7cc7c 100644
--- a/system/mailutils/mailutils.SlackBuild
+++ b/system/mailutils/mailutils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for GNU mailutils
 
-# Copyright 2019 Sergey Poznyakoff, <gray@gnu.org>
+# Copyright 2021 Sergey Poznyakoff, <gray@gnu.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mailutils
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-3.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/mailutils/mailutils.info b/system/mailutils/mailutils.info
index e5624e9bfd..1f455d8c9f 100644
--- a/system/mailutils/mailutils.info
+++ b/system/mailutils/mailutils.info
@@ -1,8 +1,8 @@
 PRGNAM="mailutils"
-VERSION="3.9"
+VERSION="3.11.1"
 HOMEPAGE="http://mailutils.org"
-DOWNLOAD="https://ftp.gnu.org/gnu/mailutils/mailutils-3.9.tar.gz"
-MD5SUM="a3d1b9022b82bfa1c970aaad82303538"
+DOWNLOAD="https://ftp.gnu.org/gnu/mailutils/mailutils-3.11.1.tar.gz"
+MD5SUM="1f47762607801ad3b9b5642c0d0fbac7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgsasl %README%"
diff --git a/system/man-db/README b/system/man-db/README
index 1e48863b3a..8ac7c0c470 100644
--- a/system/man-db/README
+++ b/system/man-db/README
@@ -1,11 +1,12 @@
 man-db (database-driven manual pager suite)
 
-This package provides the man command and related utilities for examining
-on-line help files (manual pages). It can act as a replacement for
-Slackware's man package. It has several enhancements over man, including
-an indexed database for searches with -k or apropos, the ability to
-easily view man pages in a browser, better i18n support, and a much more
-efficient implementation of the -K (full text search) option.
+This package provides the man command and related utilities
+for examining on-line help files (manual pages). It can act as a
+replacement for Slackware's man package. It has several enhancements
+over man, including an indexed database for searches with -k or
+apropos, the ability to easily view man pages in a browser, better
+i18n support, and a much more efficient implementation of the -K (full
+text search) option.
 
 This build includes a complete install of libpipeline.
 
diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild
index 1c9d903fc3..7c9b5a31f6 100644
--- a/system/man-db/man-db.SlackBuild
+++ b/system/man-db/man-db.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210306 bkw: update for v2.9.4 (resync with -current again)
+# 20201024 bkw: update for v2.9.3 (matches -current)
 # 20200316 bkw: update for v2.9.1 (resync with -current)
 # 20191201 bkw: update for v2.9.0 (to match -current again).
 # Also got rid of the systemd-specific stuff properly (via configure opts).
@@ -53,7 +55,7 @@
 # - update README and README.Slackware slightly.
 
 PRGNAM=man-db
-VERSION=${VERSION:-2.9.1}
+VERSION=${VERSION:-2.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -110,7 +112,7 @@ mkdir -p $TMP $PKG $OUTPUT
 # Instead of making it a separate build and external dep, we'll just
 # bundle it here.
 LIBNAM=libpipeline
-LIBVER=1.5.2
+LIBVER=1.5.3
 
 cd $TMP
 rm -rf $LIBNAM-$LIBVER
diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info
index 3106bed766..62e0c9f10e 100644
--- a/system/man-db/man-db.info
+++ b/system/man-db/man-db.info
@@ -1,10 +1,10 @@
 PRGNAM="man-db"
-VERSION="2.9.1"
+VERSION="2.9.4"
 HOMEPAGE="http://www.nongnu.org/man-db/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.1.tar.xz \
-          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.2.tar.gz"
-MD5SUM="593f4f0a26ab4f66f5b81cf6c0c7364c \
-        169de4cc1f6f7f7d430a5bed858b2fd3"
+DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.4.tar.xz \
+          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz"
+MD5SUM="6e233a555f7b9ae91ce7cd0faa322bce \
+        dad443d0911cf9f0f1bd90a334bc9004"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/man-pages-ja/man-pages-ja.SlackBuild b/system/man-pages-ja/man-pages-ja.SlackBuild
index bab442a1be..13333c85bb 100644
--- a/system/man-pages-ja/man-pages-ja.SlackBuild
+++ b/system/man-pages-ja/man-pages-ja.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=man-pages-ja
-VERSION=${VERSION:-20171215}
+VERSION=${VERSION:-20201015}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -27,11 +27,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # I'm almost certain this is correct, based on how other distros do it.
 # The other possibility was "ja.UTF-8". A /usr/man/jp dir does exist on
diff --git a/system/man-pages-ja/man-pages-ja.info b/system/man-pages-ja/man-pages-ja.info
index 9ee6b330bc..8cd22f19ca 100644
--- a/system/man-pages-ja/man-pages-ja.info
+++ b/system/man-pages-ja/man-pages-ja.info
@@ -1,8 +1,8 @@
 PRGNAM="man-pages-ja"
-VERSION="20171215"
+VERSION="20201015"
 HOMEPAGE="http://linuxjm.sourceforge.jp/"
-DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20171215.tar.gz"
-MD5SUM="679767d28b95a1004a43b0568629f37e"
+DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20201015.tar.gz"
+MD5SUM="2ca73214a0027747ec3cc59e8059bc58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="man-db"
diff --git a/system/man-pages-ru/README b/system/man-pages-ru/README
index f91c1b8bf9..737959c9c1 100644
--- a/system/man-pages-ru/README
+++ b/system/man-pages-ru/README
@@ -1 +1,10 @@
-Russian translation for system man pages version 3.41
+man-pages-ru (Russian system documentation)
+
+Russian translation for system man pages. This requires a terminal
+that can handle UTF-8 (such as konsole, xfce4-terminal, or
+rxvt-unicode), and a UTF-8 locale such as LANG=ru_RU.UTF-8. You'll
+also need a font that displays Cyrillic glyphs (should be included
+with Slackware already).
+
+Sadly, this isn't a complete set of man pages. For instance, there are
+no man pages included for coreutils.
diff --git a/system/man-pages-ru/man-pages-ru.SlackBuild b/system/man-pages-ru/man-pages-ru.SlackBuild
index 568b06ec02..ad1a76d094 100644
--- a/system/man-pages-ru/man-pages-ru.SlackBuild
+++ b/system/man-pages-ru/man-pages-ru.SlackBuild
@@ -22,12 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20201105 bkw: This hasn't been updated in 7+ years, and I'm not sure
+# it ever worked properly with 14.2's man command. Update to latest
+# version and document how to get this stuff to work with man-db and a
+# utf-8 capable terminal.
+
 PRGNAM=man-pages-ru
-VERSION=${VERSION:-3.41_20130102} # Set the version to something sane.
+VERSION=${VERSION:-5.03_20191017} # Set the version to something sane.
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=${SRCVERSION:-$(echo $PRGNAM_*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)}
+SRCVERSION="$(echo $PRGNAM_*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)"
 
 ARCH=noarch
 
@@ -45,27 +50,21 @@ rm -rf $PRGNAM\_$SRCVERSION
 tar xvf $CWD/$PRGNAM\_$SRCVERSION.tar.bz2
 cd $PRGNAM\_$SRCVERSION
 chown -R root:root .
-find -L . \
-  \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# This one is included in Slackware.
+rm man5/passwd.5
 
-mkdir -p $PKG/usr/man/ru
+mkdir -p $PKG/usr/man/ru.UTF-8
 for section in 1 2 3 4 5 6 7 8 ; do
-  mv man$section $PKG/usr/man/ru
+  mv man$section $PKG/usr/man/ru.UTF-8
 done
 
-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
-
-# This one is included in Slackware.
-rm $PKG/usr/man/ru/man5/passwd.5.gz
+find $PKG/usr/man -type f -exec gzip -9 {} \+
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README License \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README License $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/man-pages-ru/man-pages-ru.info b/system/man-pages-ru/man-pages-ru.info
index 3ea60886d4..8d5e4afdd9 100644
--- a/system/man-pages-ru/man-pages-ru.info
+++ b/system/man-pages-ru/man-pages-ru.info
@@ -1,10 +1,10 @@
 PRGNAM="man-pages-ru"
-VERSION="3.41_20130102"
+VERSION="5.03_20191017"
 HOMEPAGE="http://man-pages-ru.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/man-pages-ru/files/man-pages-ru_3.41-2145-1724-20130102.tar.bz2"
-MD5SUM="2fc85340225409fe8d5dfbf90b2a0575"
+DOWNLOAD="http://sourceforge.net/projects/man-pages-ru/files/man-pages-ru_5.03-2390-2390-20191017.tar.bz2"
+MD5SUM="0b4bc884e9f94ca107de6a8eaa60f03e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Anton Sil'uev"
-EMAIL="burning2007@ya.ru"
+REQUIRES="man-db"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/man-pages-ru/slack-desc b/system/man-pages-ru/slack-desc
index 0255970528..7b7011da1f 100644
--- a/system/man-pages-ru/slack-desc
+++ b/system/man-pages-ru/slack-desc
@@ -8,11 +8,11 @@
             |-----handy-ruler------------------------------------------------------|
 man-pages-ru: man-pages-ru (Russian system documentation)
 man-pages-ru:
-man-pages-ru: Russian translation files for man pages
-man-pages-ru:
-man-pages-ru: Visit http://man-pages-ru.sourceforge.net/ for details.
-man-pages-ru:
-man-pages-ru:
+man-pages-ru: Russian translation for system man pages. This requires a terminal
+man-pages-ru: that can handle UTF-8 (such as konsole, xfce4-terminal, or
+man-pages-ru: rxvt-unicode), and a UTF-8 locale such as LANG=ru_RU.UTF-8. You'll
+man-pages-ru: also need a font that displays Cyrillic glyphs (should be included
+man-pages-ru: with Slackware already).
 man-pages-ru:
 man-pages-ru:
 man-pages-ru:
diff --git a/system/memtester/memtester.SlackBuild b/system/memtester/memtester.SlackBuild
index d32e2086c4..9b17fd3fea 100644
--- a/system/memtester/memtester.SlackBuild
+++ b/system/memtester/memtester.SlackBuild
@@ -6,10 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# The _5 is the debian patchlevel.
+# The _1 is the debian patchlevel.
 
 PRGNAM=memtester
-VERSION=${VERSION:-4.3.0_5}
+VERSION=${VERSION:-4.5.0_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/memtester/memtester.info b/system/memtester/memtester.info
index eac51c6c69..083ffb958c 100644
--- a/system/memtester/memtester.info
+++ b/system/memtester/memtester.info
@@ -1,10 +1,10 @@
 PRGNAM="memtester"
-VERSION="4.3.0_5"
+VERSION="4.5.0_1"
 HOMEPAGE="http://pyropus.ca/software/memtester/"
-DOWNLOAD="http://pyropus.ca/software/memtester/old-versions/memtester-4.3.0.tar.gz \
-          http://deb.debian.org/debian/pool/main/m/memtester/memtester_4.3.0-5.debian.tar.xz"
-MD5SUM="598f41b7308e1f736164bca3ab84ddbe \
-        a1db0271761c3913357a1930e5753e3b"
+DOWNLOAD="http://pyropus.ca/software/memtester/old-versions/memtester-4.5.0.tar.gz \
+          http://deb.debian.org/debian/pool/main/m/memtester/memtester_4.5.0-1.debian.tar.xz"
+MD5SUM="674a8a88ff54bdb229ca4148218a41f1 \
+        c4c05a502aedeef0d06d7ebd62b73040"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index 23d3874da8..9559c2d945 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mksh
 
-# Copyright (c) 2011-2020  Markus Reichelt, Aachen, DE
+# Copyright (c) 2011-2021  Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -26,7 +26,7 @@
 # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=mksh
-VERSION=${VERSION:-R59b}
+VERSION=${VERSION:-R59c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -103,6 +103,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install
 
 ginstall -D -m 755 mksh $PKG/bin/mksh
 ginstall -D -m 644 ../mksh.1 $PKG/usr/man/man1/
+ginstall -D -m 644 ../lksh.1 $PKG/usr/man/man1/
+ginstall -D -m 644 ../mksh.faq $PKG/usr/doc/$PRGNAM-$VERSION/
 ginstall -D -m 644 ../dot.mkshrc $PKG/etc/skel/.mkshrc.new
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index 49c3168021..e9eacb68f9 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,8 +1,8 @@
 PRGNAM="mksh"
-VERSION="R59b"
+VERSION="R59c"
 HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59b.tgz"
-MD5SUM="dce6abffc2036288540b9ba11dfb2ec8"
+DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz"
+MD5SUM="99f8ac3c1d8a30b913d509f1969a4aaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mlterm/mlterm.SlackBuild b/system/mlterm/mlterm.SlackBuild
index 1bdf3245fe..04efd20c2b 100644
--- a/system/mlterm/mlterm.SlackBuild
+++ b/system/mlterm/mlterm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mlterm
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mlterm
-VERSION=${VERSION:-3.8.9}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/mlterm/mlterm.info b/system/mlterm/mlterm.info
index c7a6688928..d34b3828cb 100644
--- a/system/mlterm/mlterm.info
+++ b/system/mlterm/mlterm.info
@@ -1,8 +1,8 @@
 PRGNAM="mlterm"
-VERSION="3.8.9"
+VERSION="3.9.1"
 HOMEPAGE="http://mlterm.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.8.9/mlterm-3.8.9.tar.gz"
-MD5SUM="9b1d4c49e7590881b715cfffa68460c5"
+DOWNLOAD="https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.9.1/mlterm-3.9.1.tar.gz"
+MD5SUM="2811050f2f46fd7a73446b61daeb7999"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mmv/README b/system/mmv/README
new file mode 100644
index 0000000000..6f876d8eb4
--- /dev/null
+++ b/system/mmv/README
@@ -0,0 +1,10 @@
+mmv (move/copy/append/link multiple files by wildcard patterns)
+
+This is mmv, a program to move/copy/append/link multiple files
+according to a set of wildcard patterns. This multiple action is
+performed safely, i.e. without any unexpected deletion of files due
+to collisions of target names with existing filenames or with other
+target names. Furthermore, before doing anything, mmv attempts to
+detect any errors that would result from the entire set of actions
+specified and gives the user the choice of either aborting before
+beginning, or proceeding by avoiding the offending parts.
diff --git a/system/mmv/compilefix.diff b/system/mmv/compilefix.diff
new file mode 100644
index 0000000000..9a13a156dc
--- /dev/null
+++ b/system/mmv/compilefix.diff
@@ -0,0 +1,15 @@
+diff -Naur a/mmv.c b/mmv.c
+--- a/mmv.c	2020-07-01 18:55:50.961457418 -0400
++++ b/mmv.c	2020-07-01 19:00:17.724426386 -0400
+@@ -193,10 +193,7 @@
+ #ifdef IS_SYSV
+ 
+ /* for System V and Version 7*/
+-struct utimbuf {
+-	time_t actime;
+-	time_t modtime;
+-};
++#include <utime.h>
+ #define utimes(f, t) utime((f), &(t))
+ 
+ #ifndef HAS_RENAME
diff --git a/system/mmv/mmv.SlackBuild b/system/mmv/mmv.SlackBuild
new file mode 100644
index 0000000000..7ea0d50b3b
--- /dev/null
+++ b/system/mmv/mmv.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for mmv
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This is ancient software (1.01b was released in 1990), but still
+# useful. We're treating Debian as upstream here, our version number
+# matches their patchlevel (with _ intead of -).
+
+PRGNAM=mmv
+VERSION=${VERSION:-1.01b_19}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCVER="$( echo $VERSION | cut -d_ -f1 )"
+DEBVER="$( echo $VERSION | cut -d_ -f2 )"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER.orig
+tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.gz
+cd $PRGNAM-$SRCVER.orig
+tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# apply all Debian's patches:
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+# one patch of our own:
+patch -p1 < $CWD/compilefix.diff
+
+# the default LDFLAGS cause the build to fail, override with "nothing".
+sed -i "s,-O2,$SLKCFLAGS -Wall," Makefile
+make LDFLAGS=
+
+# easier to do this manually (only 2 files):
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+install -s -m0755 $PRGNAM $PKG/usr/bin
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# multi-named executable, uses its name to decide what action to take.
+LINKS="mcp mad mln"
+for i in $LINKS; do
+  ln -s $PRGNAM $PKG/usr/bin/$i
+  ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ANNOUNCE READ.ME ARTICLE debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mmv/mmv.info b/system/mmv/mmv.info
new file mode 100644
index 0000000000..c93d2e5da6
--- /dev/null
+++ b/system/mmv/mmv.info
@@ -0,0 +1,12 @@
+PRGNAM="mmv"
+VERSION="1.01b_19"
+HOMEPAGE="https://packages.debian.org/sid/mmv"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/m/mmv/mmv_1.01b-19.debian.tar.xz"
+MD5SUM="1b2135ab2f17bdfa9e08debbb3c46ad8 \
+        5952faa99a610afdbba73d20d68c6d0f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/mmv/slack-desc b/system/mmv/slack-desc
new file mode 100644
index 0000000000..063f2c6f51
--- /dev/null
+++ b/system/mmv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+mmv: mmv (multiple mv/rename)
+mmv:
+mmv: This is mmv, a program to move/copy/append/link multiple files
+mmv: according to a set of wildcard patterns. This multiple action is
+mmv: performed safely, i.e. without any unexpected deletion of files due to
+mmv: collisions of target names with existing filenames or with other
+mmv: target names.
+mmv:
+mmv:
+mmv:
+mmv:
diff --git a/system/modules/README b/system/modules/README
index 03fca01a81..a740d43f6d 100644
--- a/system/modules/README
+++ b/system/modules/README
@@ -4,13 +4,13 @@ of a user's environment via modulefiles.
 Each modulefile contains the information needed to configure the shell
 for an application.
 
-Once the Modules package is initialized, the environment can be
-modified on a per-module basis using the module command which interprets
-modulefiles. Typically modulefiles instruct the module command to alter or
-set shell environment variables such as PATH, MANPATH, etc. Modulefiles
-may be shared by many users on a system and users may have their own
-collection to supplement or replace the shared modulefiles.
+Once the Modules package is initialized, the environment can be modified
+on a per-module basis using the module command which interprets
+modulefiles. Typically modulefiles instruct the module command to alter
+or set shell environment variables such as PATH, MANPATH, etc.
+Modulefiles may be shared by many users on a system and users may have
+their own collection to supplement or replace the shared modulefiles.
 
-Modules are useful in managing different versions of applications. Modules
-can also be bundled into metamodules that will load an entire suite of
-different applications.
+Modules are useful in managing different versions of applications.
+Modules can also be bundled into metamodules that will load an entire
+suite of different applications.
diff --git a/system/modules/modules.SlackBuild b/system/modules/modules.SlackBuild
index d87579ff0e..7d1cc2549b 100644
--- a/system/modules/modules.SlackBuild
+++ b/system/modules/modules.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Modules
 #
-# Copyright 2015-2019 Emmanuel N. Millan, Mendoza, Argentina.
+# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=modules
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DOCS="ChangeLog INSTALL.txt COPYING.GPLv2 NEWS.txt README"
+DOCS="CONTRIBUTING.rst ChangeLog INSTALL.rst COPYING.GPLv2 MIGRATING.rst NEWS.rst README.md"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
diff --git a/system/modules/modules.info b/system/modules/modules.info
index ca2fcade89..8aaa2c1982 100644
--- a/system/modules/modules.info
+++ b/system/modules/modules.info
@@ -1,8 +1,8 @@
 PRGNAM="modules"
-VERSION="4.4.0"
-HOMEPAGE="https://modules.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/modules/Modules/modules-4.4.0/modules-4.4.0.tar.bz2"
-MD5SUM="1333e7b5fc2a9a7871c39801f2688099"
+VERSION="4.7.0"
+HOMEPAGE="http://modules.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/modules/Modules/modules-4.7.0/modules-4.7.0.tar.bz2"
+MD5SUM="d891012c6014de939761b62bbae29155"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/monitorix/monitorix.SlackBuild b/system/monitorix/monitorix.SlackBuild
index 878c6edf3c..102e27dda1 100644
--- a/system/monitorix/monitorix.SlackBuild
+++ b/system/monitorix/monitorix.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2014-2016 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
-# Updated 2019-2020 by Emmanuel N. Millan, Mendoza, Argentina
+# Updated 2019-2021 by Emmanuel N. Millan, Mendoza, Argentina
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monitorix
-VERSION=${VERSION:-3.12.0}
+VERSION=${VERSION:-3.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/monitorix/monitorix.info b/system/monitorix/monitorix.info
index 224a2239ff..2067f2a6a4 100644
--- a/system/monitorix/monitorix.info
+++ b/system/monitorix/monitorix.info
@@ -1,8 +1,8 @@
 PRGNAM="monitorix"
-VERSION="3.12.0"
+VERSION="3.13.1"
 HOMEPAGE="https://www.monitorix.org/"
-DOWNLOAD="https://www.monitorix.org/monitorix-3.12.0.tar.gz"
-MD5SUM="f1697a98284ac466b617d5312bd9fbf4"
+DOWNLOAD="https://www.monitorix.org/monitorix-3.13.1.tar.gz"
+MD5SUM="ca2b15fb137efded82c5a2bfd189573f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-lwp-useragent-cached perl-http-server-simple perl-config-general rrdtool"
diff --git a/system/mpack/mpack.SlackBuild b/system/mpack/mpack.SlackBuild
index 9bd52bc85f..8c6319c70b 100644
--- a/system/mpack/mpack.SlackBuild
+++ b/system/mpack/mpack.SlackBuild
@@ -21,10 +21,16 @@
 #  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.
+#
+#  2021-03-18
+#    - Inc'd BUILD value to 2
+#    - Added comments about patch usage.
+#    - Legacy upstream URL is gone, migrated to gitlab site.
+#
 
 PRGNAM=mpack
 VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +75,9 @@ 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 {} \;
 
-patch -p1 < $CWD/mpack.diff
+# The following patch corrects a number of warnings and build errors in
+# order to compile on a modern (Slackware 14.2+) Linux system.
+patch -p1 < $CWD/mpack.patch
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/mpack/mpack.info b/system/mpack/mpack.info
index fd50ec744e..e017fc5020 100644
--- a/system/mpack/mpack.info
+++ b/system/mpack/mpack.info
@@ -1,8 +1,8 @@
 PRGNAM="mpack"
 VERSION="1.6"
-HOMEPAGE="http://ftp.andrew.cmu.edu/pub/mpack"
-DOWNLOAD="http://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz"
-MD5SUM="a70fa5afa76539a9afb70b9d81568fe8"
+HOMEPAGE="https://gitlab.com/osdp/mpack"
+DOWNLOAD="https://gitlab.com/osdp/mpack/-/archive/1.6/mpack-1.6.tar.gz"
+MD5SUM="3528459d2b45225d18a25359112b2b45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mpack/mpack.diff b/system/mpack/mpack.patch
index e00b92f25e..e00b92f25e 100644
--- a/system/mpack/mpack.diff
+++ b/system/mpack/mpack.patch
diff --git a/system/mpich/mpich.SlackBuild b/system/mpich/mpich.SlackBuild
index 24f9e08683..3245ac845a 100644
--- a/system/mpich/mpich.SlackBuild
+++ b/system/mpich/mpich.SlackBuild
@@ -4,7 +4,7 @@
 
 # Earlier version written by Wainamoinen <wainamoinen@gmail.com>
 #
-# Copyright 2016-2019 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2021 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpich
-VERSION=${VERSION:-3.3.2}
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-cxx \
   --enable-threads=multiple \
   --enable-fast \
+  --with-device=ch3 \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/system/mpich/mpich.info b/system/mpich/mpich.info
index 6897a28094..4d02727e1b 100644
--- a/system/mpich/mpich.info
+++ b/system/mpich/mpich.info
@@ -1,8 +1,8 @@
 PRGNAM="mpich"
-VERSION="3.3.2"
+VERSION="3.4.1"
 HOMEPAGE="https://www.mpich.org/"
-DOWNLOAD="https://www.mpich.org/static/downloads/3.3.2/mpich-3.3.2.tar.gz"
-MD5SUM="2d680f620583beadd7a08acdcfe355e6"
+DOWNLOAD="https://www.mpich.org/static/downloads/3.4.1/mpich-3.4.1.tar.gz"
+MD5SUM="10e43fd61fd1a13c89cfbed3eb30b97a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild
index 8a4ed50d3e..ff9a31865c 100644
--- a/system/netdata/netdata.SlackBuild
+++ b/system/netdata/netdata.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netdata
-VERSION=${VERSION:-1.22.1}
+VERSION=${VERSION:-1.29.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -88,6 +88,8 @@ 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 {} \;
 
+patch -p1 < $CWD/9644483b6069bb474942df5afc1156968a99d7b2.patch
+
 autoreconf -fiv
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info
index 825b5ae88e..95ea1f6c42 100644
--- a/system/netdata/netdata.info
+++ b/system/netdata/netdata.info
@@ -1,8 +1,8 @@
 PRGNAM="netdata"
-VERSION="1.22.1"
+VERSION="1.29.3"
 HOMEPAGE="https://github.com/netdata/netdata"
-DOWNLOAD="https://github.com/netdata/netdata/archive/v1.22.1/netdata-1.22.1.tar.gz"
-MD5SUM="c235613311fec3a7a2993565ec590165"
+DOWNLOAD="https://github.com/netdata/netdata/archive/v1.29.3/netdata-1.29.3.tar.gz"
+MD5SUM="9bb47600963c001c7de828e7e2e135a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="PyYAML libuv"
diff --git a/system/newLd/newLd.SlackBuild b/system/newLd/newLd.SlackBuild
index 71d3bf1adc..273ea5546c 100644
--- a/system/newLd/newLd.SlackBuild
+++ b/system/newLd/newLd.SlackBuild
@@ -50,8 +50,6 @@ fi
 #  exit 0
 #fi
 
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
 # Set to ld.gold or ld.bfd:
 DEFAULT_LD=ld.bfd
 
@@ -84,6 +82,8 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+set -e
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 
@@ -92,32 +92,32 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf binutils-$VERSION
-tar xvf $CWD/binutils-$VERSION.tar.?z || exit 1
-cd binutils-$VERSION || exit 1
+tar xvf $CWD/binutils-$VERSION.tar.?z
+cd binutils-$VERSION
 
 # Various upstream patches:
-zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose || exit 1
+zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose
 
 # Export the demangle.h header file:
-zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose
 # Don't check to see if "config.h" was included in the installed headers:
-zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose
 
 # Set %version to something halfway meaningful:
 sed -i -e 's/%''{release}/slack15/g' bfd/Makefile{.am,.in}
 
 chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -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 {} \+
+find -L . \
+ \( -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 {} \;
 
 # End of preparations
 if echo "$*" | grep -qw -- --prep ; then
@@ -143,8 +143,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-ld=default \
   --enable-initfini-array \
   $WERROR \
-  --build=$TARGET \
-  || exit 1
+  --build=$TARGET
 
 
 # Use "tooldir=/usr" to avoid internal references to the /usr/${TARGET}/
@@ -155,9 +154,9 @@ CFLAGS="$SLKCFLAGS" \
 # been built into the linker for quite some time and the ones in the
 # filesystem aren't actually loaded. For the most part they are now
 # documentation and it doesn't matter where they reside.
-make clean || exit 1
-make tooldir=$PREFIX $NUMJOBS || make tooldir=$PREFIX || exit 1
-make tooldir=$PREFIX install DESTDIR=$PKG || exit 1
+make clean
+make tooldir=$PREFIX
+make tooldir=$PREFIX install DESTDIR=$PKG
 
 # Using tooldir=/usr also makes the /usr/${TARGET}/lib${LIBDIRSUFFIX}
 # directory obsolete, and the build will no longer install it. But since
@@ -177,7 +176,7 @@ rm -rf $PKG/$PREFIX/$ARCH-slackware-linux
 
 # Delete unwanted programs
 rm -f  $PKG/$PREFIX/bin/{addr2line,ar,as,c++filt,dlltool,dllwrap,elfedit,gprof,ld.bfd,nm,objcopy,objdump,ranlib,readelf,size,strings,strip,windmc,windres}
- 
+
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/ld$VERSION
 #!/bin/sh
@@ -220,8 +219,8 @@ chmod +x $PKG/usr/bin/ld$VERSION
 #  ( cd $PKG/$PREFIX/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld )
 #fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+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
 
 # Remove some unneeded man pages, and then compress the rest
 (cd $PKG/usr/man/man1; mv ld.1 ld$VERSION.1)
@@ -252,19 +251,8 @@ fi
 
 chown -R root:root $PKG/$PREFIX/doc/binutils-$VERSION
 
-# Add slack-desc:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n /tmp/binutils-$VERSION-$ARCH-$BUILD$TAG.txz
-
-# Not relation for this package
-#cat << EOF
-#
-##############################
-#oprofile links to libbfd so
-#be sure to recompile that
-##############################
-#
-#EOF
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nmtree/README b/system/nmtree/README
new file mode 100644
index 0000000000..db6be9cfd4
--- /dev/null
+++ b/system/nmtree/README
@@ -0,0 +1,7 @@
+nmtree is a utility for mapping and checking directory hierarchies.
+This version is ported from NetBSD.
+
+The binary and manpages will install as nmtree instead of the default
+mtree because libarchive provides an mtree(5) manpage.
+Regardless, the nmtree manpages will still refer to the program as
+mtree.
diff --git a/system/nmtree/nmtree.SlackBuild b/system/nmtree/nmtree.SlackBuild
new file mode 100644
index 0000000000..9a24c1307e
--- /dev/null
+++ b/system/nmtree/nmtree.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for nmtree
+
+# @(#)nmtree.SlackBuild	1.1 20/10/24 06:21:09
+
+# Copyright 2020 Pomfland
+# 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=nmtree
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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
+
+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
+
+# maintenance work: libarchive provides its own mtree(5) manpage for some unholy
+# reason so we're going to just install the whole package as nmtree
+# we should also purge documentation it installs on its own
+mv -v $PKG/usr/bin/{m,nm}tree
+mv -v $PKG/usr/man/man5/{m,nm}tree.5.gz
+mv -v $PKG/usr/man/man8/{m,nm}tree.8.gz
+rm -r $PKG/usr/share                   # yes, all of it is worthless
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nmtree/nmtree.info b/system/nmtree/nmtree.info
new file mode 100644
index 0000000000..9b14d8fc3c
--- /dev/null
+++ b/system/nmtree/nmtree.info
@@ -0,0 +1,10 @@
+PRGNAM="nmtree"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/archiecobbs/nmtree"
+DOWNLOAD="https://github.com/archiecobbs/nmtree/archive/1.0.0/nmtree-1.0.0.tar.gz"
+MD5SUM="e1d63ab0eec7b0674ab38983938394fa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libnbcompat"
+MAINTAINER="Pomfland"
+EMAIL="pomfland@tfwno.gf"
diff --git a/system/nmtree/slack-desc b/system/nmtree/slack-desc
new file mode 100644
index 0000000000..645771c912
--- /dev/null
+++ b/system/nmtree/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+nmtree: nmtree (a port of NetBSD's mtree utility to Linux)
+nmtree:
+nmtree: nmtree is a utility for mapping and checking directory hierarchies.
+nmtree: This version is ported from NetBSD.
+nmtree:
+nmtree: Homepage: https://github.com/archiecobbs/nmtree
+nmtree:
+nmtree:
+nmtree:
+nmtree:
+nmtree:
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index a3897e2aa2..9f87edbdff 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -2,15 +2,20 @@ This is the proprietary binary video driver from NVidia for the X.Org
 X-server. This package does not include the kernel-module - it is
 part of the nvidia-kernel package at SlackBuilds.org.
 
-NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit
-support, use nvidia-legacy390-{driver,kernel}
+NOTE: This driver is ONLY for Slackware64. For x86 32-bit support, use
+nvidia-legacy390-{driver,kernel}.
 
 Installing the 32-bit compatibility libraries is available:
-if desired, do: COMPAT32="yes" ./nvidia-driver.SlackBuild
+if desired, do:
+  COMPAT32="yes" ./nvidia-driver.SlackBuild
   
-If you plan to test this buildscript on current (15.0 EXPERIMENTAL),
-to avoid stomping on the installed libglvnd, do:
+If you plan to test this buildscript on current/15.0, do:
+
   CURRENT="yes" ./nvidia-driver.SlackBuild
+  
+This avoids stomping on the libglvnd libraries, plus it forces the
+script to use the prebuilt nvidia-installer since it no longer builds
+in current.  As a consequence, this script may no longer work in a VM.
 
 This script now gives the option of installing the nvidia-persitenced
 daemon.  For details, see README.nvidia-persitenced.
@@ -21,8 +26,7 @@ man pages for details and usage.
 
 For CUDA/OpenCL to work after reboot, and for utilites such as
 nvidia-smi, you might need to include the following line in your
-/etc/rc.d/rc.local: (This is REQUIRED if you plan on using
-nvidia-persistenced)
+/etc/rc.d/rc.local (This is REQUIRED for nvidia-persistenced to work):
 
     # Create missing nvidia device nodes after reboot
     if [ -x /usr/bin/nvidia-modprobe ]; then
@@ -30,18 +34,34 @@ nvidia-persistenced)
     fi
 
 Notes:
-1.  You still need to blacklist the open source nouveau driver. This is
-    easily done by installing xf86-video-nouveau-blacklist in
+1.  You still need to blacklist the open source nouveau driver.
+    This is easily done by installing xf86-video-nouveau-blacklist in
     extra/xf86-video-nouveau-blacklist on the distibution DVD.
 
-2.  If nvidia-driver is already installed, the script will abort with a
-    prompt to remove the existing driver (it is not necessary to remove
-    the kernel module).
+2.  If nvidia-driver is already installed, the script will abort with
+    a prompt to remove the existing driver (it is not necessary to
+    remove the kernel module).
 
 3.  As of version 450.xx, Nvidia no longer includes libGL.la in their
-    distribution package.  On 14.2 ONLY, if you want to revert back to
+    distribution package.  On 14.2 ONLY,  nvidia-switch saves these
+    files to /var/log/nvidia/{32,64}:
+
+      libGL{,ESv1_CM,ESv2}.la
+      libGL.so.1.2.0
+      libGLESv1_cm.so.1.1.0
+      libGLESv2.so.2.0.0
+
+    It then modifies the .la files in /usr/lib{,64} to point to the
+    nvidia versions of these libraries.  If you want to revert back to
     the open source drivers, run 'nvidia-switch --remove' to restore
-    the original libGL.la and then 'removepkg nvidia-driver' "should"
-    work in most cases. If not, just go into /usr/lib{,64} (as root of
-    course) and rename libGL.la-xorg to libGL.la.
-    (THIS STEP IS NO LONGER NECESSARY ON CURRENT.)
+    the original mesa libraries, then 'removepkg nvidia-driver'
+    "should" work in most cases.  If you forget to run
+    nvidia-switch --remove, just copy the original files saved in
+    /var/log/nvidia/{32,64} back to /usr/lib{,64} (don't forget to run
+    /sbin/ldconfig).  (THIS STEP IS NOT NECESSARY ON CURRENT.)
+
+4.  (IMPORTANT ON 14.2) When it comes time to remove this package with
+    'removepkg' (or just about any other package for that matter), you
+    MUST run '/sbin/ldconfig' to restore any symlinks.  This is due to
+    removepkg not running ldconfig after removing a package.
+    (This has been added to current/15.0.)
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index e6ed65d42c..e8e7cf0a8b 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -27,7 +27,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-450.80.02}
+VERSION=${VERSION:-460.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -104,6 +104,7 @@ find -L . \
 
 # Compiling the various open source apps instead of using the precompiled binaries
 # Compiling nvidia-installer from source
+if [ "$CURRENT" = "no" ]; then
 cd $TMP/nvidia-installer-$VERSION
 
 # Let's try to remove the conflicting files and GPU detection
@@ -127,6 +128,7 @@ cd -
 # to the driver source tree for use
 mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
 mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+fi
 
 if [ "${COMPAT32}" = "yes" ]; then
     COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
@@ -276,9 +278,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
 if [ "$COMPAT32" = "yes" ]; then
-   sed -i "s|@MULTILIB@| This package includes the 32-bit libraries.|" $PKG/install/slack-desc
+   sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver: This package includes the 32-bit libraries.|" $PKG/install/slack-desc
 else
-   sed -i "s|@MULTILIB@||" $PKG/install/slack-desc
+   sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver:|" $PKG/install/slack-desc
 fi
 
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 175639737c..ca20a48252 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="450.80.02"
+VERSION="460.67"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/450.80.02/NVIDIA-Linux-x86_64-450.80.02.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-450.80.02.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-450.80.02.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-450.80.02.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.80.02.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-450.80.02.tar.bz2"
-MD5SUM_x86_64="c68b3500fb5ceb17a0fcebcbb143dad8 \
-               b954ee3b1542e7a0847853e16d358394 \
-               b73d00cddb91b20bcc0adbcdfa2f8e63 \
-               f141731f49f298e0317ca094dfd15ff1 \
-               d5ec0635d8dc7e3a4df54902df1efa8c \
-               7e4e625fc267f4754d438aa945fcd580"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.67.tar.bz2"
+MD5SUM_x86_64="0b246742eca035b702949631e2fcf6a2 \
+               4243fdeb81aa2025ef293c66d84bd223 \
+               4da687fb436dc72cc4aefc83ca9b1600 \
+               9168f7f3f896d1291f47a6f05ddf7ad9 \
+               774af9ca9829ad9f5acc9716c26ff0c8 \
+               5ee964e0519ae00f4184b49a609682c2"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index e6d268f4bd..9196cf7b8a 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -43,22 +43,20 @@ LIB="${ROOT}usr/lib${LIBSUFFIX}"
 LIB32="${ROOT}usr/lib"
 
 save_GL(){
-# backup original mesa conflict
+# backup original mesa conflicts
   cd $2
   case "$1" in
     "nvidia")
-      if [ -e libGL.la ]; then
-        mv libGL.la libGL.la-xorg
-      fi
-      /sbin/ldconfig
+      cp libGL{,ES*}.la /var/log/nvidia/$3
+      mv libGL{.so.1.2.0,ESv1_CM.so.1.1.0,ESv2.so.2.0.0} /var/log/nvidia/$3
+      sed -i s/1.2.0/1.7.0/g libGL.la
+      sed -i s/1.1.0/1.2.0/g libGLESv1_CM.la
+      sed -i s/2.0.0/2.1.0/g libGLESv2.la
     ;;
 
     "xorg")
-      if [ -e libGL.la-xorg ]; then
-       mv libGL.la-xorg libGL.la
-      fi
-      /sbin/ldconfig
-  ;;
+      mv /var/log/nvidia/$3/* .
+ ;;
 
   *)
         echo "nothing to do for save_gl?"
@@ -75,11 +73,14 @@ nvidia_install(){
   echo "/etc/X11/xorg.conf.d.  Otherwise, this may lead to improperly"
   echo  -e "working drivers.\n"
 
-  save_GL "nvidia" $LIB
-
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "nvidia" $LIB32
+  if [ "$LIBSUFFIX" = "64" ]; then
+    save_GL "nvidia" $LIB "64"
+    # Check for multilib configuration
+    if [ "$COMPAT32" = "yes" ]; then
+      save_GL "nvidia" $LIB32 "32"
+    fi
+  else
+    save_GL "nvidia" $LIB "32"
   fi
 }
 
@@ -88,12 +89,16 @@ nvidia_remove(){
   echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf"
   echo "and in /usr/share/X11/xorg.conf.d and /etc/X11/xorg.conf.d."
   echo "Otherwise, this may lead to improperly working drivers."
-  echo -e "\nPlease run /sbin/ldconfing after removing nvidia-driver.\n"
+  echo -e "\nPLEASE run /sbin/ldconfing after removing nvidia-driver.\n"
 
-  save_GL "xorg" $LIB
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "xorg" $LIB32
+  if [ "$LIBSUFFIX" = "64" ]; then
+    save_GL "xorg" $LIB "64"
+    # Check for multilib configuration
+    if [ "$COMPAT32" = "yes" ]; then
+      save_GL "xorg" $LIB32 "32"
+    fi
+  else
+    save_GL "xorg" $LIB "32"
   fi
 }
 
diff --git a/system/nvidia-driver/slack-desc b/system/nvidia-driver/slack-desc
index 7b63dee80e..165da72937 100644
--- a/system/nvidia-driver/slack-desc
+++ b/system/nvidia-driver/slack-desc
@@ -16,4 +16,4 @@ nvidia-driver: See /usr/doc/nvidia-driver-PKGVERSION/README.Slackware
 nvidia-driver: for more information.
 nvidia-driver:
 nvidia-driver: https://www.nvidia.com
-nvidia-driver:
+nvidia-driver: @MULTILIB@
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 6a3f768072..f4e42828c0 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -29,7 +29,7 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-kernel
-VERSION=${VERSION:-450.80.02}
+VERSION=${VERSION:-460.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index c6c1a87dd5..019df6d1da 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="450.80.02"
+VERSION="460.67"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/450.80.02/NVIDIA-Linux-x86_64-450.80.02.run"
-MD5SUM_x86_64="c68b3500fb5ceb17a0fcebcbb143dad8"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run"
+MD5SUM_x86_64="0b246742eca035b702949631e2fcf6a2"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README
index 8e1ebec91f..56e253398f 100644
--- a/system/nvidia-legacy390-driver/README
+++ b/system/nvidia-legacy390-driver/README
@@ -6,9 +6,13 @@ Installing the 32-bit compatibility libraries is available: if desired,
 do:
   COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild
 
-If you plan to test this buildscript on current (15.0 EXPERIMENTAL), to
-avoid stomping on xorg-serverand  libglvnd, do:
-  CURRENT="yes" ./nvidia-driver.SlackBuild
+If you plan to test this buildscript on current/15.0, do:
+
+  CURRENT="yes" ./nvidia-legacy390-driver.SlackBuild
+  
+This avoids stomping on the libglvnd libraries, plus it forces the
+script to use the prebuilt nvidia-installer since it no longer builds
+in current.  As a consequence, this script may no longer work in a VM.
 
 If you build and install this driver on current WITHOUT using the
 CURRENT="yes" flag, it will corrupt both xorg-server AND libglvnd, so
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index 7c3a384a1f..b984a32580 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -26,7 +26,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-legacy390-driver
-VERSION=${VERSION:-390.138}
+VERSION=${VERSION:-390.141}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -108,9 +108,9 @@ 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 {} \;
 
-# Compiling the various open source apps instead of using the precompiled binaries
 # Compiling nvidia-installer from source
-cd $TMP/nvidia-installer-$VERSION
+if [ "$CURRENT" = "no" ]; then
+  cd $TMP/nvidia-installer-$VERSION
 
 # Let's try to remove the conflicting files and GPU detection
   patch -p0 < $CWD/skip_conflict-GPU_detect.patch
@@ -127,12 +127,13 @@ cd $TMP/nvidia-installer-$VERSION
   install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
   install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
 
-cd -
+  cd -
 
 # Now we need to copy the newly patched and compiled nvidia-installer
 # to the driver source tree for use
-mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
-mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+  mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
+  mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+fi
 
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
     COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
@@ -198,7 +199,7 @@ cd $TMP/nvidia-settings-$VERSION
     make
   cd ../../
 
-  CFLAGS="$SLKCFLAGS" \
+  CFLAGS="$SLKCFLAGS -fcommon" \
   make
 
   install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
index bada93153a..110f8ab193 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-legacy390-driver"
-VERSION="390.138"
+VERSION="390.141"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.138.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.138.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.138.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.138.tar.bz2"
-MD5SUM="1247db325e3127324e28fb5f7c59ad50 \
-        8eb272cfc6559f59e8931eab0ce3a535 \
-        e7256650639b708d378ac9ff77747383 \
-        a5a5f2c3d22021042f24a998c82b653c \
-        8a6c34fbdff639aa7c2a9697cb96f1af \
-        146a1ac48785f2a9f8f03fc937c28f16"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.138.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.138.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.138.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.138.tar.bz2"
-MD5SUM_x86_64="e12b55efa430062a0f7f73db071bc0c3 \
-               8eb272cfc6559f59e8931eab0ce3a535 \
-               e7256650639b708d378ac9ff77747383 \
-               a5a5f2c3d22021042f24a998c82b653c \
-               8a6c34fbdff639aa7c2a9697cb96f1af \
-               146a1ac48785f2a9f8f03fc937c28f16"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run \
+          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.141.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.141.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.141.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.141.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.141.tar.bz2"
+MD5SUM="f3e6660ffe5338b17b7e643d0eceb57e \
+        ff1c359809225ac9fc3562a16bc302bd \
+        baa8df62e2449ec6dd55c3d27cf23490 \
+        24c4e151626dc920525966d4bd3a2dbd \
+        61be9b85fd9b2198cdbc555a3625d39b \
+        94c281d2704d87809176e3084102bfee"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.141.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.141.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.141.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.141.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.141.tar.bz2"
+MD5SUM_x86_64="0c7fc061349bbb2f0d7e26af9f1b082a \
+               ff1c359809225ac9fc3562a16bc302bd \
+               baa8df62e2449ec6dd55c3d27cf23490 \
+               24c4e151626dc920525966d4bd3a2dbd \
+               61be9b85fd9b2198cdbc555a3625d39b \
+               94c281d2704d87809176e3084102bfee"
 REQUIRES="nvidia-legacy390-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy390-kernel/README b/system/nvidia-legacy390-kernel/README
index 44c0369dd2..adb7c9d3fd 100644
--- a/system/nvidia-legacy390-kernel/README
+++ b/system/nvidia-legacy390-kernel/README
@@ -7,9 +7,12 @@ start the script setting the KERNEL variable as in
     KERNEL=4.6.3 ./nvidia-legacy390-kernel.SlackBuild
 
 A default config file is placed at
-/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads the
-nvidia module.  If you need to make changes, move that file to
-/etc/X11/xorg.conf.d/ and edit the copy.  You do not need this file at
-all if you have a proper and complete xorg.conf.
+/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads
+the nvidia module.  If you need to make changes, copy that file to
+/etc/X11/xorg.conf.d/ and edit the copy.  You do not need this file
+at all if you have a proper and complete xorg.conf.
+
+This script now includes the patches to enable building on newer
+kernels.  (MANY thanks to willysr and Herecura for the fixes.)
 
 The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
index fba0d38bd0..dadc3c08c9 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
@@ -28,7 +28,7 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-legacy390-kernel
-VERSION=${VERSION:-390.138}
+VERSION=${VERSION:-390.141}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,10 +49,8 @@ fi
 
 if [ "$ARCH" = "i586" ]; then
   TARGET="x86"
-  SRCSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   TARGET="x86"
-  SRCSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
 fi
@@ -92,6 +90,10 @@ if [ "$TARGET" = "x86_64" ]; then
     install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
 fi
 
+# Make sure the X is specified to automagically load the
+# correct driver, since I always forget. You can remove
+# this file if you have an equivilent entry in /etc/X11/xorg.d
+
 mkdir -p $PKG/usr/share/X11/xorg.conf.d/
 cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
 
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
index 1dff6364aa..2cf1128cb0 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy390-kernel"
-VERSION="390.138"
+VERSION="390.141"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run"
-MD5SUM="1247db325e3127324e28fb5f7c59ad50"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run"
-MD5SUM_x86_64="e12b55efa430062a0f7f73db071bc0c3"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run"
+MD5SUM="f3e6660ffe5338b17b7e643d0eceb57e"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run"
+MD5SUM_x86_64="0c7fc061349bbb2f0d7e26af9f1b082a"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmai.com"
diff --git a/system/oksh/oksh.SlackBuild b/system/oksh/oksh.SlackBuild
index b21000e2de..b1b8988316 100644
--- a/system/oksh/oksh.SlackBuild
+++ b/system/oksh/oksh.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oksh
-VERSION=${VERSION:-6.7}
+VERSION=${VERSION:-6.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/oksh/oksh.info b/system/oksh/oksh.info
index c7e49d7653..ca37cc9ba1 100644
--- a/system/oksh/oksh.info
+++ b/system/oksh/oksh.info
@@ -1,8 +1,8 @@
 PRGNAM="oksh"
-VERSION="6.7"
+VERSION="6.8.1"
 HOMEPAGE="https://github.com/ibara/oksh"
-DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.7/oksh-6.7.tar.gz"
-MD5SUM="bbfab4558db956f4a88d230440729b8d"
+DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.8.1/oksh-6.8.1.tar.gz"
+MD5SUM="ce8b7c278e6d36bbbd7b54c218fae7ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/oldschool-pc-fonts/README b/system/oldschool-pc-fonts/README
index 7f05768503..e4d1dc7c58 100644
--- a/system/oldschool-pc-fonts/README
+++ b/system/oldschool-pc-fonts/README
@@ -1,10 +1,12 @@
 oldschool-pc-fonts (remakes of PC text mode fonts)
 
-The Ultimate Oldschool PC Font Pack brings you pixel-perfect remakes of
-various type styles from text-mode era PCs - in modern, multi-platform,
-Unicode-compatible TrueType form, and/or as Linux .psfu console fonts.
+The Ultimate Oldschool PC Font Pack brings you pixel-perfect
+remakes of various type styles from text-mode era PCs - in modern,
+multi-platform, Unicode-compatible TrueType (and OpenType Bitmap)
+form, and/or as Linux .psfu console fonts.
 
-By default, the package will include TrueType fonts. To also include
-console fonts, install graphics/psftools before running this script.
-If you only want console fonts, set TTF=no in the script's environment.
-See README_console.txt for more information.
+By default, the package will include TrueType and OTB (OpenType
+Bitmap) fonts. To also include console fonts (PSFU), install
+graphics/psftools before running this script. If you only want console
+fonts, set TTF=no in the script's environment. See README_console.txt
+for more information.
diff --git a/system/oldschool-pc-fonts/doinst.sh b/system/oldschool-pc-fonts/doinst.sh
index 251ce03afb..4d463758c8 100644
--- a/system/oldschool-pc-fonts/doinst.sh
+++ b/system/oldschool-pc-fonts/doinst.sh
@@ -4,6 +4,10 @@ if [ -x /usr/bin/mkfontdir  -a -x /usr/bin/mkfontscale ]; then
     /usr/bin/mkfontscale .
     /usr/bin/mkfontdir .
   )
+  ( cd usr/share/fonts/misc
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
 fi
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild
index 0058c3ab0e..0cf5777b79 100644
--- a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild
+++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild
@@ -24,6 +24,13 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20201207 bkw:
+# - Update for v2.2. Enough changes that we can't build the old version with
+#   the modified script.
+# - Include all upstream's documentation.
+# - Include OTB fonts, now that they exist.
+# - gzip the .psfu fonts.
+
 # 20180108 bkw:
 # - Take over maintenance.
 # - BUILD=2.
@@ -32,8 +39,8 @@
 # - A bit of useful documentation in README_console.txt.
 
 PRGNAM=oldschool-pc-fonts
-VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -43,13 +50,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -eu
+set -e
 
-# There are 2 sets of fonts that can be installed: the TrueType ones
-# and console ones converted from the .FON files. These 2 variables control
-# which are installed:
+# There are 2 sets of fonts that can be installed: the TrueType (and
+# OTB, OpenType Bitmap) ones and console ones converted from the .FON
+# files. These 2 variables control which are installed:
 
-TTF=${TTF:-yes}         # By default, TTF is installed
+TTF=${TTF:-yes}         # By default, TTF and OTB are installed
 CONSOLE=${CONSOLE:-yes} # By default, install console fonts if possible
 
 if [ "$CONSOLE" = "yes" ]; then
@@ -60,8 +67,8 @@ if [ "$CONSOLE" = "yes" ]; then
 fi
 
 case "$TTF$CONSOLE" in
-  "yesyes") TYPE="TrueType and console fonts" ;;
-  "yesno")  TYPE="TrueType fonts only"        ;;
+  "yesyes") TYPE="TrueType/OTB and console fonts" ;;
+  "yesno")  TYPE="TrueType/OTB fonts only"        ;;
   "noyes")  TYPE="console fonts only"         ;;
   "nono")   echo "!!! At least one of TTF or CONSOLE must be set to 'yes'"
             exit 1;                           ;;
@@ -73,26 +80,25 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/ultimate_oldschool_pc_font_pack_v${VERSION}.zip -d $PRGNAM-$VERSION
+unzip $CWD/oldschool_pc_font_pack_v${VERSION}_FULL.zip -d $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -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 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 if [ "$TTF" = "yes" ]; then
-  mkdir -p $PKG/usr/share/fonts/TTF
+  mkdir -p $PKG/usr/share/fonts/TTF $PKG/usr/share/fonts/misc
   cp -a */*.ttf $PKG/usr/share/fonts/TTF
+  cp -a */*.otb $PKG/usr/share/fonts/misc
 fi
 
 if [ "$CONSOLE" = "yes" ]; then
-  # The "PS/2thin" fonts don't extract, because fon2fnts insists on using
+  # A few of the fonts don't extract, because fon2fnts insists on using
   # the font name embedded in the .FON file as a filename, and these have
   # a slash in them. On Windows, no problem, but a slash is a directory
   # separator here... but, sed can handle binary files, so we can fix it:
-  sed -i 's,PS/2,PS_2,g' */*IBM_PS2thin*.FON
+  sed -i 's,PS/55,PS-55,g' */*IBM_PS-55*.FON
+  sed -i 's,DOS/V,DOS-V,g' */*DOS-V*.FON
 
   mkdir -p $PKG/usr/share/kbd/consolefonts
 
@@ -108,10 +114,13 @@ if [ "$CONSOLE" = "yes" ]; then
     echo "=== $fnt => $psf"
     fnt2psf --psf2 --codepage=437 "$fnt" $PKG/usr/share/kbd/consolefonts/$psf
   done
+  gzip $PKG/usr/share/kbd/consolefonts/*.psfu
 fi
 
+# Don't include README.NFO, it's the same as README.TXT but with some
+# CP437 characters in the ASCII art logo.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.TXT README.NFO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.TXT docs/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README_console.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_console.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.info b/system/oldschool-pc-fonts/oldschool-pc-fonts.info
index 171e47a484..50cb1c1984 100644
--- a/system/oldschool-pc-fonts/oldschool-pc-fonts.info
+++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.info
@@ -1,8 +1,8 @@
 PRGNAM="oldschool-pc-fonts"
-VERSION="1.0"
+VERSION="2.2"
 HOMEPAGE="https://int10h.org/oldschool-pc-fonts/"
-DOWNLOAD="https://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v1.0.zip"
-MD5SUM="24acf70a302419895544e32757cfe4c8"
+DOWNLOAD="https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v2.2_FULL.zip"
+MD5SUM="95561227c894f874127e3776284a0c16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/oldschool-pc-fonts/slack-desc b/system/oldschool-pc-fonts/slack-desc
index a0b79293f7..cc9360e092 100644
--- a/system/oldschool-pc-fonts/slack-desc
+++ b/system/oldschool-pc-fonts/slack-desc
@@ -10,8 +10,8 @@ oldschool-pc-fonts: oldschool-pc-fonts (remakes of PC text mode fonts)
 oldschool-pc-fonts:
 oldschool-pc-fonts: The Ultimate Oldschool PC Font Pack brings you pixel-perfect
 oldschool-pc-fonts: remakes of various type styles from text-mode era PCs - in modern,
-oldschool-pc-fonts: multi-platform, Unicode-compatible TrueType form, and/or as Linux
-oldschool-pc-fonts: .psfu console fonts.
+oldschool-pc-fonts: multi-platform, Unicode-compatible TrueType and OTB form, and/or as
+oldschool-pc-fonts: Linux .psfu console fonts.
 oldschool-pc-fonts:
 oldschool-pc-fonts: https://int10h.org/oldschool-pc-fonts/
 oldschool-pc-fonts:
diff --git a/system/opendoas/README b/system/opendoas/README
new file mode 100644
index 0000000000..2e57141ec1
--- /dev/null
+++ b/system/opendoas/README
@@ -0,0 +1,67 @@
+This is the "OpenDoas" port of OpenBSD's doas.
+
+The doas utility is a program originally written for OpenBSD that
+allows a user to run a command as though they were another user,
+typically root. doas acts as an alternative to sudo, with simple
+configuration syntax and a smaller code base for ease of security
+auditing.
+
+Please note that running this SlackBuild will install doas with SUID
+root.
+
+To get started, write a configuration file at /etc/doas.conf. As an
+example, including the line:
+
+  permit :wheel as root
+
+will allow all users in the wheel group to act as root with doas.
+Consult the doas.conf(5) man page for further details.
+
+The parameter "keepenv" in /etc/doas.conf allows for opening graphical
+applications with doas:
+
+  permit keepenv gene as root
+
+"exec dbus-launch --exit-with-session" may be required for xinit in
+Slackware 14.2. An alternative is to run "export $(dbus-launch)" after
+starting the X session. As with su, KDE 4 graphical applications may
+fail to open with doas.
+
+Running this SlackBuild without parameters will provide a build of
+OpenDoas with shadow support if PAM is not installed, and with PAM 
+support if PAM is installed. Password persistence is disabled by
+default.
+
+To enable timestamp-based password persistence, call the SlackBuild
+with PERSIST=yes:
+
+  PERSIST=yes ./opendoas.SlackBuild
+
+In addition, ensure that the appropriate user or group line in
+/etc/doas.conf includes the "persist" option, as in this example:
+
+  permit persist jane as root
+
+Please note that upstream considers timestamp-based password
+persistence to be "new and potentially dangerous."
+
+For users with PAM installed, enable shadow authentication instead by
+calling the SlackBuild with PAM=no:
+
+  PAM=no ./opendoas.SlackBuild
+
+If /etc/pam.d/other and /etc/pam.d/system-auth are unmodified from the
+state in which they are shipped in -current, doas will run with PAM
+support if so compiled. Otherwise, doas may require a dedicated file at
+/etc/pam.d/doas to use PAM authentication.
+
+To allow OpenDoas to write a new PAM configuration file for doas, call
+the SlackBuild with PAM_FILE=yes:
+
+  PAM_FILE=yes ./opendoas.SlackBuild
+
+Upstream will not include PAM configuration files in releases of
+OpenDoas beyond 6.8.1.
+
+opendoas has no outside dependencies on Slackware 14.2 and adds no
+users or groups. opendoas conflicts with all other ports of doas.
diff --git a/system/opendoas/doinst.sh b/system/opendoas/doinst.sh
new file mode 100644
index 0000000000..97b05239d4
--- /dev/null
+++ b/system/opendoas/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/pam.d/doas.new
diff --git a/system/opendoas/opendoas.SlackBuild b/system/opendoas/opendoas.SlackBuild
new file mode 100644
index 0000000000..656a1323f3
--- /dev/null
+++ b/system/opendoas/opendoas.SlackBuild
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# Slackware build script for opendoas
+
+# Copyright 2021 K. Eugene Carlson  Tsukuba, Japan
+# 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=opendoas
+VERSION=${VERSION:-6.8.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+unset TIMESTAMP
+unset SHADOW
+
+# Use PERSIST=yes to enable timestamp-based password persistence. Upstream
+# considers this feature to be "new and potentially dangerous."
+[ ${PERSIST:-no} = yes ] && TIMESTAMP="--with-timestamp"
+
+# Use PAM=no to enable shadow authentication even on systems with PAM
+# installed. If shadow is not set, then doas will compile with PAM support
+# automatically if PAM is installed.
+[ ${PAM:-yes} = no ] && SHADOW="--with-shadow"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+# Pass in shadow support if PAM is not installed. OpenDoas defaults to PAM
+# authentication otherwise.
+if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
+  SHADOW="--with-shadow"
+fi
+
+# No CXXFLAGS
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  $SHADOW \
+  $TIMESTAMP \
+  --mandir=/usr/man
+
+make
+make install DESTDIR=$PKG
+
+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
+
+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 \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+chmod 4711 $PKG/usr/bin/doas
+
+# If PAM support is enabled, rename the package's PAM file to doas.new.
+if [ -f "$PKG/etc/pam.d/doas" ]; then
+  mv $PKG/etc/pam.d/doas $PKG/etc/pam.d/doas.new
+fi
+
+# Delete the new configuration file and its directory if PAM_FILE=yes was not
+# used. For Slackware -current users, doas can use PAM authentication provided
+# that /etc/pam.d/other and /etc/pam.d/system-auth have not been altered from
+# the state in which they are shipped. Writing new PAM configuration files was
+# deprecated after the current release of OpenDoas. To allow OpenDoas to write
+# a configuration file anyway, use PAM_FILE=yes.
+[ ${PAM_FILE:-no} != yes ] && rm -rf $PKG/etc
+
+if [ -f "$PKG/etc/pam.d/doas.new" ]; then
+  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+fi
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/opendoas/opendoas.info b/system/opendoas/opendoas.info
new file mode 100644
index 0000000000..19ab89a182
--- /dev/null
+++ b/system/opendoas/opendoas.info
@@ -0,0 +1,10 @@
+PRGNAM="opendoas"
+VERSION="6.8.1"
+HOMEPAGE="https://github.com/Duncaen/opendoas"
+DOWNLOAD="https://github.com/Duncaen/OpenDoas/releases/download/v6.8.1/opendoas-6.8.1.tar.gz"
+MD5SUM="c174a9e39ce6d526a1db16f214d0e127"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/opendoas/slack-desc b/system/opendoas/slack-desc
new file mode 100644
index 0000000000..272e764f6a
--- /dev/null
+++ b/system/opendoas/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+opendoas: opendoas (port of doas from OpenBSD)
+opendoas:
+opendoas: doas is a sudo alternative originally written for OpenBSD. It allows
+opendoas: a user to run a command as a different user, most often root. doas
+opendoas: offers simple configuration syntax; create a config file at
+opendoas: /etc/doas.conf to get started. See doas.conf(5).
+opendoas: The opendoas package conflicts with all other ports of doas.
+opendoas: The opendoas package does not conflict with sudo.
+opendoas: Author: Ted Unangst
+opendoas: Port author: Duncan Overbruck
+opendoas: https://github.com/Duncaen/OpenDoas
diff --git a/system/openmpi/openmpi.SlackBuild b/system/openmpi/openmpi.SlackBuild
index a020943e59..e485215f05 100644
--- a/system/openmpi/openmpi.SlackBuild
+++ b/system/openmpi/openmpi.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright 2010  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
-# Copyright 2015-2020 Emmanuel N. Millan, Mendoza, Argentina.
+# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmpi
-VERSION=${VERSION:-4.0.5}
+VERSION=${VERSION:-4.1.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/system/openmpi/openmpi.info b/system/openmpi/openmpi.info
index 4ad02127e9..827dbf8fcd 100644
--- a/system/openmpi/openmpi.info
+++ b/system/openmpi/openmpi.info
@@ -1,8 +1,8 @@
 PRGNAM="openmpi"
-VERSION="4.0.5"
+VERSION="4.1.0"
 HOMEPAGE="https://www.open-mpi.org/"
-DOWNLOAD="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.5.tar.bz2"
-MD5SUM="d85ad67fb1d5decd78a4bb883874e289"
+DOWNLOAD="https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.0.tar.bz2"
+MD5SUM="c24200d3b3401db465ab0efd6b696f80"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild
index bdabbf092b..48c2d058bf 100644
--- a/system/opensc/opensc.SlackBuild
+++ b/system/opensc/opensc.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for opensc
 
 # Copyright 2008-2015  LukenShiro, Italy
-# Copyright 2018-2020  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2018-2021  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensc
-VERSION=${VERSION:-0.20.0}
+VERSION=${VERSION:-0.21.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCFILES="README COPYING NEWS"
-XSL_STYLESHEETS_VER=1.78.1
+XSL_STYLESHEETS_VER=$(export LS_OPTIONS='' ; ls -1 /usr/share/xml/docbook/ | grep xsl-stylesheets- | cut -d- -f3)
 
 # opensc now supports only one reader subsystem (pcsc-lite or openct)
 OPENCT=${OPENCT:-0}	# pcsc-lite is the default, openct disabled
diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info
index efff885d86..61f33648a0 100644
--- a/system/opensc/opensc.info
+++ b/system/opensc/opensc.info
@@ -1,8 +1,8 @@
 PRGNAM="opensc"
-VERSION="0.20.0"
+VERSION="0.21.0"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/"
-DOWNLOAD="https://github.com/OpenSC/OpenSC/releases/download/0.20.0/opensc-0.20.0.tar.gz"
-MD5SUM="c291219b6189793430f9d0c40b42b907"
+DOWNLOAD="https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz"
+MD5SUM="d9f32e065ada3303c349cb5b54cd6e37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-lite"
diff --git a/system/openstego/openstego.SlackBuild b/system/openstego/openstego.SlackBuild
index 928befcd4c..e45c80a3e4 100644
--- a/system/openstego/openstego.SlackBuild
+++ b/system/openstego/openstego.SlackBuild
@@ -23,6 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210221 bkw: update for v0.8.0.
+
 # 20200708 bkw:
 # - Update for v0.7.4.
 # - Add README note about openjdk8.
@@ -34,7 +36,7 @@
 #   openstego.sh. This matches upstream's recommendation.
 
 PRGNAM=openstego
-VERSION=${VERSION:-0.7.4}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/openstego/openstego.info b/system/openstego/openstego.info
index 2ef7e2490f..61928e0238 100644
--- a/system/openstego/openstego.info
+++ b/system/openstego/openstego.info
@@ -1,8 +1,8 @@
 PRGNAM="openstego"
-VERSION="0.7.4"
+VERSION="0.8.0"
 HOMEPAGE="https://www.openstego.com/"
-DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.7.4/openstego-0.7.4.zip"
-MD5SUM="7b3b893d96e1ceb56c313bd89d9c16e2"
+DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.8.0/openstego-0.8.0.zip"
+MD5SUM="e172fae2f0f3aca30ae5998866e7c7f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/system/osquery-bin/osquery-bin.SlackBuild b/system/osquery-bin/osquery-bin.SlackBuild
index b39af74a12..a91e4ae2ff 100644
--- a/system/osquery-bin/osquery-bin.SlackBuild
+++ b/system/osquery-bin/osquery-bin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for osquery-bin
 
-# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=osquery-bin
 SRCNAM=${PRGNAM%-bin}
-VERSION=${VERSION:-4.5.1}
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/osquery-bin/osquery-bin.info b/system/osquery-bin/osquery-bin.info
index ce319c578f..057c9aa043 100644
--- a/system/osquery-bin/osquery-bin.info
+++ b/system/osquery-bin/osquery-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="osquery-bin"
-VERSION="4.5.1"
+VERSION="4.7.0"
 HOMEPAGE="https://osquery.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://pkg.osquery.io/linux/osquery-4.5.1_1.linux_x86_64.tar.gz"
-MD5SUM_x86_64="c13b1804fa53827a66a607eac6cba4a2"
+DOWNLOAD_x86_64="https://pkg.osquery.io/linux/osquery-4.7.0_1.linux_x86_64.tar.gz"
+MD5SUM_x86_64="e0fc79761a0d8008ee5f5d5f4c04181a"
 REQUIRES=""
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
index 2aed36a5e5..11043b331e 100644
--- a/system/parallel/parallel.SlackBuild
+++ b/system/parallel/parallel.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for "parallel".
 
+# Copyright 2020-2021 CRTS <crts@gmx.net>
 # Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
 #
@@ -25,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=parallel
-VERSION=${VERSION:-20200522}
+VERSION=${VERSION:-20210122}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,7 +90,8 @@ 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 CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp $CWD/GNU_Parallel_2018.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info
index 41cae8fa5f..b9f5ef28f2 100644
--- a/system/parallel/parallel.info
+++ b/system/parallel/parallel.info
@@ -1,10 +1,12 @@
 PRGNAM="parallel"
-VERSION="20200522"
+VERSION="20210122"
 HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20200522.tar.bz2"
-MD5SUM="81e23020aecff6535a1a75cbbc5fe506"
+DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20210122.tar.bz2
+          https://zenodo.org/record/1146014/files/GNU_Parallel_2018.pdf"
+MD5SUM="d7adb3a5cc00bc024eedd5718351cef4
+        e32a78d93e53029d7338eac9f4194924"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+MAINTAINER="CRTS"
+EMAIL="crts@gmx.net"
diff --git a/system/password-store/password-store.SlackBuild b/system/password-store/password-store.SlackBuild
index 38d702f3b6..770081cb2c 100644
--- a/system/password-store/password-store.SlackBuild
+++ b/system/password-store/password-store.SlackBuild
@@ -65,7 +65,7 @@ fi
 
 # Uncomment the two lines below to install the fish completion file.
 #mkdir -p "${PKG}/usr/share/fish/completions"
-#install -m 0644 -v contrib/pass.fish-completion "${PKG}/usr/share/fish/completions/pass.fish"
+#install -m 0644 -v src/completion/pass.fish-completion "${PKG}/usr/share/fish/completions/pass.fish"
 
 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
diff --git a/system/passwordsafe/README b/system/passwordsafe/README
index e8e7b1b435..ed4afdd044 100644
--- a/system/passwordsafe/README
+++ b/system/passwordsafe/README
@@ -1,14 +1,14 @@
 Passwordsafe - password database utility
 
-Portable version of the password manager program originally designed by Bruce
-Schneier. passwordsafe is the Linux version of the popular Windows PasswordSafe
-password manager.
+Portable version of the password manager program originally designed by
+Bruce Schneier. passwordsafe is the Linux version of the popular Windows
+PasswordSafe password manager.
 
-passwordsafe supports Yubicos Yubikey, a unique USB and NFC device offering one-
-touch authentication and supporting multiple authentication protocols for all
-devices and platfroms - with no driver or client software needed.
+passwordsafe supports Yubicos Yubikey, a unique USB and NFC device
+offering one- touch authentication and supporting multiple
+authentication protocols for all devices and platfroms - with no driver
+or client software needed.
 
-If you do not want support for Yubicos Yubikey do not install ykpers and its
-dependency (libyubikey).
+Optional dependencies:
 
-Read passwordsafe.info for additional dependencies.
+ykpers (for yubikey support).
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index 5aa0b9f212..c5108d251a 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=passwordsafe
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-1.13.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index 91f3658ccd..52e1c70c0b 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,10 +1,10 @@
 PRGNAM="passwordsafe"
-VERSION="1.11.0"
+VERSION="1.13.0"
 HOMEPAGE="https://pwsafe.org"
-DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.11.0/pwsafe-1.11.0.tar.gz"
-MD5SUM="f997e8e2292a1153fd5c660c1c7ed45e"
+DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.13.0/pwsafe-1.13.0.tar.gz"
+MD5SUM="f75a4f3646227998f34c6732e2b22404"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ykpers xerces-c wxGTK3 xvkbd qrencode"
+REQUIRES="xerces-c wxGTK3 xvkbd qrencode"
 MAINTAINER="rfmae"
 EMAIL="rfmae.git@mailbox.org"
diff --git a/system/pax/pax.SlackBuild b/system/pax/pax.SlackBuild
index 88d9083792..b316863c42 100644
--- a/system/pax/pax.SlackBuild
+++ b/system/pax/pax.SlackBuild
@@ -10,6 +10,9 @@
 # By:        Eric Hameleers <alien@slackware.com>
 # For:       pax
 # Changelog:
+# 20201030:  14/Apr/2021 by Ben Collver <bencollver@gmail.com>
+#            * switch to MirBSD pax
+#            * removed gpl-2.0.txt
 # 3.4-2:     17/Sep/2012 by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 #	     * Fix build on Slackware 14.0
 # 3.4-1:     30/Nov/2008 by Ben Collver <bencollver@gmail.com>
@@ -24,13 +27,13 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=pax
-VERSION=${VERSION:-3.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20201030}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +44,8 @@ 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"
@@ -60,41 +63,32 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
- \( -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 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 {} \;
 
+chmod 755 Build.sh
 CFLAGS="$SLKCFLAGS -Wno-error" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+./Build.sh
 
-make
-make install DESTDIR=$PKG
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+install -c -s -o root -g bin -m 555 pax $PKG/usr/bin/pax
+install -c -o root -g bin -m 444 mans/pax.1 $PKG/usr/man/man1/pax.1
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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 \
-  ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/pax/pax.info b/system/pax/pax.info
index dd95a443b1..976f2757b7 100644
--- a/system/pax/pax.info
+++ b/system/pax/pax.info
@@ -1,8 +1,8 @@
 PRGNAM="pax"
-VERSION="3.4"
+VERSION="20201030"
 HOMEPAGE="http://wiki.bash-hackers.org/howto/pax"
-DOWNLOAD="https://downloads.sourceforge.net/project/slackbuildsdirectlinks/pax/pax-3.4.tar.bz2"
-MD5SUM="fbd9023b590b45ac3ade95870702a0d6"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/pax_20201030.orig.tar.gz"
+MD5SUM="87a0a3870ec437c41eb1b406334fe2c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch b/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch
deleted file mode 100644
index ad9a022db9..0000000000
--- a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0619a81f358d85568d990fc78c67e121e55f1c05 Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Thu, 27 Dec 2018 11:56:09 +0100
-Subject: [PATCH] Avoid undefined 'isdigit()' behaviour
-
-As the C11 standard says in section 7.4, 1),
-the 'isdigit()' function is only well-defined
-under this precondition:
-
-> The header <ctype.h> declares several functions
-> useful for classifying and mapping characters.
-> In all cases the argument is an int, the value of
-> which shall be representable as an unsigned char or
-> shall equal the value of the macro EOF. If the argument
-> has any other value, the behavior is undefined.
-
-Therefore avoid to use the 'isdigit()' function here,
-since the Gdk key codes and thus the 'keyval'
-member from the 'GdkEventKey' do not always fulfill
-this requirement and the behaviour is thus undefined.
----
- NEWS           | 5 +++++
- src/main-win.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index d2e6caa..c5b2285 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,8 @@
-+Changes on 1.3.2 since 1.3.1:
-+
-+* Fixed case when some keyboard shortcuts stopped working: Alt+Home, Alt+Up.
-+
-+
- Changes on 1.3.1 since 1.3.0:
- 
- * Allowed bigger sizes of icons and thumbnails as 256*256 appears to be small
-diff --git a/src/main-win.c b/src/main-win.c
-index 3907dba..49fc53b 100644
---- a/src/main-win.c
-+++ b/src/main-win.c
-@@ -2465,7 +2465,7 @@ static gboolean on_key_press_event(GtkWidget* w, GdkEventKey* evt)
- 
-     if(modifier == GDK_MOD1_MASK) /* Alt */
-     {
--        if(isdigit(evt->keyval)) /* Alt + 0 ~ 9, nth tab */
-+        if(evt->keyval >= '0' && evt->keyval <= '9') /* Alt + 0 ~ 9, nth tab */
-         {
-             int n;
-             if(evt->keyval == '0')
--- 
-2.1.4
-
diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild
index 2785dd5496..07edeac2f5 100644
--- a/system/pcmanfm/pcmanfm.SlackBuild
+++ b/system/pcmanfm/pcmanfm.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
 # Copyright 2010 Chris Abela <chris.abela@maltats.com>
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcmanfm
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,9 +77,6 @@ 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 {} \;
 
-# Apply upstream patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
 sh autogen.sh || true
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info
index 7cb89e0763..d3546b675e 100644
--- a/system/pcmanfm/pcmanfm.info
+++ b/system/pcmanfm/pcmanfm.info
@@ -1,8 +1,8 @@
 PRGNAM="pcmanfm"
-VERSION="1.3.1"
+VERSION="1.3.2"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.1.tar.xz"
-MD5SUM="d32ad2c9c7c52bff2004bbc120b53420"
+DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz"
+MD5SUM="ef7c4417d2697ef138d175db7aeae15a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libfm"
diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild
index e6617f8930..9c5b5a155a 100644
--- a/system/pcsc-lite/pcsc-lite.SlackBuild
+++ b/system/pcsc-lite/pcsc-lite.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for pcsc-lite
 
 # Copyright 2007-2015  LukenShiro, Italy
-# Copyright 2020  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2020-2021  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcsc-lite
-VERSION=${VERSION:-1.8.26}
+VERSION=${VERSION:-1.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info
index fcc3cd640d..2b8a9b9da1 100644
--- a/system/pcsc-lite/pcsc-lite.info
+++ b/system/pcsc-lite/pcsc-lite.info
@@ -1,8 +1,8 @@
 PRGNAM="pcsc-lite"
-VERSION="1.8.26"
+VERSION="1.9.1"
 HOMEPAGE="https://pcsclite.apdu.fr/"
-DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.8.26.tar.bz2"
-MD5SUM="9d36882998449daceec267c68a21ff0d"
+DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.9.1.tar.bz2"
+MD5SUM="de449fb9dc0bb57ede502905accc0d8b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
index ef9631ef28..d81b19a469 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
+++ b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for phoronix-test-suite
 
-# Copyright 2014-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=phoronix-test-suite
-VERSION=${VERSION:-10.0.1}
+VERSION=${VERSION:-10.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/phoronix-test-suite/phoronix-test-suite.info b/system/phoronix-test-suite/phoronix-test-suite.info
index 252c7b50db..187c8159b8 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.info
+++ b/system/phoronix-test-suite/phoronix-test-suite.info
@@ -1,8 +1,8 @@
 PRGNAM="phoronix-test-suite"
-VERSION="10.0.1"
+VERSION="10.2.2"
 HOMEPAGE="https://phoronix-test-suite.com/"
-DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-10.0.1.tar.gz"
-MD5SUM="261818c5c45d0653880e005a74cab13e"
+DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-10.2.2.tar.gz"
+MD5SUM="e4a9d3fc2e21a7f15e2b4fbef3ee7a44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/porg/porg.SlackBuild b/system/porg/porg.SlackBuild
index a2f4ca1ad5..61219d02c0 100644
--- a/system/porg/porg.SlackBuild
+++ b/system/porg/porg.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for porg
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
 
 PRGNAM=porg
 VERSION=${VERSION:-0.10}
diff --git a/system/porg/porg.info b/system/porg/porg.info
index 57d779505d..6efa7e1524 100644
--- a/system/porg/porg.info
+++ b/system/porg/porg.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/system/powershell/doinst.sh b/system/powershell/doinst.sh
deleted file mode 100644
index 4b87024f0b..0000000000
--- a/system/powershell/doinst.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-chmod +x /opt/microsoft/powershell/pwsh
-ln -s /opt/microsoft/powershell/pwsh /usr/bin/pwsh
diff --git a/system/powershell/powershell.SlackBuild b/system/powershell/powershell.SlackBuild
index 9232ac2e5e..bcdfa13d76 100644
--- a/system/powershell/powershell.SlackBuild
+++ b/system/powershell/powershell.SlackBuild
@@ -23,16 +23,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=powershell
-VERSION=${VERSION:-7.0.3}
+VERSION=${VERSION:-7.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHITECTURE="x64"
+else
+  echo "Package for $ARCH architecture is not available."
+  exit 1
 fi
 
 CWD=$(pwd)
@@ -40,20 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 set -e
 
-if [ "$( uname -m )" = "x86_64" ]; then
-  ARCH="x86_64"
-  ARCHITECTURE="x64"
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,12 +55,14 @@ mkdir -p opt/microsoft/powershell
 tar -zxf $CWD/$PRGNAM-${VERSION}-linux-${ARCHITECTURE}.tar.gz -C opt/microsoft/powershell
 chown -R root:root opt/microsoft/powershell
 
+mkdir -p usr/bin/
+ln -s /opt/microsoft/powershell/pwsh usr/bin/pwsh
+
 mkdir -p usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg --linkadd y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/powershell/powershell.info b/system/powershell/powershell.info
index 948c90ce57..9e7c9aaa3f 100644
--- a/system/powershell/powershell.info
+++ b/system/powershell/powershell.info
@@ -1,10 +1,10 @@
 PRGNAM="powershell"
-VERSION="7.0.3"
+VERSION="7.1.3"
 HOMEPAGE="https://www.microsoft.com/powershell/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/powershell-7.0.3-linux-x64.tar.gz"
-MD5SUM_x86_64="742db1551728c88d6277653d34db56b4"
+DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.1.3/powershell-7.1.3-linux-x64.tar.gz"
+MD5SUM_x86_64="bdeb7d2a5cf51b97b02d4c16a055c8eb"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/system/prometheus/README b/system/prometheus/README
new file mode 100644
index 0000000000..32872f5f9c
--- /dev/null
+++ b/system/prometheus/README
@@ -0,0 +1,24 @@
+Prometheus (An Open-Source Monitoring and Alerting Toolkit)
+
+Prometheus is an open-source systems monitoring and alerting toolkit
+originally built at SoundCloud.
+
+Prometheus's main features are:
+
+- a multi-dimensional data model with time series data identified by
+  metric name and key/value pairs
+- PromQL, a flexible query language to leverage this dimensionality
+- no reliance on distributed storage; single server nodes are autonomous
+- time series collection happens via a pull model over HTTP
+- pushing time series is supported via an intermediary gateway
+- targets are discovered via service discovery or static configuration
+- multiple modes of graphing and dashboarding support
+
+Groupname and Username
+
+You must have the "prometheus" group and user to run this script, for
+example:
+
+  groupadd -g 368 prometheus
+  useradd -u 368 -s /bin/false -d /var/lib/prometheus \
+    -g prometheus prometheus
diff --git a/system/prometheus/doinst.sh b/system/prometheus/doinst.sh
new file mode 100644
index 0000000000..5e73a492a1
--- /dev/null
+++ b/system/prometheus/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+config etc/prometheus/prometheus.yml.new
+
+preserve_perms etc/rc.d/rc.prometheus.new
diff --git a/system/prometheus/prometheus.SlackBuild b/system/prometheus/prometheus.SlackBuild
new file mode 100644
index 0000000000..57ec494f66
--- /dev/null
+++ b/system/prometheus/prometheus.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for Prometheus
+
+# Copyright 2017-2020 Ebben Aries <slackbuilds@dscp.org>
+# 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=prometheus
+VERSION=${VERSION:-2.26.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+UIDGID=368
+if ! getent group $PRGNAM; then
+	echo "  You must have the \"$PRGNAM\" group to run this script."
+	echo "    # groupadd -g $UIDGID $PRGNAM"
+	exit 1
+elif ! getent passwd $PRGNAM; then
+	echo "  You must have the \"$PRGNAM\" user to run this script."
+	echo "    # useradd -u $UIDGID -s /bin/false -d /var/lib/$PRGNAM -g $PRGNAM $PRGNAM"
+	exit 1
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  PKG_ARCH=amd64
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-${VERSION}.linux-${PKG_ARCH}.tar.gz
+cd $PRGNAM-${VERSION}.linux-${PKG_ARCH}
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p $PKG/etc/prometheus
+cp -a prometheus.yml $PKG/etc/prometheus/prometheus.yml.new
+
+mkdir -p $PKG/usr/bin
+cp -a prometheus $PKG/usr/bin
+cp -a promtool $PKG/usr/bin
+
+mkdir -p $PKG/usr/share/prometheus
+cp -ar console_libraries $PKG/usr/share/prometheus
+cp -ar consoles $PKG/usr/share/prometheus
+
+mkdir -p $PKG/var/lib/prometheus
+chown -R prometheus:prometheus $PKG/var/lib/prometheus
+
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.prometheus.new > $PKG/etc/rc.d/rc.prometheus.new
+
+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 NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/system/prometheus/prometheus.info b/system/prometheus/prometheus.info
new file mode 100644
index 0000000000..1d9ae489f1
--- /dev/null
+++ b/system/prometheus/prometheus.info
@@ -0,0 +1,10 @@
+PRGNAM="prometheus"
+VERSION="2.26.0"
+HOMEPAGE="https://prometheus.io"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/prometheus/prometheus/releases/download/v2.26.0/prometheus-2.26.0.linux-amd64.tar.gz"
+MD5SUM_x86_64="839c1fc55ea026611f56eec5b36d61c3"
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/prometheus/rc.prometheus.new b/system/prometheus/rc.prometheus.new
new file mode 100644
index 0000000000..6d1e705e0e
--- /dev/null
+++ b/system/prometheus/rc.prometheus.new
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Copyright 2020, Ebben Aries, USA
+# 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.
+
+PROG=/usr/bin/prometheus
+USER=prometheus
+LOGFILE=/var/log/prometheus.log
+CONF=/etc/prometheus/prometheus.yml
+TSDB=/var/lib/prometheus
+WEB_LIBS=/usr/share/prometheus/console_libraries
+WEB_TEMPLATES=/usr/share/prometheus/consoles
+
+prometheus_start() {
+  echo -e "Starting Prometheus..."
+  nohup sudo -u $USER $PROG \
+      --config.file=$CONF \
+      --storage.tsdb.path=$TSDB \
+      --web.console.libraries=$WEB_LIBS \
+      --web.console.templates=$WEB_TEMPLATES \
+      > $LOGFILE 2>&1 &
+}
+
+prometheus_stop() {
+  echo -e "Stopping Prometheus..."
+  killall prometheus
+}
+
+prometheus_restart() {
+  prometheus_stop
+  sleep 3
+  prometheus_start
+}
+
+case "$1" in
+  start)
+    prometheus_start
+    ;;
+  stop)
+    prometheus_stop
+    ;;
+  restart)
+    prometheus_restart
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
diff --git a/system/prometheus/slack-desc b/system/prometheus/slack-desc
new file mode 100644
index 0000000000..30bd4f1c35
--- /dev/null
+++ b/system/prometheus/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+prometheus: Prometheus (An Open-Source Monitoring and Alerting Toolkit)
+prometheus:
+prometheus: Prometheus is an open-source systems monitoring and alerting toolkit
+prometheus: originally built at SoundCloud.
+prometheus:
+prometheus:
+prometheus:
+prometheus:
+prometheus:
+prometheus: Home-Page: https://prometheus.io
+prometheus:
diff --git a/system/pspg/pspg.SlackBuild b/system/pspg/pspg.SlackBuild
index 964335d314..2c8b6c788a 100644
--- a/system/pspg/pspg.SlackBuild
+++ b/system/pspg/pspg.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pspg
 
-# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pspg
-VERSION=${VERSION:-3.1.4}
+VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/pspg/pspg.info b/system/pspg/pspg.info
index cdf2477228..8316fa3959 100644
--- a/system/pspg/pspg.info
+++ b/system/pspg/pspg.info
@@ -1,8 +1,8 @@
 PRGNAM="pspg"
-VERSION="3.1.4"
+VERSION="4.5.0"
 HOMEPAGE="https://github.com/okbob/pspg"
-DOWNLOAD="https://github.com/okbob/pspg/archive/3.1.4/pspg-3.1.4.tar.gz"
-MD5SUM="46430135d29f16a40511d56f4071af07"
+DOWNLOAD="https://github.com/okbob/pspg/archive/4.5.0/pspg-4.5.0.tar.gz"
+MD5SUM="f09bd3aa94affc2cc008ee78f64e774b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/qdirstat/qdirstat.SlackBuild b/system/qdirstat/qdirstat.SlackBuild
index c650048ca5..623a675d77 100644
--- a/system/qdirstat/qdirstat.SlackBuild
+++ b/system/qdirstat/qdirstat.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qdirstat
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/qdirstat/qdirstat.info b/system/qdirstat/qdirstat.info
index b4f7a61f78..20f34ac13d 100644
--- a/system/qdirstat/qdirstat.info
+++ b/system/qdirstat/qdirstat.info
@@ -1,8 +1,8 @@
 PRGNAM="qdirstat"
-VERSION="1.6.1"
+VERSION="1.7.1"
 HOMEPAGE="https://github.com/shundhammer/qdirstat/"
-DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.6.1/qdirstat-1.6.1.tar.gz"
-MD5SUM="4cdf3cea0a9c0e7cedbf2ce01cf632ea"
+DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.7.1/qdirstat-1.7.1.tar.gz"
+MD5SUM="551b48dcb8006727166d5b167a2af675"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index c7b9538ff6..57a43b834a 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -55,10 +55,11 @@
 # 4.5   03-Jun-2018     version update to 2.12.0 release, note new deps: sdl2, gtk+3
 # 5.0   14-Dec-2018	version update to 3.1.0 release, note minimum dependency versions on release notes
 # 6.0   14-JUL-2019	version update to 4.0.0 release, note minimum dependency versions on release notes, doc fixes
-# 6.1   19-AUG-2019	verion update
+# 6.1   19-AUG-2019	version update
+# 6.2   16-Nov-2020     version update, 14.2 final release.
 
 PRGNAM=qemu
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index d092200f0e..ff582deea0 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
 PRGNAM="qemu"
-VERSION="4.1.0"
+VERSION="4.1.1"
 HOMEPAGE="https://www.qemu.org"
-DOWNLOAD="https://download.qemu.org/qemu-4.1.0.tar.xz"
-MD5SUM="cdf2b5ca52b9abac9bacb5842fa420f8"
+DOWNLOAD="https://download.qemu.org/qemu-4.1.1.tar.xz"
+MD5SUM="53879f792ef2675c6c5e6cbf5cc1ac6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
diff --git a/system/rEFInd/rEFInd.SlackBuild b/system/rEFInd/rEFInd.SlackBuild
index 90f28c4eb8..9046b5f8fa 100644
--- a/system/rEFInd/rEFInd.SlackBuild
+++ b/system/rEFInd/rEFInd.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=rEFInd
 SRCNAME=refind
-VERSION=${VERSION:-0.12.0}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rEFInd/rEFInd.info b/system/rEFInd/rEFInd.info
index cddd2f4e79..d4bded634f 100644
--- a/system/rEFInd/rEFInd.info
+++ b/system/rEFInd/rEFInd.info
@@ -1,8 +1,8 @@
 PRGNAM="rEFInd"
-VERSION="0.12.0"
+VERSION="0.13.1"
 HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="https://sourceforge.net/projects/refind/files/0.12.0/refind-src-0.12.0.tar.gz"
-MD5SUM="673088f61ccd60535a3b2c0d607e4a7e"
+DOWNLOAD="https://sourceforge.net/projects/refind/files/0.13.1/refind-src-0.13.1.tar.gz"
+MD5SUM="816252968231915b3445ab00b067f011"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/rar2fs/rar2fs.SlackBuild b/system/rar2fs/rar2fs.SlackBuild
index d58f7dc9ba..a0b1dcb813 100644
--- a/system/rar2fs/rar2fs.SlackBuild
+++ b/system/rar2fs/rar2fs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rar2fs
 
-# Copyright 2011, 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2011, 2015, 2016, 2017, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rar2fs
-VERSION=${VERSION:-1.26.0}
+VERSION=${VERSION:-1.29.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,14 +81,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-install -D -m 755 mkr2i $PKG/usr/bin/mkr2i
-install -D -m 755 rar2fs $PKG/usr/bin/rar2fs
+install -D -m 755 src/mkr2i $PKG/usr/bin/mkr2i
+install -D -m 755 src/rar2fs $PKG/usr/bin/rar2fs
 
-install -D -m 644 rar2fs.1 $PKG/usr/man/man1/rar2fs.1
+install -D -m 644 man/rar2fs.1 $PKG/usr/man/man1/rar2fs.1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/rar2fs/rar2fs.info b/system/rar2fs/rar2fs.info
index adff04cbcb..97643ff11b 100644
--- a/system/rar2fs/rar2fs.info
+++ b/system/rar2fs/rar2fs.info
@@ -1,8 +1,8 @@
 PRGNAM="rar2fs"
-VERSION="1.26.0"
+VERSION="1.29.4"
 HOMEPAGE="https://github.com/hasse69/rar2fs"
-DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.26.0/rar2fs-1.26.0.tar.gz"
-MD5SUM="30acf457c7ecec179b1cdcfbbe601410"
+DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.29.4/rar2fs-1.29.4.tar.gz"
+MD5SUM="e4437a32e16ff03e78e3c65834bbe1dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="unrar"
diff --git a/system/refind/refind.SlackBuild b/system/refind/refind.SlackBuild
index b8c892ed95..4d319171f8 100644
--- a/system/refind/refind.SlackBuild
+++ b/system/refind/refind.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=refind
-VERSION=${VERSION:-0.12.0}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/refind/refind.info b/system/refind/refind.info
index ead99133aa..bc3c09e94d 100644
--- a/system/refind/refind.info
+++ b/system/refind/refind.info
@@ -1,8 +1,8 @@
 PRGNAM="refind"
-VERSION="0.12.0"
-HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="http://sourceforge.net/projects/refind/files/0.12.0/refind-bin-0.12.0.zip"
-MD5SUM="b44285cf65a9c61065761cb699532b8a"
+VERSION="0.13.1"
+HOMEPAGE="http://www.rodsbooks.com/refind"
+DOWNLOAD="http://sourceforge.net/projects/refind/files/0.13.1/refind-bin-0.13.1.zip"
+MD5SUM="c59ade5e8d63768abf30fc96cc2e77ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/reptyr/reptyr.SlackBuild b/system/reptyr/reptyr.SlackBuild
index 041f6e2525..532699761d 100644
--- a/system/reptyr/reptyr.SlackBuild
+++ b/system/reptyr/reptyr.SlackBuild
@@ -6,13 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw: updated for v0.8.0
 # 20191128 bkw: updated for v0.7.0
 # 20170621 bkw: get rid of -Werror (-current needs this)
 # 20170302 bkw: use long-format github URL
 # 20150505 bkw: updated for v0.6.2
 
 PRGNAM=reptyr
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/reptyr/reptyr.info b/system/reptyr/reptyr.info
index 5e55bf62f9..844cb53c3e 100644
--- a/system/reptyr/reptyr.info
+++ b/system/reptyr/reptyr.info
@@ -1,8 +1,8 @@
 PRGNAM="reptyr"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="https://github.com/nelhage/reptyr"
-DOWNLOAD="https://github.com/nelhage/reptyr/archive/reptyr-0.7.0/reptyr-reptyr-0.7.0.tar.gz"
-MD5SUM="b44a0057d57d63f3971d3dbda3af1d5b"
+DOWNLOAD="https://github.com/nelhage/reptyr/archive/reptyr-0.8.0/reptyr-reptyr-0.8.0.tar.gz"
+MD5SUM="f682c73ebf2f0fc2fa577e84ba991e97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/reptyr/slack-desc b/system/reptyr/slack-desc
index 52e0bc0486..95315b7afb 100644
--- a/system/reptyr/slack-desc
+++ b/system/reptyr/slack-desc
@@ -14,6 +14,6 @@ reptyr: ssh, but have to leave and don't want to interrupt it? Just start
 reptyr: a screen, use reptyr to grab it, and then kill the ssh session and
 reptyr: head on home.
 reptyr:
-reptyr: homepage: https://github.com/nelhage/reptyr
+reptyr: Homepage: https://github.com/nelhage/reptyr
 reptyr:
 reptyr:
diff --git a/system/restic/restic.SlackBuild b/system/restic/restic.SlackBuild
index cfc4de2cd6..18a06b43b7 100644
--- a/system/restic/restic.SlackBuild
+++ b/system/restic/restic.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for restic
 
-# Copyright 2020 Ebben Aries <e@dscp.org>
+# Copyright 2020-2021 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=restic
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-0.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/restic/restic.info b/system/restic/restic.info
index 8fa141fab1..2a720df865 100644
--- a/system/restic/restic.info
+++ b/system/restic/restic.info
@@ -1,10 +1,10 @@
 PRGNAM="restic"
-VERSION="0.10.0"
+VERSION="0.12.0"
 HOMEPAGE="https://restic.net/"
-DOWNLOAD="https://github.com/restic/restic/releases/download/v0.10.0/restic_0.10.0_linux_386.bz2"
-MD5SUM="9e814802dfb4eb6b25664b82749c3494"
-DOWNLOAD_x86_64="https://github.com/restic/restic/releases/download/v0.10.0/restic_0.10.0_linux_amd64.bz2"
-MD5SUM_x86_64="d2f618c3b3dd1cc2e5bb56e28fb14a8d"
+DOWNLOAD="https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_linux_386.bz2"
+MD5SUM="ff4c35d9f4dbddf248e03b1994d7e27c"
+DOWNLOAD_x86_64="https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_linux_amd64.bz2"
+MD5SUM_x86_64="ed501c292a7b6dac355cc8f867699bc2"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild
index a076213f53..24d4602337 100644
--- a/system/rhash/rhash.SlackBuild
+++ b/system/rhash/rhash.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (c) 2014, Симонъ–Севаръ Болокановъ, Bulgaria <sbolokanov@abv.bg>
+# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <sbolokanov@abv.bg>
+#                     С. С. Болоканаръ, Българи�
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +21,6 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by: Симонъ Болокановъ <sbolokanov@abv.bg>
-# Date: Unknown
-
 # Changelog:
 #    v1.3.3 - Re-done the sript and send it to SBo
 #    27.2.2015 - no headers!? - thanks to Marcel Saegebarth for spotting this
@@ -32,7 +30,7 @@
 #      3 Мартъ 1878 – въз�тановѧване на Българиѧ, 3 Мартъ 1918 (40 г. по–къ�но) – победа надъ Ру�иѧ
 
 PRGNAM=rhash
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rhash/rhash.info b/system/rhash/rhash.info
index 30b6009c6f..1e86e18c74 100644
--- a/system/rhash/rhash.info
+++ b/system/rhash/rhash.info
@@ -1,10 +1,10 @@
 PRGNAM="rhash"
-VERSION="1.4.0"
+VERSION="1.4.1"
 HOMEPAGE="https://github.com/rhash/RHash/"
-DOWNLOAD="https://github.com/rhash/RHash/archive/v1.4.0/RHash-1.4.0.tar.gz"
-MD5SUM="7adb443e76f2ccad718725a2708e1dbb"
+DOWNLOAD="https://github.com/rhash/RHash/archive/v1.4.1/RHash-1.4.1.tar.gz"
+MD5SUM="5059d052270e92302dbb08de3f6d7fee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Симонъ С. Болокановъ"
+MAINTAINER="S. S. Bolokanar"
 EMAIL="sbolokanov@abv.bg"
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index 3bccaeea52..81fd0b5f17 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for rmw
 #
-# Copyright 2019-2020 / Andy Alt / United States
+# Copyright 2019-2021 / Andy Alt / United States
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rmw
-VERSION=${VERSION:-0.7.05}
+VERSION=${VERSION:-0.7.06}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index 241e3d7800..778de6ab12 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,8 +1,8 @@
 PRGNAM="rmw"
-VERSION="0.7.05"
+VERSION="0.7.06"
 HOMEPAGE="https://remove-to-waste.info/"
-DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.05/rmw-0.7.05.tar.gz"
-MD5SUM="adaa3ce4f4e10203e772d5d80c4a0b5a"
+DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.06/rmw-0.7.06.tar.gz"
+MD5SUM="9b5e0fcda2e32b1886efd50030e51a5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/rox-filer/rox-filer.SlackBuild b/system/rox-filer/rox-filer.SlackBuild
index b5ae022667..858f57f768 100644
--- a/system/rox-filer/rox-filer.SlackBuild
+++ b/system/rox-filer/rox-filer.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=rox-filer
 VERSION=${VERSION:-2.11}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,6 +44,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+patch -p0 < $CWD/session_auto_respawn.diff
 chown -R root:root .
 find -L . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/system/rox-filer/session_auto_respawn.diff b/system/rox-filer/session_auto_respawn.diff
new file mode 100644
index 0000000000..0ade6b556b
--- /dev/null
+++ b/system/rox-filer/session_auto_respawn.diff
@@ -0,0 +1,11 @@
+--- ROX-Filer/src/session.h~	2011-10-09 16:31:59.000000000 +0200
++++ ROX-Filer/src/session.h	2020-12-17 11:11:19.302291214 +0100
+@@ -10,7 +10,7 @@
+ #include <gtk/gtk.h>
+ #include <X11/SM/SMlib.h>
+ 
+-gboolean session_auto_respawn;
++extern gboolean session_auto_respawn;
+ 
+ void session_init(const gchar *client_id);
+ 
diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild
index 907527f5ae..5f66b8c68f 100644
--- a/system/rsyslog/rsyslog.SlackBuild
+++ b/system/rsyslog/rsyslog.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rsyslog
 
-# Copyright (c) 2019, Christophe Trussardi, Paris, France
+# Copyright (c) 2021, Christophe Trussardi, Paris, France
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rsyslog
-VERSION=${VERSION:-8.2001.0}
+VERSION=${VERSION:-8.2102.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,6 +58,7 @@ fi
 [ "${LIBDBI:-no}" = "no" ] || libdbi_option="--enable-libdbi"
 [ "${GNUTLS:-no}" = "no" ] || gnutls_option="--enable-gnutls"
 [ "${RELP:-no}" = "no" ] || relp_option="--enable-relp"
+[ "${LIBLOGGING:-no}" = "no" ] || liblogging_option="--enable-liblogging-stdlog"
 
 set -e
 
@@ -85,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-generate-man-pages \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option
+  $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option $liblogging_option
 
 make
 make install-strip DESTDIR=$PKG
diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info
index 174f7d97fd..4b184817d9 100644
--- a/system/rsyslog/rsyslog.info
+++ b/system/rsyslog/rsyslog.info
@@ -1,10 +1,10 @@
 PRGNAM="rsyslog"
-VERSION="8.2001.0"
+VERSION="8.2102.0"
 HOMEPAGE="https://www.rsyslog.com/"
-DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2001.0.tar.gz"
-MD5SUM="4dc7bd26d3e6e8fbeff9e0bd203077be"
+DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2102.0.tar.gz"
+MD5SUM="1f6150dfd2ef38db37c2165e98d2f2b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README% docutils libee libestr libfastjson liblogging"
+REQUIRES="%README% docutils libee libestr libfastjson"
 MAINTAINER="Christophe Trussardi"
 EMAIL="chris@teria.org"
diff --git a/system/runc/runc.SlackBuild b/system/runc/runc.SlackBuild
index 773d9307e2..4352b4126f 100644
--- a/system/runc/runc.SlackBuild
+++ b/system/runc/runc.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for runc
 
 # Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il>
-# Copyright 2017-2020 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=runc
-VERSION=${VERSION:-1.0.0_rc10}
-GITHASH=${GITHASH:-dc9208a3303feef5b3839f4323d9beb36df0a9dd}
+VERSION=${VERSION:-1.0.0_rc92}
+GITHASH=${GITHASH:-ff819c7e9184c13b7c2607fe6c30ae19403a7aff}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,16 +59,12 @@ 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 {} \;
 
-mkdir build
-mv vendor build/src
-ln -sf $TMP/$PRGNAM-$SRCVER build/src/github.com/opencontainers/runc
-
 # Do not try to get git commit hash, we're not inside git repository.
 sed -i '/^COMMIT/d' Makefile
 
 make \
-  COMMIT=$GITHASH \
-  GOPATH=$TMP/$PRGNAM-$SRCVER/build
+  BUILDTAGS="seccomp" \
+  COMMIT=$GITHASH
 make install BINDIR=$PKG/usr/bin
 make install-bash PREFIX=$PKG/usr
 
diff --git a/system/runc/runc.info b/system/runc/runc.info
index 74fdcec17b..a43ca11b09 100644
--- a/system/runc/runc.info
+++ b/system/runc/runc.info
@@ -1,10 +1,10 @@
 PRGNAM="runc"
-VERSION="1.0.0_rc10"
+VERSION="1.0.0_rc92"
 HOMEPAGE="https://github.com/opencontainers/runc"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.0.0-rc10/runc-1.0.0-rc10.tar.gz"
-MD5SUM_x86_64="8aba10b1dd251a039eefd5ac028244f3"
+DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.0.0-rc92/runc-1.0.0-rc92.tar.gz"
+MD5SUM_x86_64="7c4dcdf8d481c8d25b88af3f40846a4b"
 REQUIRES="google-go-lang libseccomp"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/s3fs-fuse/README b/system/s3fs-fuse/README
new file mode 100644
index 0000000000..5f80545687
--- /dev/null
+++ b/system/s3fs-fuse/README
@@ -0,0 +1,7 @@
+s3fs allows Linux and macOS to mount an S3 bucket via FUSE.
+
+s3fs preserves the native object format for files, allowing
+use of other tools like AWS CLI
+
+NOTE: awscli is runtime dependency as it needs to be properly
+configured to be able to connect to AWS S3 Buckets.
diff --git a/system/s3fs-fuse/s3fs-fuse.SlackBuild b/system/s3fs-fuse/s3fs-fuse.SlackBuild
new file mode 100644
index 0000000000..8bf183152a
--- /dev/null
+++ b/system/s3fs-fuse/s3fs-fuse.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for s3fs-fuse
+
+# Copyright 2020-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# 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=s3fs-fuse
+VERSION=${VERSION:-1.89}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e	
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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
+
+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 AUTHORS COPYING ChangeLog INSTALL *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/s3fs-fuse/s3fs-fuse.info b/system/s3fs-fuse/s3fs-fuse.info
new file mode 100644
index 0000000000..b1075b5180
--- /dev/null
+++ b/system/s3fs-fuse/s3fs-fuse.info
@@ -0,0 +1,10 @@
+PRGNAM="s3fs-fuse"
+VERSION="1.89"
+HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse"
+DOWNLOAD="https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.89/s3fs-fuse-1.89.tar.gz"
+MD5SUM="b1b5e5cb7478e411d4470f1058e7c011"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="awscli"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/s3fs-fuse/slack-desc b/system/s3fs-fuse/slack-desc
new file mode 100644
index 0000000000..91af0e7c4e
--- /dev/null
+++ b/system/s3fs-fuse/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+s3fs-fuse: s3fs-fuse (FUSE-based file system)
+s3fs-fuse:
+s3fs-fuse: s3fs allows Linux and macOS to mount an S3 bucket via FUSE.
+s3fs-fuse:
+s3fs-fuse: s3fs preserves the native object format for files, allowing use of
+s3fs-fuse: other tools like AWS CLI.
+s3fs-fuse:
+s3fs-fuse:
+s3fs-fuse: Project URL: https://github.com/s3fs-fuse/s3fs-fuse
+s3fs-fuse:
+s3fs-fuse:
diff --git a/system/s6-linux-init/README b/system/s6-linux-init/README
index 28c069dffb..21fdbd752a 100644
--- a/system/s6-linux-init/README
+++ b/system/s6-linux-init/README
@@ -35,8 +35,8 @@ script like below:
 
 The init system created by s6-linux-init will need an early boot tmpfs
 in order to work properly. By default, s6-linux-init will assume that
-this initial tmpfs will be mounted on /run. You can change this by
-passing TMPFS_DIR=/path/to/directory to the script like below:
+this tmpfs will be mounted on /run. You can change this by passing
+TMPFS_DIR=/path/to/directory to the script like below:
 
     TMPFS_DIR=/path/to/directory ./s6-linux-init.SlackBuild
 
diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild
index c296799451..12bf4948a3 100644
--- a/system/s6-linux-init/s6-linux-init.SlackBuild
+++ b/system/s6-linux-init/s6-linux-init.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=s6-linux-init
-VERSION=${VERSION:-1.0.4.2}
+VERSION=${VERSION:-1.0.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/s6-linux-init/s6-linux-init.info b/system/s6-linux-init/s6-linux-init.info
index fe4c003f60..2efba226a8 100644
--- a/system/s6-linux-init/s6-linux-init.info
+++ b/system/s6-linux-init/s6-linux-init.info
@@ -1,8 +1,8 @@
 PRGNAM="s6-linux-init"
-VERSION="1.0.4.2"
+VERSION="1.0.6.2"
 HOMEPAGE="https://skarnet.org/software/s6-linux-init/"
-DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.4.2.tar.gz"
-MD5SUM="d21a115ddff023be7dfc92df6bd6572a"
+DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.6.2.tar.gz"
+MD5SUM="8ac36600894f2624eb3a2e9bb440e857"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="s6"
diff --git a/system/s6-rc/README b/system/s6-rc/README
index 8249bb33f6..fcc650f1d7 100644
--- a/system/s6-rc/README
+++ b/system/s6-rc/README
@@ -6,8 +6,8 @@ the s6 infrastructure, and that one-time scripts are also run in a
 controlled environment.
 
 NOTE:
-s6-rc needs "live directory" where it puts some internal files that are
-needed at run-time. Default is /run/s6-rc. The default can be changed to
+s6-rc has a "live directory" where it puts some internal files that are
+needed at runtime, which defaults to /run/s6-rc. This can be changed to
 other directory by passing LIVE_DIR=/path/to/directory environment
 variable to the SlackBuild script like below:
 
diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild
index 073faed9f6..bbbd9c5755 100644
--- a/system/s6-rc/s6-rc.SlackBuild
+++ b/system/s6-rc/s6-rc.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=s6-rc
-VERSION=${VERSION:-0.5.2.0}
+VERSION=${VERSION:-0.5.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info
index 291501e8cd..7fec7a8ac7 100644
--- a/system/s6-rc/s6-rc.info
+++ b/system/s6-rc/s6-rc.info
@@ -1,8 +1,8 @@
 PRGNAM="s6-rc"
-VERSION="0.5.2.0"
+VERSION="0.5.2.2"
 HOMEPAGE="https://skarnet.org/software/s6-rc/"
-DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.0.tar.gz"
-MD5SUM="62287a1adad875848c0d85861dc8139e"
+DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.2.tar.gz"
+MD5SUM="1e003badbde728137170775806c6776b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="s6"
diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild
index 9d9d454b4e..7bf12235fe 100644
--- a/system/s6/s6.SlackBuild
+++ b/system/s6/s6.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=s6
-VERSION=${VERSION:-2.9.2.0}
+VERSION=${VERSION:-2.10.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/s6/s6.info b/system/s6/s6.info
index 5404aa2d61..d17ff68653 100644
--- a/system/s6/s6.info
+++ b/system/s6/s6.info
@@ -1,10 +1,10 @@
 PRGNAM="s6"
-VERSION="2.9.2.0"
+VERSION="2.10.0.3"
 HOMEPAGE="https://skarnet.org/software/s6/"
-DOWNLOAD="https://skarnet.org/software/s6/s6-2.9.2.0.tar.gz"
-MD5SUM="cb6e5b4db41e1a1c5b69c5efb3fbc44d"
+DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.3.tar.gz"
+MD5SUM="c3956a7c46522e4eea3bf89634d29f88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="execline"
+REQUIRES="skalibs execline"
 MAINTAINER="Muhammad Mahendra Subrata"
 EMAIL="mumahendras3@gmail.com"
diff --git a/system/scdoc/README b/system/scdoc/README
new file mode 100644
index 0000000000..3c4b288e25
--- /dev/null
+++ b/system/scdoc/README
@@ -0,0 +1,3 @@
+scdoc is a simple man page generator for POSIX systems written in C99.
+
+It requires the input files to be UTF-8 encoded.
diff --git a/system/scdoc/fix-makefile.patch.gz b/system/scdoc/fix-makefile.patch.gz
new file mode 100644
index 0000000000..a9918c14cc
--- /dev/null
+++ b/system/scdoc/fix-makefile.patch.gz
diff --git a/multimedia/vokoscreen/vokoscreen.SlackBuild b/system/scdoc/scdoc.SlackBuild
index 66a31fd981..fb7418e537 100644
--- a/multimedia/vokoscreen/vokoscreen.SlackBuild
+++ b/system/scdoc/scdoc.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for <appname>
+# Slackware build script for scdoc
 
-# Harald Achitz | Stockholm/Sweden | harald.achitz@gmail.com
+# Copyright 2021 Manuel Argüelles Panama City, Panama
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-PRGNAM=vokoscreen
-VERSION=${VERSION:-2.5.0}
+PRGNAM=scdoc
+VERSION=${VERSION:-1.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,11 +69,13 @@ 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 {} \;
 
-qmake-qt5 VOKOSCREEN_INSTALL_PREFIX=/usr QMAKE_CXXFLAGS="$SLKCFLAGS"
-make
-make install INSTALL_ROOT=$PKG
+zcat $CWD/fix-makefile.patch.gz | patch -p1
 
-mv $PKG/usr/share/man $PKG/usr/man
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+PREFIX=/usr \
+make
+make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
 
 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
@@ -84,13 +85,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING CREDITS \
+  COPYING \
+  README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/system/scdoc/scdoc.info b/system/scdoc/scdoc.info
new file mode 100644
index 0000000000..fd8e496116
--- /dev/null
+++ b/system/scdoc/scdoc.info
@@ -0,0 +1,10 @@
+PRGNAM="scdoc"
+VERSION="1.11.1"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+DOWNLOAD="https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz"
+MD5SUM="ce8369cb5d2406786f61cf805ceae66f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Manuel Argüelles"
+EMAIL="manuel.arguelles@gmail.com"
diff --git a/system/scdoc/slack-desc b/system/scdoc/slack-desc
new file mode 100644
index 0000000000..1f56aa5e39
--- /dev/null
+++ b/system/scdoc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+scdoc: scdoc (small man page generator)
+scdoc:
+scdoc: Simple man page generator for POSIX systems written in C99.
+scdoc:
+scdoc:
+scdoc:
+scdoc:
+scdoc:
+scdoc:
+scdoc:
+scdoc:
diff --git a/system/skim/skim.SlackBuild b/system/skim/skim.SlackBuild
index c3146f4624..874b531085 100644
--- a/system/skim/skim.SlackBuild
+++ b/system/skim/skim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for skim
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=skim
 BINNAM=sk
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/skim/skim.info b/system/skim/skim.info
index 0fd388831f..a971c13ed0 100644
--- a/system/skim/skim.info
+++ b/system/skim/skim.info
@@ -1,192 +1,238 @@
 PRGNAM="skim"
-VERSION="0.8.1"
+VERSION="0.9.4"
 HOMEPAGE="https://github.com/lotabout/skim"
-DOWNLOAD="https://github.com/lotabout/skim/archive/v0.8.1/skim-0.8.1.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.3.crate \
+DOWNLOAD="https://github.com/lotabout/skim/archive/v0.9.4/skim-0.9.4.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.31.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.32.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/base-x/base-x-0.2.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/beef/beef-0.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/bumpalo/bumpalo-3.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/const_fn/const_fn-0.4.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam/crossbeam-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling/darling-0.10.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_core/darling_core-0.10.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_macro/darling_macro-0.10.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam/crossbeam-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.9.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.3.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling/darling-0.10.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_core/darling_core-0.10.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_macro/darling_macro-0.10.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/defer-drop/defer-drop-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder/derive_builder-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder_core/derive_builder_core-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuzzy-matcher/fuzzy-matcher-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/discard/discard-1.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuzzy-matcher/fuzzy-matcher-0.3.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-2.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ident_case/ident_case-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.58.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.39.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.51.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.81.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.6.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.19.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.44.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.5.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.9.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.8.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.118.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.118.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.60.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha1/sha1-0.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/spin/spin-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.9.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/skim/skim-0.9.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/standback/standback-0.2.13.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb/stdweb-0.4.20.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb-derive/stdweb-derive-0.5.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb-internal-macros/stdweb-internal-macros-0.2.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb-internal-runtime/stdweb-internal-runtime-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.10.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.54.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/term/term-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.2.23.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time-macros/time-macros-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/time-macros-impl/time-macros-impl-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/timer/timer-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tuikit/tuikit-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tuikit/tuikit-0.4.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.2.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.9.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen/wasm-bindgen-0.2.69.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.69.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.69.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.69.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.69.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-1.0.1.crate"
-MD5SUM="a8bb9d8763511342c113fa369988bde3 \
-        cb23a78f4c35abcb2d8d1394645674fe \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate"
+MD5SUM="3e7211f090f11b340f4bafed14c22cd6 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         6ff474dd60c839a9c788844b7a42c72c \
-        46a048c0b8b765bcbdc131e166410510 \
-        38a5278571eefda86428a8ebfc1cedc2 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        898079c1c795b5aa847169137918c7bc \
-        bbaf2cabce203fecd54c0c294eb7fb2b \
-        e5767560aad375059c975285c07022c0 \
-        085f6f44e54f62691bf3cf3365f5544a \
-        285a97bd000d85a77550c8bfb5f77022 \
-        0cd2bb93a82da2e4ca526b40ae8b341e \
-        ed2b1c5fd000f926c2aedb0c3bd1d199 \
-        cff9adf6952db7c0442bd9639440bb90 \
+        c83252f91435a921e7e4434956010344 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        c6443ec8d007c729ba5482008d0c864d \
+        50b80bd6ac81e09a40eb3e865b0920e2 \
+        80a2c27647a6acb1890a3a7de8fded72 \
+        d362615e7ec599233fa4e9da5393bbcf \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        8dcd8db8f0e4971b7c9b13c273ab8b10 \
+        7f74a18288dd952887eb53f90404ea23 \
+        b3ebb5d4433417e998d982d46334a6f4 \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        e1081b868a908a7094894b7409e99c27 \
         ec9751a4c0d35e7313e52ddb7147376b \
-        22ed3b5d9a15917e74e09d7f600b1608 \
-        17208d6f2ad0d920716b2e7ef5e3c75d \
-        b257e50658bf3a23d905c5ff778fa5fe \
-        7143e7a2ff358eb52c5f7c3b0656685a \
-        d6e5f8acee1145e6d15934f8d1f61e3c \
-        70a93b2ff4eb6c23d7119e7f3d241b97 \
-        838338f3d7b79bce56475183ccf76072 \
-        60ab65d5a410da93a69fb4c668c8b229 \
-        bad68d30eb69cbff26eb1eb6adef6994 \
-        a42201f337a8d7cd51aae9e5ecad91f0 \
-        b1c8b47b8fc9077b6a6aadc47c819115 \
-        5663ea952316dfff411bc1ef78c1979d \
+        04382bb2ecb2336f49f3e437f9deeeca \
+        093c5099d3cef0f418550fe28788d34d \
+        8248cc4466ea3a77b9c2666ed4fc7963 \
+        e38f9483da311ab0e0811a12201dfa1a \
+        9ae7be25dee514b764ee2f73c2a90791 \
+        f6454b63029b247e2e8b7feac1695009 \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        9e1f73325eeb9647ee68eeaa4bff975c \
+        fd22741b59a28330936c5da4f933596d \
+        6dd72935005d24990488f13c94c13e23 \
+        0fdb86d5f53dd375a39576e90c621b6b \
+        1d0a8951a71eff8e28acc555152902ac \
         a9045fa57c1e4ed702e51da973b658cb \
         2ff8927b9cc3e6bcec18745859808751 \
         8b418106a3968619300a2af8f6b4f200 \
-        1946cef415cbf82cdcb975d813dd9696 \
-        9e26419cbf5f540522427b3a2a6685af \
-        a52ad1aa4f05f96817c8c8e66deebf29 \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
-        1a7c6749707015fe14d8e068d7edfaa3 \
-        557ae69b35db96e1eecd55f0eb7d882d \
-        4583a67acf00a437e5cd27857210a526 \
+        8b70009baf55df3c0eea3582883f148b \
+        20006dab4b1bd43c86688877ecd58e8f \
+        b4e2b229c362ad0dd313ff631816d5db \
+        e70f67200b1a8bbf0bfe7061510f20c2 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        39767ee14933b0006f02f295314668af \
+        704babd757a22f163230a36fa5474890 \
+        553b325a602b701eb7eaef228e69d0f2 \
+        3f94dd669aafea2fcd7c8c63236029c4 \
         fe77a3f609b6fd8d5b08f3b2ef14d2ad \
-        1c9fee8f180b6f3402849983a45bbd6d \
-        0c5dc0c601d5590f3ec6da338abc7892 \
-        cc65f96341390c0f60f5216e829486e7 \
-        514a89ff59a9bf0671d7db4812725459 \
-        43452a6296aea71bef32661bee169d21 \
-        72471699c92a9ef34d491f1375fc0fa7 \
-        8f4687dfb2b25c44d9be6ac7b6a69977 \
-        8a39d8bd95f15af0840d2049f0e78a37 \
-        4092ed5c67c6ff1c6a7bcf463bc40a53 \
-        cbdebc326641fcab42bc92a113548740 \
-        9fc51e79791f918b643e3802a2e0e88f \
-        abc56a3d9aec66b68805f01795de7de8 \
-        4563373184ff931ec276dc1a659d52d2 \
-        ad271964ee0641ce512d5ca5ac4f5b41 \
-        312adefbeab31084c8e418f5820a686d \
-        690ef3b9334a15b51bca81a889c5d9fb \
-        3056ab938614a0a76bd60dff8bb3b519 \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        31d088af3982b271b2afdda37e963518 \
-        9d1baf9d7576dd51ecd02dcc76810678 \
-        4ee4b798e15d09f65c6e66c7d3c503fd \
-        c9a135ad3406eeeffb425d585d4567d7 \
+        396bc88987f4bc192f975d94cdf326c7 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        21a815dce24180ddceb02d732eb431ec \
+        f50d2e280b4a3491fffda43b90982544 \
+        b5cf10e268e8a3bee2de8a734104245e \
+        fa3630e5867493e09296155763e4f4a0 \
+        a7a8c0f9d8d00f65fabad79005560dfa \
+        0cddb62b3dcfb814b4e0b9441c5c1a18 \
+        4ade3dff4f5f96ff3aa1c04fd28ac11d \
+        a8ec1126ef06244ac1e3773981a005f1 \
+        c0e036fd990d0c9cae11b5876a5cb572 \
+        c36d452e37c73b1e99f40bae18cddfdb \
+        d227ca24b102ae4ab2a4f3bc3bd44bf3 \
+        c7c38eb603bed6f42edbc4294806a44a \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        63b29211eef9ccee0b0401d423db0efd \
+        e4e9750df83fa662872061952e155d9a \
+        21235a4cec107822e39c144242a95bf1 \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        870008bba2e68db4988c31e511fbd9c4 \
+        40d1ab8fd9b6e5e376b0839a9132abe1 \
+        13373372c7ce2e894925d846625a7987 \
+        29e548496d699fbd888e4a65ec2d1488 \
         4d101ab24d14c54937c5f45ece8fad5f \
-        500e5bb7d9b5a8882e2e961012391a58 \
-        dad6b55e158861f8c4e199d498efe162 \
+        a69721c73263cd2040e1a5f120b03a6f \
+        b4a0a98a54439a5a37952c8879187ee3 \
         64111c20b69aa1532fb66b70c4660b55 \
         8b4d8c7b6e3a060d365bc1ad650929fa \
+        0a3d0ff7244041ee2b77883faf44fa80 \
+        448ce60d31dd153eea161fe376cf80d0 \
+        8ca07aa626d9d47730bfee5685057309 \
+        5d57f977a55f0b99139cc46ac4cee784 \
         e4e7efe2ab7921499d5c247a349e9e1f \
-        422ea23fbfe5bff61f519d960647ebf8 \
-        fbb6473579065c9fe4dc3d48c5d5d8a5 \
-        90253ab52670a0551a533eb78a1f6b10 \
-        f087d59daefeeb22d1a1f64f9be3775b \
+        c201a2cd25aec8a2ca35b3d6ac8a0ca0 \
+        765021b931e839c0f4789b62a211cc38 \
+        82d13642cb366d10feed4e06220eea64 \
+        f74dd8f5f9f972335eff63649cfcd5ba \
+        0d449ec619ac8336ef533d6b7df91c14 \
+        bcc5d4659d3210ea73d37c9f02adbbd3 \
+        781d4ccf5d04c98fa02af207a9639249 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        2102f53f0ab0767dd835190f11aad054 \
         03a495cfd0e710b3528a8792883e2572 \
-        6b70927d96d7e02a00964cbd0732dec3 \
-        de04800c89d374b8a843f91d26fa05ad \
-        63268e3f02616082705227f0a58fed87 \
-        baaa166f66e90e94b76b7418afd5df90 \
-        7596227bb4deb6935f58f26f6a55aa52 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
+        ebdff467249aa3dca005a441dc824236 \
+        a8de006fe0c7e373c560dd51599287a8 \
+        a5dd75e77c7324f5c1d2d372c990d0a7 \
+        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        af3c7593729923b6559c5fe02377788c \
+        c7d88c3e5879e6ff1c468568c049d9c7 \
+        30b97559c13b9352aa881be16251def4 \
         a2eb00593ac747dfeced9d0376bd3728 \
-        0d190f0a79184dd97418d82060cbaee4 \
-        d34a9f507f3ecf7d93c07deb74f1cd7c \
-        d7c493ca4f84a7d50b53646421a37487 \
-        e628ca8adb2b572bffb210f014656b6f \
-        9c27232c12abb96c68e10e21f2012639 \
-        3b656a3aebdf60145eb01a1300cd85ca \
-        0eedbc32447f40b3045d6de3910b5415 \
+        a2cc84e2e831bda7908261812a982e01 \
+        4272c279b06b88f8b0ffce7109348e27 \
+        a51c43692084979295641a7ffba4b297 \
+        9d83f7627e511837fb2d94fbad338d35 \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        8b01b016a9b6deebc1b43f296057efb5 \
         689203efc084fc0f1d1f74f5d354ae75 \
-        9f49c12903d0319936054bf1c128f112 \
-        40909511b3d0e2dba891f438715808d0 \
+        d167b9d56ec24513738d4779703b3ebf \
+        a29fec77b1e07caf7b682b881b676c06 \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
+        a312b55a428f827a91097d1d8497b02b \
+        6bf1f415139a3e7ce1e21511ac667911 \
+        2e2de28b44543b57cbb053676a312be2 \
+        2aa28a36d14358020490e8794d23eb70 \
+        8918afebbbed63e050fe091800945aaa \
+        e29146f0c630bc9a4dc02df90ab18dc6 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
         db96b50050277bf05a3c68534bbb9586 \
-        4724370f3179d1ab61f3fd8fa60a2368 \
-        09de9d01e7331ff3da11f58be8bef0df \
-        2f9f840bd479751f715a8f530976b6bf"
+        b9e37d5fc4ad28b612b78ad37816684d \
+        09de9d01e7331ff3da11f58be8bef0df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/slackroll/slackroll.SlackBuild b/system/slackroll/slackroll.SlackBuild
index 4088c4a1d6..b67bb23661 100644
--- a/system/slackroll/slackroll.SlackBuild
+++ b/system/slackroll/slackroll.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slackroll
 
-# Copyright 2011-2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2011-2018,2020-2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slackroll
-VERSION=${VERSION:-v48}
-SRCVER=${VERSION#v}
+GITREV="${GITREV:-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac}"
+VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')}
+SRCVER=${SRCVER:-v48}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$GITREV
+tar xvf $CWD/$PRGNAM-$GITREV.tar.gz
+cd $PRGNAM-$GITREV
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -67,6 +68,8 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mv $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$SRCVER
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/slackroll/slackroll.info b/system/slackroll/slackroll.info
index 6cad4e8adb..aa3edaa433 100644
--- a/system/slackroll/slackroll.info
+++ b/system/slackroll/slackroll.info
@@ -1,8 +1,8 @@
 PRGNAM="slackroll"
-VERSION="v48"
+VERSION="git0c6ab0b"
 HOMEPAGE="http://rg3.github.io/slackroll/"
-DOWNLOAD="https://github.com/rg3/slackroll/archive/v48/slackroll-48.tar.gz"
-MD5SUM="145652bb1b1170dfd7b2ca661bfd3301"
+DOWNLOAD="https://github.com/rg3/slackroll/archive/0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac/slackroll-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac.tar.gz"
+MD5SUM="4474bcb2e48cf55947c9b30022381a9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sleuthkit/sleuthkit.SlackBuild b/system/sleuthkit/sleuthkit.SlackBuild
index 61d9a1042d..470f81084a 100644
--- a/system/sleuthkit/sleuthkit.SlackBuild
+++ b/system/sleuthkit/sleuthkit.SlackBuild
@@ -26,11 +26,11 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated v4.10.0 October 2020.  Barry J. Grundy
+# Updated v4.10.1 December 2020.  Barry J. Grundy
 # <bgrundy(at)linuxleo.com>
 
 PRGNAM=sleuthkit
-VERSION=${VERSION:-4.10.0}
+VERSION=${VERSION:-4.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/sleuthkit/sleuthkit.info b/system/sleuthkit/sleuthkit.info
index 25039f8dbe..5654baee56 100644
--- a/system/sleuthkit/sleuthkit.info
+++ b/system/sleuthkit/sleuthkit.info
@@ -1,8 +1,8 @@
 PRGNAM="sleuthkit"
-VERSION="4.10.0"
+VERSION="4.10.1"
 HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.10.0/sleuthkit-4.10.0.tar.gz"
-MD5SUM="f89ab5442694dfc346301e0b87a16ff3"
+DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.10.1/sleuthkit-4.10.1.tar.gz"
+MD5SUM="c37bb35897a471c52ec18e0cbb807e9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild
index eddf22b86c..317c863c13 100644
--- a/system/slpkg/slpkg.SlackBuild
+++ b/system/slpkg/slpkg.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slpkg
 
-# Copyright 2014-2020  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slpkg
-VERSION=${VERSION:-3.9.0}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info
index e863361c31..66c1162c9f 100644
--- a/system/slpkg/slpkg.info
+++ b/system/slpkg/slpkg.info
@@ -1,8 +1,8 @@
 PRGNAM="slpkg"
-VERSION="3.9.0"
+VERSION="3.9.1"
 HOMEPAGE="https://dslackw.gitlab.io/slpkg"
-DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.9.0/slpkg-3.9.0.tar.gz"
-MD5SUM="c23fcaeee005bdd7858f8269d7532f1f"
+DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.9.1/slpkg-3.9.1.tar.gz"
+MD5SUM="19d4b05df424482d8532892fc6271666"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 python-urllib3"
diff --git a/system/softhsm/doinst.sh b/system/softhsm/doinst.sh
new file mode 100644
index 0000000000..a3383ce28e
--- /dev/null
+++ b/system/softhsm/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/softhsm2.conf.new
diff --git a/system/softhsm/softhsm.SlackBuild b/system/softhsm/softhsm.SlackBuild
index a853328cf7..245fb58135 100644
--- a/system/softhsm/softhsm.SlackBuild
+++ b/system/softhsm/softhsm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for softhsm
 
-# Copyright 2016-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2016-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=softhsm
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,12 +91,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
+mv $PKG/etc/softhsm2.conf $PKG/etc/softhsm2.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.md NEWS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/system/softhsm/softhsm.info b/system/softhsm/softhsm.info
index 4f6f6b88f2..8cb44f0374 100644
--- a/system/softhsm/softhsm.info
+++ b/system/softhsm/softhsm.info
@@ -1,8 +1,8 @@
 PRGNAM="softhsm"
-VERSION="2.5.0"
+VERSION="2.6.1"
 HOMEPAGE="https://www.opendnssec.org"
-DOWNLOAD="https://dist.opendnssec.org/source/softhsm-2.5.0.tar.gz"
-MD5SUM="fb0e490aa5d83de1b3936288c22c2475"
+DOWNLOAD="https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz"
+MD5SUM="040b93ca327cbe0a3a8661e7c371ab16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sqlcipher/sqlcipher.SlackBuild b/system/sqlcipher/sqlcipher.SlackBuild
index e997211ef6..5ae180c8cb 100644
--- a/system/sqlcipher/sqlcipher.SlackBuild
+++ b/system/sqlcipher/sqlcipher.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sqlcipher
 
-# Copyright 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlcipher
-VERSION=${VERSION:-3.4.1}
+VERSION=${VERSION:-4.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,8 +56,7 @@ fi
 
 # Do not build TCL extension by default
 case ${WITH_TCL:-no} in
-  y|yes|Y|YES) : ;;
-            *) WITH_TCL="--disable-tcl" ;;
+  n*|N*) CONF_TCL="--disable-tcl" ;;
 esac
 
 set -e
@@ -87,7 +86,7 @@ LDFLAGS="-lcrypto" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-tempstore=yes \
   --disable-static \
-  $WITH_TCL \
+  $CONF_TCL \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/system/sqlcipher/sqlcipher.info b/system/sqlcipher/sqlcipher.info
index 3c87c1007c..04cde44605 100644
--- a/system/sqlcipher/sqlcipher.info
+++ b/system/sqlcipher/sqlcipher.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlcipher"
-VERSION="3.4.1"
+VERSION="4.4.2"
 HOMEPAGE="http://sqlcipher.net"
-DOWNLOAD="https://github.com/sqlcipher/sqlcipher/archive/v3.4.1/sqlcipher-3.4.1.tar.gz"
-MD5SUM="edd1c57129c21a22ab2c2fd7f47d4ccd"
+DOWNLOAD="https://github.com/sqlcipher/sqlcipher/archive/v4.4.2/sqlcipher-4.4.2.tar.gz"
+MD5SUM="c306b8f5de6bde3d7ae40bdb2ab5535c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/st/st.SlackBuild b/system/st/st.SlackBuild
index 2b519272ae..38aecd74ee 100644
--- a/system/st/st.SlackBuild
+++ b/system/st/st.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for st
 
-# Copyright 2011-2019, Nikolay Korotkiy <sikmir@gmail.com>
+# Copyright 2011-2020, Nikolay Korotkiy <sikmir@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=st
-VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/system/st/st.info b/system/st/st.info
index bbb39cfbaa..471bfcaa6a 100644
--- a/system/st/st.info
+++ b/system/st/st.info
@@ -1,8 +1,8 @@
 PRGNAM="st"
-VERSION="0.8.2"
+VERSION="0.8.4"
 HOMEPAGE="https://st.suckless.org"
-DOWNLOAD="https://dl.suckless.org/st/st-0.8.2.tar.gz"
-MD5SUM="a3d97ee92215071e6399691edc0f04b0"
+DOWNLOAD="https://dl.suckless.org/st/st-0.8.4.tar.gz"
+MD5SUM="e00b074c0e5d55513745c99f027b7a34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/stegseek/README b/system/stegseek/README
new file mode 100644
index 0000000000..e83ddcf068
--- /dev/null
+++ b/system/stegseek/README
@@ -0,0 +1 @@
+stegseek is a fast steghide cracker
diff --git a/system/stegseek/slack-desc b/system/stegseek/slack-desc
new file mode 100644
index 0000000000..0d7e28d046
--- /dev/null
+++ b/system/stegseek/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+stegseek: stegseek (fast steghide cracker)
+stegseek:
+stegseek: a fast steghide cracker
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
diff --git a/system/stegseek/stegseek.SlackBuild b/system/stegseek/stegseek.SlackBuild
new file mode 100644
index 0000000000..f0dc0bcf28
--- /dev/null
+++ b/system/stegseek/stegseek.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for stegseek
+
+# Copyright 2021 toolonely <lonely_@tutanota.com>
+# 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=stegseek
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_STANDARD:STRING=11 \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/stegseek/stegseek.info b/system/stegseek/stegseek.info
new file mode 100644
index 0000000000..5b3c57ea31
--- /dev/null
+++ b/system/stegseek/stegseek.info
@@ -0,0 +1,10 @@
+PRGNAM="stegseek"
+VERSION="0.5"
+HOMEPAGE="https://github.com/RickdeJager/stegseek"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/RickdeJager/stegseek/archive/v0.5/stegseek-0.5.tar.gz"
+MD5SUM_x86_64="d8f0ed0cabea7ab95262de9d65f017ce"
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/system/system76-power/system76-power.SlackBuild b/system/system76-power/system76-power.SlackBuild
index 4eafea3ea1..a149369ba6 100644
--- a/system/system76-power/system76-power.SlackBuild
+++ b/system/system76-power/system76-power.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for system76-power
 
-# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA
+# Copyright 2019-2021 Erich Ritz, Scottsdale, Arizona, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=system76-power
-VERSION=${VERSION:-1.1.11}
+VERSION=${VERSION:-1.1.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,58 +98,74 @@ mkdir vendor
   for dependency in \
       ansi_term=0.11.0 \
       atty=0.2.14 \
-      autocfg=1.0.1 \
       bitflags=1.2.1 \
       bytes=0.5.6 \
-      cc=1.0.59 \
+      cc=1.0.67 \
       cfg-if=0.1.10 \
-      chrono=0.4.15 \
+      cfg-if=1.0.0 \
       clap=2.33.3 \
-      dbus=0.8.4 \
+      dbus=0.9.2 \
+      dbus-crossroads=0.3.0 \
+      dbus-tokio=0.6.0 \
       err-derive=0.2.4 \
       fern=0.6.0 \
       fuchsia-zircon=0.3.3 \
       fuchsia-zircon-sys=0.3.3 \
-      futures-core=0.3.5 \
-      hermit-abi=0.1.15 \
-      hidapi=1.2.3 \
+      futures-channel=0.3.12 \
+      futures-core=0.3.12 \
+      futures-io=0.3.12 \
+      futures-macro=0.3.12 \
+      futures-task=0.3.12 \
+      futures-util=0.3.12 \
+      hermit-abi=0.1.18 \
+      hidapi=1.2.5 \
       inotify=0.8.3 \
-      inotify-sys=0.1.3 \
+      inotify-sys=0.1.5 \
       intel-pstate=0.2.1 \
       iovec=0.1.4 \
+      itoa=0.4.7 \
       kernel32-sys=0.2.2 \
       lazy_static=1.4.0 \
-      libc=0.2.76 \
+      libc=0.2.86 \
       libdbus-sys=0.2.1 \
-      log=0.4.11 \
-      mio=0.6.22 \
-      miow=0.2.1 \
-      net2=0.2.34 \
-      num-integer=0.1.43 \
-      num-traits=0.2.12 \
+      log=0.4.14 \
+      memchr=2.3.4 \
+      mio=0.6.23 \
+      mio-uds=0.6.8 \
+      miow=0.2.2 \
+      net2=0.2.37 \
+      num_cpus=1.13.0 \
       numtoa=0.2.3 \
-      pin-project-lite=0.1.7 \
-      pkg-config=0.3.18 \
+      once_cell=1.6.0 \
+      pin-project-lite=0.1.11 \
+      pin-project-lite=0.2.4 \
+      pin-utils=0.1.0 \
+      pkg-config=0.3.19 \
       proc-macro-error=1.0.4 \
       proc-macro-error-attr=1.0.4 \
-      proc-macro2=1.0.19 \
-      quote=1.0.7 \
-      rustversion=1.0.3 \
+      proc-macro-hack=0.5.19 \
+      proc-macro-nested=0.1.7 \
+      proc-macro2=1.0.24 \
+      quote=1.0.9 \
+      rustversion=1.0.4 \
+      ryu=1.0.5 \
+      serde=1.0.123 \
+      serde_derive=1.0.123 \
+      serde_json=1.0.62 \
+      signal-hook-registry=1.3.0 \
       slab=0.4.2 \
       smart-default=0.6.0 \
       strsim=0.8.0 \
-      syn=1.0.39 \
+      syn=1.0.60 \
       synstructure=0.12.4 \
       sysfs-class=0.1.3 \
       textwrap=0.11.0 \
-      time=0.1.44 \
-      tokio=0.2.22 \
+      tokio=0.2.25 \
+      tokio-macros=0.2.6 \
       unicode-width=0.1.8 \
       unicode-xid=0.2.1 \
       vec_map=0.8.2 \
-      vergen=3.1.0 \
       version_check=0.9.2 \
-      wasi=0.10.0+wasi-snapshot-preview1 \
       winapi=0.2.8 \
       winapi=0.3.9 \
       winapi-build=0.1.1 \
diff --git a/system/system76-power/system76-power.info b/system/system76-power/system76-power.info
index 4d8860281d..940ac9a283 100644
--- a/system/system76-power/system76-power.info
+++ b/system/system76-power/system76-power.info
@@ -1,122 +1,154 @@
 PRGNAM="system76-power"
-VERSION="1.1.11"
+VERSION="1.1.16"
 HOMEPAGE="https://github.com/pop-os/system76-power"
-DOWNLOAD="https://github.com/pop-os/system76-power/archive/1.1.11/system76-power-1.1.11.tar.gz \
+DOWNLOAD="https://github.com/pop-os/system76-power/archive/1.1.16/system76-power-1.1.16.tar.gz \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.59.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.67.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus/dbus-0.8.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus/dbus-0.9.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus-crossroads/dbus-crossroads-0.3.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus-tokio/dbus-tokio-0.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/err-derive/err-derive-0.2.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fern/fern-0.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-core/futures-core-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hidapi/hidapi-1.2.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-channel/futures-channel-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-core/futures-core-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-io/futures-io-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-macro/futures-macro-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-task/futures-task-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-util/futures-util-0.3.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hidapi/hidapi-1.2.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.8.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.5.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/intel-pstate/intel-pstate-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.7.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.76.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.86.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/libdbus-sys/libdbus-sys-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.34.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.14.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.23.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-uds/mio-uds-0.6.8.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.37.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/numtoa/numtoa-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.18.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.6.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.1.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.2.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustversion/rustversion-1.0.3.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-nested/proc-macro-nested-0.1.7.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.9.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustversion/rustversion-1.0.4.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.123.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.123.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.62.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook-registry/signal-hook-registry-1.3.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/smart-default/smart-default-0.6.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.39.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.60.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.4.crate \
           https://github.com/pop-os/sysfs-class/archive/0.1.3/sysfs-class-0.1.3.tar.gz \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.2.22.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.2.25.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-macros/tokio-macros-0.2.6.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vergen/vergen-3.1.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate"
-MD5SUM="6124c0467008e4e3c9cd1466fca70479 \
+MD5SUM="dcb250b54de23e7d1c26529653668384 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         142cb4b9a653e56e56311f0c883b8582 \
-        c6443ec8d007c729ba5482008d0c864d \
         6799c26a7eacaf8e58d3e45c6c5add89 \
         d123f33f646e37ca5b825ea6eb2dd150 \
-        1e6c2fa88c44a0822243fee42526719b \
+        8637708206e07c0b9e726c7b2f4412d6 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        a47dd336c3099e7986f926b48c64ec6a \
+        74634128440dbc3766bda76fdf0aaa05 \
         bc79e0eb364df515a33755ac9a581cfd \
-        ff4619d1e15ab5c4ca25d549589f1046 \
+        d2857f71826c749b5f086d57039a5e5e \
+        d228b7c6e0d220d40c064e3feaaceb7f \
+        409eecafa64d119eca370486e49dd522 \
         9d53a61cdf8af705fd38cc26481b610d \
         9bb99bc31c32da009e64621f4c635748 \
         dd7c80c2d04d2e9ceba82826cf69764d \
         54cfab480b7a5f7302eadf44129d3f4b \
-        4554d3a0b77373fba853c413f30d6f59 \
-        9e4eacf58977b54f76be2b80d7d3b776 \
-        c5287d42ccd4b81389cc8c08939b0218 \
+        26e7ab2c497aa1c096c0bcdd0ca609d0 \
+        5089653abbfb3f23c1c805eec737ab0d \
+        fe677f0fd8f467037f4fd5b1331c82a6 \
+        c7948dfaf0320378998df01203bb894c \
+        b98894ea67edeb6618196552c484b79d \
+        6d799b8e9321f6882053f1ceb0e3e817 \
+        2c4bc5c16b345ce4d4bbf977577fab35 \
+        551b1e3feb17b3e30fab6e9c92f129b7 \
         e7696ea7bac5b2d62b5306498960430b \
-        50929c2de8a472031f43c9fc371f2111 \
+        639af0cca65c012e6a028acfb657e417 \
         1c4f7ad251632c854fa67dc1f1f314e3 \
         f1c40b9836035b69e464df711a1d2950 \
+        4379362bf1be77d47a45c7223a01eead \
         9d033cc2daa6924420a4a89e6705773f \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        1e624bdaaecfb8c58f030d6adf405c04 \
+        04f84e88732a1057a37b5d01c23eac1d \
         78e11acb853ee9a9c1b905e209b33d4a \
-        f50d2e280b4a3491fffda43b90982544 \
-        e820082de1cf13e1111d2acbae898fcc \
-        a82e0b9efe7f6385071c9fd9b3bccfa3 \
-        683a998da434a7ff8558bdf6eaa7b8c7 \
-        759816fe5b617674ae5dee83e3c3e6e2 \
-        2daa59d0efd38e9b5fbb2658b080eaa1 \
+        40e508baeee8cdccbc471489b0f449ff \
+        fa3630e5867493e09296155763e4f4a0 \
+        257e573f323c639630b31f147671b627 \
+        10e28d0be14899dcbad91142a228fb35 \
+        1fbbe598255c0addb31bdfbe3e76420d \
+        ff6c054468eab826f0dab7cc9a3fe557 \
+        c36d452e37c73b1e99f40bae18cddfdb \
         28a4e2e962d9723f131cdd5acb140b6d \
-        62e9fc18f293722fdded066f34714585 \
-        0c860c0d0fa0dde03bd6be862fb1b6b4 \
+        67168b70886fe5bd86af5619a3f35ce4 \
+        8771ed9f596c68a307bef4b2ac20acde \
+        cec81553116d1234d8a2a618593848ad \
+        07c75fec267864bcbb800ca7709ceae2 \
+        448bc61aee07661464d98da7660e9a1d \
         6a32bab57772c3a1146d599b65ffb0cb \
         7d76a523677de261dda1b65d29a93c4e \
-        2e821a99ce8067bee8c1007c07a5d1e8 \
-        63b29211eef9ccee0b0401d423db0efd \
-        322ae19fb8b0ec961b1168bab243c08a \
+        c7c38eb603bed6f42edbc4294806a44a \
+        e6fd8764e2acb835d7d2f04d052e30ce \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        3233400d1bc56e7c78d4d7564d8e5b74 \
+        6261b6f5fb803ee74f3916c6550ea9b3 \
+        a69721c73263cd2040e1a5f120b03a6f \
+        e16bb0d9c46839fbf5d1a69673b00c4c \
+        6ec70075835fed0250bc4407f32d5928 \
+        f024ce4a4f4ff7326d9bbe3039017081 \
+        b006529e0475297e0e2346e2a4558931 \
         c7bfa89e6da163f1474bb3787987bb12 \
         26b4ac1432c227434bc943817f42872e \
         781d4ccf5d04c98fa02af207a9639249 \
-        acc287a32cea7e35d5d35207a1c9e14a \
+        c72a927acc4cc7695ae9c73c19964a6f \
         09f09b3f56045183393726a31d8a0192 \
         80ca0de72168dc03e90bc3c519153305 \
         a8de006fe0c7e373c560dd51599287a8 \
-        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
-        4d130fad86abe7c08cddf9275e031bd6 \
+        1c63947b82fb656602a15cff8cc7c360 \
+        2c8f1fe04919c09e705eccb13a2aa583 \
         4272c279b06b88f8b0ffce7109348e27 \
         a51c43692084979295641a7ffba4b297 \
         333b4ba3f64c35b6f89b521e8d64548b \
-        63630c8b8aeb092854a6e47f5d6468e1 \
         8b01b016a9b6deebc1b43f296057efb5 \
-        a312b55a428f827a91097d1d8497b02b \
         b44489eb4799c4fabac3fceb48de54f7 \
         0498c4a11448bfc35dc7bb2caa64c753 \
         c900e7dbce808ff8ced375077b17a163 \
diff --git a/system/t1utils/t1utils.SlackBuild b/system/t1utils/t1utils.SlackBuild
index ab9ef7ba50..5b0176ceb1 100644
--- a/system/t1utils/t1utils.SlackBuild
+++ b/system/t1utils/t1utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for t1utils
 
-# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=t1utils
-VERSION=${VERSION:-1.41}
+VERSION=${VERSION:-1.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,7 @@ chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
 # -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8
+# (Was fixed in 1.42, but keep this workaround to prefer the system memmem.)
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/system/t1utils/t1utils.info b/system/t1utils/t1utils.info
index 99d640b848..d1d725aa09 100644
--- a/system/t1utils/t1utils.info
+++ b/system/t1utils/t1utils.info
@@ -1,8 +1,8 @@
 PRGNAM="t1utils"
-VERSION="1.41"
+VERSION="1.42"
 HOMEPAGE="https://www.lcdf.org/type/#t1utils"
-DOWNLOAD="https://www.lcdf.org/type/t1utils-1.41.tar.gz"
-MD5SUM="5430f82fcc27ccfc44526a59fa64849a"
+DOWNLOAD="https://www.lcdf.org/type/t1utils-1.42.tar.gz"
+MD5SUM="acc4bc832bafbdc059fb3b0cad8c3ab0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild
index 076b061b1a..6fecbd774f 100644
--- a/system/telegraf/telegraf.SlackBuild
+++ b/system/telegraf/telegraf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Telegraf
 
-# Copyright 2017-2020 Ebben Aries <e@dscp.org>
+# Copyright 2017-2021 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=telegraf
-VERSION=${VERSION:-1.14.4}
+VERSION=${VERSION:-1.18.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-${VERSION}_linux_${PKG_ARCH}.tar.gz
-cd $PRGNAM
+cd $PRGNAM-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/telegraf/telegraf.info b/system/telegraf/telegraf.info
index 70b8d207b0..92f01bc041 100644
--- a/system/telegraf/telegraf.info
+++ b/system/telegraf/telegraf.info
@@ -1,10 +1,10 @@
 PRGNAM="telegraf"
-VERSION="1.14.4"
+VERSION="1.18.1"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.14.4_linux_i386.tar.gz"
-MD5SUM="4010e7ffa9a1ed738a2e46614b20c4d6"
-DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.14.4_linux_amd64.tar.gz"
-MD5SUM_x86_64="2c9cb0cbf3527ef8e6ee2ba5447bbd46"
+DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.1_linux_i386.tar.gz"
+MD5SUM="5c5fa71a4c28be188604727ee06e7704"
+DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.1_linux_amd64.tar.gz"
+MD5SUM_x86_64="a7bb19afa8fcbf3144129f5fb45d559f"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/ticpp/README b/system/ticpp/README
new file mode 100644
index 0000000000..4d25e1098c
--- /dev/null
+++ b/system/ticpp/README
@@ -0,0 +1,8 @@
+TiCPP is short for the official name TinyXML++. It is a completely
+new interface to TinyXML that uses MANY of the C++ strengths.
+Templates, exceptions, and much better error handling. It is also
+fully documented in Doxygen. It is really cool because this version
+lets you interface tiny the exact same way as before or you can
+choose to use the new ticpp classes. All you need to do is define
+TIXML_USE_TICPP. It has been tested in VC 6.0, VC 7.0, VC 7.1,
+VC 8.0, MinGW gcc 3.4.5, and in Linux GNU gcc 3+.
diff --git a/system/ticpp/slack-desc b/system/ticpp/slack-desc
new file mode 100644
index 0000000000..e924f8e05e
--- /dev/null
+++ b/system/ticpp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ticpp: ticpp (xml parser)
+ticpp:
+ticpp: TiCPP is short for the official name TinyXML++. It is a completely
+ticpp: new interface to TinyXML that uses MANY of the C++ strengths.
+ticpp: 
+ticpp:
+ticpp: 
+ticpp: 
+ticpp:
+ticpp: Homepage: https://github.com/wxFormBuilder/ticpp
+ticpp:
diff --git a/system/ticpp/ticpp.SlackBuild b/system/ticpp/ticpp.SlackBuild
new file mode 100644
index 0000000000..9fe9e6543b
--- /dev/null
+++ b/system/ticpp/ticpp.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Slackware build script for TiCPP
+# XML Parser
+
+# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# 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.
+
+# Revision date: 2020/Nov/25
+
+PRGNAM=ticpp
+VERSION=${VERSION:-0.1}
+COMVER=eb79120ea16b847ce9f483a298a394050f463d6b
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -std=c++11"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2 -std=c++11"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$COMVER.tar.?z
+mv $PRGNAM-$COMVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make CONFIG=Release DESTDIR=$PKG
+cd ..
+
+mkdir -p "$PKG/usr/include"
+install -Dm775 ticpp.h "$PKG/usr/include"
+install -Dm775 ticppapi.h "$PKG/usr/include"
+install -Dm775 ticpprc.h "$PKG/usr/include"
+install -Dm775 tinystr.h "$PKG/usr/include"
+install -Dm775 tinyxml.h "$PKG/usr/include"
+
+mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}"
+install -Dm775 build/libticpp.a "$PKG"/usr/lib${LIBDIRSUFFIX}
+
+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 build_instructions.txt changes.txt LICENSE README.md tutorial_gettingStarted.txt \
+      tutorial_ticpp.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ticpp/ticpp.info b/system/ticpp/ticpp.info
new file mode 100644
index 0000000000..04f790e583
--- /dev/null
+++ b/system/ticpp/ticpp.info
@@ -0,0 +1,10 @@
+PRGNAM="ticpp"
+VERSION="0.1"
+HOMEPAGE="https://github.com/wxFormBuilder/ticpp"
+DOWNLOAD="https://github.com/wxFormBuilder/ticpp/archive/eb79120ea16b847ce9f483a298a394050f463d6b/ticpp-eb79120ea16b847ce9f483a298a394050f463d6b.tar.gz"
+MD5SUM="250643c6562957da9993734c8f2f4b51"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/tini/tini.SlackBuild b/system/tini/tini.SlackBuild
index a243946f75..5ffafbcb8e 100644
--- a/system/tini/tini.SlackBuild
+++ b/system/tini/tini.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tini
 
-# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tini
-GITHASH=${GITHASH:-fec3683}
-VERSION=${VERSION:-0.18.0}
+GITHASH=${GITHASH:-de40ad0}
+VERSION=${VERSION:-0.19.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/tini/tini.info b/system/tini/tini.info
index e9d45b913f..ec5fa869c9 100644
--- a/system/tini/tini.info
+++ b/system/tini/tini.info
@@ -1,8 +1,8 @@
 PRGNAM="tini"
-VERSION="0.18.0"
+VERSION="0.19.0"
 HOMEPAGE="https://github.com/krallin/tini"
-DOWNLOAD="https://github.com/krallin/tini/archive/v0.18.0/tini-0.18.0.tar.gz"
-MD5SUM="cc3b205a1b83b8e6ed6892fc5e8ef2c3"
+DOWNLOAD="https://github.com/krallin/tini/archive/v0.19.0/tini-0.19.0.tar.gz"
+MD5SUM="72935bca9232313409a052833068fb1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild
index 55b728d155..94b2eb5c1b 100644
--- a/system/tinyvm/tinyvm.SlackBuild
+++ b/system/tinyvm/tinyvm.SlackBuild
@@ -25,6 +25,7 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+# 20201108 bkw: update for 20180322 (latest git)
 # 20170308 bkw:
 # - take over maintenance
 # - update to 20170212 (latest git commit)
@@ -32,8 +33,8 @@
 # - add some clarification to README
 
 PRGNAM=tinyvm
-VERSION=${VERSION:-20170212}
-SRCVER=${SRCVER:-a652f7219f3378450ccdb05154832558bdf5f22d}
+VERSION=${VERSION:-20180322}
+SRCVER=${SRCVER:-10c25d83e442caf0c1fc4b0ab29a91b3805d72ec}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +72,8 @@ cd $TMP
 rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$SRCVER
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 ## default compiler (clang)
 make OPTS="$SLKCFLAGS"
diff --git a/system/tinyvm/tinyvm.info b/system/tinyvm/tinyvm.info
index b36c0976c0..1bad6e47dd 100644
--- a/system/tinyvm/tinyvm.info
+++ b/system/tinyvm/tinyvm.info
@@ -1,8 +1,8 @@
 PRGNAM="tinyvm"
-VERSION="20170212"
+VERSION="20180322"
 HOMEPAGE="https://github.com/jakogut/tinyvm"
-DOWNLOAD="https://github.com/jakogut/tinyvm/archive/a652f7219f3378450ccdb05154832558bdf5f22d/tinyvm-a652f7219f3378450ccdb05154832558bdf5f22d.tar.gz"
-MD5SUM="e8d48db43f9e1c5f27b9c0ac20a682d2"
+DOWNLOAD="https://github.com/jakogut/tinyvm/archive/10c25d83e442caf0c1fc4b0ab29a91b3805d72ec/tinyvm-10c25d83e442caf0c1fc4b0ab29a91b3805d72ec.tar.gz"
+MD5SUM="95f649139746c6c5100fac113de518e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tmuxp/tmuxp.SlackBuild b/system/tmuxp/tmuxp.SlackBuild
index e1e4f02d0e..aa4879755a 100644
--- a/system/tmuxp/tmuxp.SlackBuild
+++ b/system/tmuxp/tmuxp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tmuxp
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tmuxp
-VERSION=${VERSION:-1.5.4}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,13 +69,13 @@ 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 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 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 CHANGES LICENSE PKG-INFO README.rst doc/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE PKG-INFO README.rst docs/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/tmuxp/tmuxp.info b/system/tmuxp/tmuxp.info
index c33932a7a9..53558856aa 100644
--- a/system/tmuxp/tmuxp.info
+++ b/system/tmuxp/tmuxp.info
@@ -1,10 +1,10 @@
 PRGNAM="tmuxp"
-VERSION="1.5.4"
+VERSION="1.7.0"
 HOMEPAGE="https://github.com/tony/tmuxp/"
-DOWNLOAD="https://files.pythonhosted.org/packages/0f/ce/c06eb1dec939d75c60b837528e8205590d0306ced5fa9046f4029fb6058b/tmuxp-1.5.4.tar.gz"
-MD5SUM="2bdbaef671e97ff5658165f67e627df5"
+DOWNLOAD="https://files.pythonhosted.org/packages/4f/c8/80c974b3c373d479945a2e4ad6b3a655547af5121854b5213ad78ec46401/tmuxp-1.7.0.tar.gz"
+MD5SUM="c12a96d257b78337422f04418367ccae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="kaptan click colorama python-libtmux"
+REQUIRES="kaptan click colorama python-libtmux python3-PyYAML"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/tomb/tomb.SlackBuild b/system/tomb/tomb.SlackBuild
index 0d1c22c077..261fc0c050 100644
--- a/system/tomb/tomb.SlackBuild
+++ b/system/tomb/tomb.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tomb
 
-# Copyright 2015-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=tomb
 SRCNAM=Tomb
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/tomb/tomb.info b/system/tomb/tomb.info
index f55b83777c..b1c0476815 100644
--- a/system/tomb/tomb.info
+++ b/system/tomb/tomb.info
@@ -1,8 +1,8 @@
 PRGNAM="tomb"
-VERSION="2.6"
+VERSION="2.9"
 HOMEPAGE="https://www.dyne.org/software/tomb/"
-DOWNLOAD="https://github.com/dyne/Tomb/archive/v2.6/Tomb-2.6.tar.gz"
-MD5SUM="1c3d2d01f2ee70e725d544b41d6c8db3"
+DOWNLOAD="https://github.com/dyne/Tomb/archive/v2.9/Tomb-2.9.tar.gz"
+MD5SUM="e0640de7b613f80b91776af476ea525e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tpm/README b/system/tpm/README
index c306fc218f..0cdc921316 100644
--- a/system/tpm/README
+++ b/system/tpm/README
@@ -1,10 +1,11 @@
 tpm is a tiny shell script which is heavily inspired and largely
-compatible with pass. Just like pass it uses gpg2 to securely store your
-passwords, the major difference between pass and tpm is that the latter is
-a lot more minimal. Furthermore, tpm is written entirely in POSIX shell.
+compatible with pass. Just like pass it uses gpg2 to securely store
+your passwords, the major difference between pass and tpm is that the
+latter is a lot more minimal. Furthermore, tpm is written entirely
+in POSIX shell.
 
-Invoking tpm consists of specifying a command either insert or show and
-supplying one entry as a target. If insert is specified as a command,
-tpm will create a new entry and prompt for the corresponding password. If
-you specify show as a command, tpm will write the password for the given
-entry to standard output.
+Invoking tpm consists of specifying a command either insert or show
+and supplying one entry as a target. If insert is specified as a
+command, tpm will create a new entry and prompt for the corresponding
+password. If you specify show as a command, tpm will write the password
+for the given entry to standard output.
diff --git a/system/tpm/tpm.SlackBuild b/system/tpm/tpm.SlackBuild
index 2c985eb7d4..d6cd6a2979 100644
--- a/system/tpm/tpm.SlackBuild
+++ b/system/tpm/tpm.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=tpm
 VERSION=${VERSION:-1.3.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -49,16 +49,11 @@ 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 {} \;
 
-make
-
 make install \
   PREFIX=/usr \
   MANDIR=/usr/man \
   DESTDIR=$PKG
 
-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
-
 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
 
diff --git a/system/triggerhappy/README b/system/triggerhappy/README
new file mode 100644
index 0000000000..fc8e62f25f
--- /dev/null
+++ b/system/triggerhappy/README
@@ -0,0 +1,29 @@
+triggerhappy (a lightweight global hotkey daemon)
+
+Triggerhappy is a hotkey daemon that operates on a system wide
+scale. It watches all configured input devices for key, switch,
+or button events and can launch arbitrary commands specified by the
+administrator. In contrast to hotkey services provided by desktop
+environments, Triggerhappy is especially suited to hardware related
+switches like volume or wifi control; it works independently from
+a specific user being logged in and is also suitable for embedded
+systems that do not have a graphical user interface.
+
+The disadvantage of using triggerhappy is that it must be run with
+root privileges.
+
+After installing the package, you'll want to:
+
+  1. Read the man page for thd, particularly the EXAMPLES section.
+
+  2. Create one or more confg files, matching the pattern:
+     /etc/triggerhappy/triggers.d/*.conf
+     See the example files in /etc/triggerhappy/triggers.d/ for ideas.
+
+  3. chmod +x /etc/rc.d/rc.triggerhappy
+
+  4. /etc/rc.d/rc.triggerhappy start
+
+After this, the daemon will start on boot. To add devices to the
+running daemon, use th-cmd's --passfd option (not --add, since the
+daemon drops privileges after startup).
diff --git a/system/triggerhappy/rc.triggerhappy b/system/triggerhappy/rc.triggerhappy
new file mode 100644
index 0000000000..d8f3266484
--- /dev/null
+++ b/system/triggerhappy/rc.triggerhappy
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# rc.triggerhappy, sysv-style init script for triggerhappy.
+# part of the slackbuilds.org triggerhappy build.
+
+THD_SOCKET=/var/run/thd.socket
+THD_ARGS="--daemon --user nobody --socket $THD_SOCKET --triggers /etc/triggerhappy/triggers.d/ /dev/input/event*"
+
+case "$1" in
+  ""|"start") if [ -e $THD_SOCKET ]; then
+                echo "$0: $THD_SOCKET already exists (daemon running or stale socket?)"
+                exit 1;
+              fi
+              echo "Starting triggerhappy daemon (thd)"
+              /usr/sbin/thd $THD_ARGS ;;
+  stop)       echo "Stopping triggerhappy daemon (thd)"
+              /usr/sbin/th-cmd --socket $THD_SOCKET --quit
+              /bin/rm -f $THD_SOCKET ;;
+  restart)    $0 stop ; /bin/sleep 1; exec $0 start ;;
+  *)          echo "Usage: $0 [stop|start|restart]"
+              exit 1 ;;
+esac
+
+exit 0
diff --git a/system/triggerhappy/slack-desc b/system/triggerhappy/slack-desc
new file mode 100644
index 0000000000..49485ed1fb
--- /dev/null
+++ b/system/triggerhappy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+triggerhappy: triggerhappy (a lightweight global hotkey daemon)
+triggerhappy:
+triggerhappy: Triggerhappy is a hotkey daemon that operates on a system wide
+triggerhappy: scale. It watches all configured input devices for key, switch,
+triggerhappy: or button events and can launch arbitrary commands specified by the
+triggerhappy: administrator. In contrast to hotkey services provided by desktop
+triggerhappy: environments, Triggerhappy is especially suited to hardware related
+triggerhappy: switches like volume or wifi control; it works independently from
+triggerhappy: a specific user being logged in and is also suitable for embedded
+triggerhappy: systems that do not have a graphical user interface.
+triggerhappy:
diff --git a/system/triggerhappy/test.conf.example b/system/triggerhappy/test.conf.example
new file mode 100644
index 0000000000..458e6433b4
--- /dev/null
+++ b/system/triggerhappy/test.conf.example
@@ -0,0 +1,10 @@
+# 20201031 bkw: very simple test config.
+#   cp test.conf.example test.conf
+#   /etc/rc.d/rc.triggerhappy start
+# Press F11 and F12, while running:
+#   watch ls /tmp/triggerhappy_works
+# Note that comments are allowed in triggerhappy's .conf files,
+# but blank lines ARE NOT allowed! That's why this looks so
+# cramped and hard to read...
+KEY_F11		1	/usr/bin/touch /tmp/triggerhappy_works
+KEY_F12		1	/usr/bin/rm    /tmp/triggerhappy_works
diff --git a/system/triggerhappy/triggerhappy.SlackBuild b/system/triggerhappy/triggerhappy.SlackBuild
new file mode 100644
index 0000000000..8c8adb0f49
--- /dev/null
+++ b/system/triggerhappy/triggerhappy.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for triggerhappy
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=triggerhappy
+VERSION=${VERSION:-0.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCVER=release-$VERSION
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make CFLAGS="$SLKCFLAGS"
+make install BINDIR=$PKG/usr/sbin MANDIR=$PKG/usr/man/man1
+strip $PKG/usr/sbin/*
+
+# man pages are installed +x, *gag*
+chmod -x $PKG/usr/man/man1/*.1
+gzip -9 $PKG/usr/man/man1/*.1
+
+# The example config won't actually get used unless renamed to end
+# in .conf (per the man page). Also include a much simpler test
+# config that can be used as-is.
+mkdir -p $PKG/etc/$PRGNAM/triggers.d
+cp -a *.conf.examples $PKG/etc/$PRGNAM/triggers.d
+cat $CWD/test.conf.example > $PKG/etc/$PRGNAM/triggers.d/test.conf.example
+
+# init script written by SlackBuild author. It's pretty rudimentary.
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM
+
+# Include our own README since it has manual config instructions.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/triggerhappy/triggerhappy.info b/system/triggerhappy/triggerhappy.info
new file mode 100644
index 0000000000..edaa5e53e6
--- /dev/null
+++ b/system/triggerhappy/triggerhappy.info
@@ -0,0 +1,10 @@
+PRGNAM="triggerhappy"
+VERSION="0.5.0"
+HOMEPAGE="https://github.com/wertarbyte/triggerhappy"
+DOWNLOAD="https://github.com/wertarbyte/triggerhappy/archive/release/0.5.0/triggerhappy-release-0.5.0.tar.gz"
+MD5SUM="2056cda4e9127cd375067f2cd3234616"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild b/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild
index 5d3f411374..d7fd215368 100644
--- a/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild
+++ b/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild
@@ -19,7 +19,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=ttf-ibm-plex
-VERSION=${VERSION:-4.0.2}
+VERSION=${VERSION:-5.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ttf-ibm-plex/ttf-ibm-plex.info b/system/ttf-ibm-plex/ttf-ibm-plex.info
index f9c23eafbf..86067dc59d 100644
--- a/system/ttf-ibm-plex/ttf-ibm-plex.info
+++ b/system/ttf-ibm-plex/ttf-ibm-plex.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-ibm-plex"
-VERSION="4.0.2"
+VERSION="5.1.3"
 HOMEPAGE="https://github.com/IBM/plex"
-DOWNLOAD="https://github.com/IBM/plex/releases/download/v4.0.2/TrueType.zip"
-MD5SUM="cf58ba2f9ee6d4737ab8295e99ca12c6"
+DOWNLOAD="https://github.com/IBM/plex/releases/download/v5.1.3/TrueType.zip"
+MD5SUM="813956ffd825da7d502adb545bb4367c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-mononoki/ttf-mononoki.SlackBuild b/system/ttf-mononoki/ttf-mononoki.SlackBuild
index ca2952723d..8c1dcee09a 100644
--- a/system/ttf-mononoki/ttf-mononoki.SlackBuild
+++ b/system/ttf-mononoki/ttf-mononoki.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ttf-mononoki
 
-# Copyright 2016-2017 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2017,2021 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=ttf-mononoki
 SRCNAM=${PRGNAM#ttf-}
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ttf-mononoki/ttf-mononoki.info b/system/ttf-mononoki/ttf-mononoki.info
index 60e4396fab..a38db1a554 100644
--- a/system/ttf-mononoki/ttf-mononoki.info
+++ b/system/ttf-mononoki/ttf-mononoki.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-mononoki"
-VERSION="1.2"
+VERSION="1.3"
 HOMEPAGE="https://github.com/madmalik/mononoki"
-DOWNLOAD="https://github.com/madmalik/mononoki/archive/1.2/mononoki-1.2.tar.gz"
-MD5SUM="363cc670712f5c5decdc4bf5691e8828"
+DOWNLOAD="https://github.com/madmalik/mononoki/archive/1.3/mononoki-1.3.tar.gz"
+MD5SUM="48c04185ec480173990d6b8853662da5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unison/old_ocaml.diff.gz b/system/unison/old_ocaml.diff.gz
new file mode 100644
index 0000000000..9fd8b1b527
--- /dev/null
+++ b/system/unison/old_ocaml.diff.gz
diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild
index 6d43f2fab0..3e82e4a68b 100644
--- a/system/unison/unison.SlackBuild
+++ b/system/unison/unison.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for unison
 
 # Copyright 2007-2011 Ferenc Deak <ferenc.deak@gmail.com>
-# Copyright 2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2018,2020 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unison
-VERSION=${VERSION:-2.51.2}
+VERSION=${VERSION:-2.51.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,6 +63,11 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+if [ "$(ocamlc --version | cut -d. -f1)" = "4" ] && [ "$(ocamlc --version | cut -d. -f2)" = "03" ] ; then
+  zcat $CWD/old_ocaml.diff.gz | patch -p1
+fi
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/unison/unison.info b/system/unison/unison.info
index f10eaf5a3d..3db7c7da02 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -1,8 +1,8 @@
 PRGNAM="unison"
-VERSION="2.51.2"
+VERSION="2.51.3"
 HOMEPAGE="https://www.cis.upenn.edu/~bcpierce/unison/"
-DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.2/unison-2.51.2.tar.gz"
-MD5SUM="11991eddcf6fdd8b50041eefe44bad61"
+DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.3/unison-2.51.3.tar.gz"
+MD5SUM="015533d6f89b47d8862c0e56350d1b0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lablgtk"
diff --git a/system/univga-font/README b/system/univga-font/README
index 24d1e95626..10e0670927 100644
--- a/system/univga-font/README
+++ b/system/univga-font/README
@@ -1,12 +1,13 @@
 univga-font (unicode terminal font)
 
 UNI-VGA is a Unicode VGA font for X11 and console. It is primarily
-intended to be the single source of fonts for console and for XDosEmu.
+intended to be the single source of fonts for console and for MS-DOS
+emulators.
 
 One of the aims while creating the font was its internal consistency.
 For example, accented glyphs shouldn't differ too much from unaccented
-ones, as it was in original IBM's VGA font. It also allowed to
-render Latin Extended Additional glyphs with two accents, which was
+ones, as it was in original IBM's VGA font. It also allows rendering
+Latin Extended Additional glyphs with two accents, which was
 impossible with IBM's accents' size.
 
 X11 calls the font:
@@ -14,7 +15,16 @@ X11 calls the font:
 ...and an alias called "univga" is added, so you can say e.g.:
   xterm -fn univga
 
+In most applications' font pickers, the font is just "VGA".
+
 Also 3 varieties of the font are installed for use with
 the Linux console: AsianCyr-vga-8x16, WinCyr-vga-8x16, and
 UniCyrX-vga-8x16. They can be used in /etc/rc.d/rc.font, but won't
 show up in the setconsolefont menu.
+
+By default, the BDF (old style X bitmap), PSF (Linux console), and
+OTB (new style Pango/Harfbuzz bitmap) fonts are installed. If you for
+some reason need it, you can also install the PCF (portable compiled
+X font) version, with PCF=yes in the environment. You can also set
+BDF=no, PSF=no, and/or OTB=no, if you want to omit one or more of
+these font types. Setting all 4 variables to "no" is an error, though.
diff --git a/system/univga-font/slack-desc b/system/univga-font/slack-desc
index 79e4dfc1e4..6ec95c65cf 100644
--- a/system/univga-font/slack-desc
+++ b/system/univga-font/slack-desc
@@ -9,11 +9,11 @@
 univga-font: univga-font (unicode terminal font)
 univga-font:
 univga-font: UNI-VGA is a Unicode VGA font for X11 and console. It is primarily
-univga-font: intended to be the single source of fonts for console and for XDosEmu.
-univga-font:
-univga-font:
-univga-font:
+univga-font: intended to be the single source of fonts for console and for MS-DOS
 univga-font:
+univga-font: emulators.
+univga-font: Font types included in this package:
 univga-font:
+univga-font: PSF=@PSF@, BDF=@BDF@, OTB=@OTB@, PCF=@PCF@
 univga-font:
 univga-font:
diff --git a/system/univga-font/univga-font.SlackBuild b/system/univga-font/univga-font.SlackBuild
index 2cd2cb84e7..907dd8d16b 100644
--- a/system/univga-font/univga-font.SlackBuild
+++ b/system/univga-font/univga-font.SlackBuild
@@ -8,11 +8,16 @@
 
 # VERSION taken from the datestamp of the tarball.
 
+# 20201206 bkw: BUILD=3, added OTB font since -current's pango wants it.
+#               Also add PCF (disabled by default). Based on a patch from
+#               Tomasz Bywalec. Update README. Have slack-desc list the
+#               font types included in the package.
+
 # 20191224 bkw: BUILD=2, xset fp rehash in doinst.sh.
 
 PRGNAM=univga-font
 VERSION=${VERSION:-20021031}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -25,6 +30,7 @@ OUTPUT=${OUTPUT:-/tmp}
 set -e
 
 TARNAME=uni-vga
+FNAME=u_vga16
 DIRNAME=${TARNAME/-/_}
 
 rm -rf $PKG
@@ -37,28 +43,58 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# Defaults:
+PSF="${PSF:-yes}"
+BDF="${BDF:-yes}"
+OTB="${OTB:-yes}"
+PCF="${PCF:-no}"
+
 # modern perl needs a slight change to the bdf2psf.pl script, and modern
 # psfaddtable has different options than whatever this was written for.
 patch -p1 < $CWD/buildfix.diff
 
 # The console fonts. They're very similar to the ones shipped with the kbd
 # package, but not identical.
-make allfonts
-mkdir -p $PKG/usr/share/kbd/consolefonts/
-for i in *.psf; do
-  gzip -9c < $i > $PKG/usr/share/kbd/consolefonts/${i}u.gz
-done
+if [ "$PSF" = "yes" ]; then
+  make allfonts
+  mkdir -p $PKG/usr/share/kbd/consolefonts/
+  for i in *.psf; do
+    gzip -9c < $i > $PKG/usr/share/kbd/consolefonts/${i}u.gz
+  done
+  ok=yes
+fi
 
 # The X font. Use with xterm or such, very nice.
-mkdir -p $PKG/usr/share/fonts/misc
-gzip -9c < u_vga16.bdf > $PKG/usr/share/fonts/misc/u_vga16.bdf.gz
-
-# thought about using PCF instead, it's a trade-off: the compiled PCF is
-# bigger than the BDF, and after gzipping both, it's still bigger. The
-# BDF supposedly takes longer to load when first accessed, but I doubt
-# anyone's got a slow enough system to notice.
-
-#bdftopcf -t u_vga16.bdf | gzip -9c > $PKG/usr/share/fonts/misc/u_vga16.pcf.gz
+if [ "$BDF" = "yes" ]; then
+  mkdir -p $PKG/usr/share/fonts/misc
+  gzip -9c < $FNAME.bdf > $PKG/usr/share/fonts/misc/$FNAME.bdf.gz
+  ok=yes
+fi
+
+# If you *really* want the PCF version, you can have it via PCF=yes.
+# It's a trade-off: the compiled PCF is bigger than the BDF, and after
+# gzipping both, it's still bigger. The BDF supposedly takes longer
+# to load when first accessed, but I doubt anyone's got a slow enough
+# system to notice.
+if [ "$PCF" = "yes" ]; then
+  mkdir -p $PKG/usr/share/fonts/misc
+  bdftopcf -t $FNAME.bdf | gzip -9c > $PKG/usr/share/fonts/misc/$FNAME.pcf.gz
+  ok=yes
+fi
+
+# OpenType Bitmap (OTB) fonts, compatible with recent versions of Pango.
+# Necessary for -current and eventually 15.0. Support added by Tomasz Bywalec.
+if [ "$OTB" = "yes" ]; then
+  mkdir -p $PKG/usr/share/fonts/misc
+  fonttosfnt -o "$PKG/usr/share/fonts/misc/$FNAME.otb" $FNAME.bdf
+  ok=yes
+fi
+
+if [ "$ok" != "yes" ]; then
+  echo "*** No fonts selected to be included in the package." 1>&2
+  echo "*** At least one of the PCF BDF PSF OTB environment variables must be 'yes'." 1>&2
+  exit 1
+fi
 
 # include the converter script, someone might find it useful.
 mkdir -p $PKG/usr/bin
@@ -69,7 +105,11 @@ cp -a *.lsm $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@PCF@,$PCF," \
+    -e "s,@BDF@,$BDF," \
+    -e "s,@PSF@,$PSF," \
+    -e "s,@OTB@,$OTB," \
+ $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/system/usbguard/usbguard.SlackBuild b/system/usbguard/usbguard.SlackBuild
index 31ce481e6f..0bd7c48f96 100644
--- a/system/usbguard/usbguard.SlackBuild
+++ b/system/usbguard/usbguard.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=usbguard
-VERSION=${VERSION:-0.7.4}
+VERSION=${VERSION:-0.7.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/usbguard/usbguard.info b/system/usbguard/usbguard.info
index 0a91374766..2f91cbf1b3 100644
--- a/system/usbguard/usbguard.info
+++ b/system/usbguard/usbguard.info
@@ -1,8 +1,8 @@
 PRGNAM="usbguard"
-VERSION="0.7.4"
+VERSION="0.7.8"
 HOMEPAGE="https://usbguard.github.io/"
-DOWNLOAD="https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.4/usbguard-0.7.4.tar.gz"
-MD5SUM="1cebf50ed9fdbd83f989fcb2e1ae4493"
+DOWNLOAD="https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.8/usbguard-0.7.8.tar.gz"
+MD5SUM="b96dcae8c4169c455ac81adab44d59c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf libqb libsodium"
diff --git a/system/usermin/usermin.SlackBuild b/system/usermin/usermin.SlackBuild
index 64a25ece94..7d222a0742 100644
--- a/system/usermin/usermin.SlackBuild
+++ b/system/usermin/usermin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for usermin
 
-# Copyright 2014-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=usermin
-VERSION=${VERSION:-1.803}
+VERSION=${VERSION:-1.823}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/usermin/usermin.info b/system/usermin/usermin.info
index 5b80b37720..79cf82e572 100644
--- a/system/usermin/usermin.info
+++ b/system/usermin/usermin.info
@@ -1,8 +1,8 @@
 PRGNAM="usermin"
-VERSION="1.803"
+VERSION="1.823"
 HOMEPAGE="http://webmin.com/usermin.html"
-DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.803/usermin-1.803.tar.gz"
-MD5SUM="85f7ab5750f36e5f1151eb336ee6f419"
+DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.823/usermin-1.823.tar.gz"
+MD5SUM="f4f75578881f2cb43372b5d5d54adfbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webmin"
diff --git a/system/vagrant/vagrant.SlackBuild b/system/vagrant/vagrant.SlackBuild
index 6b3530140e..a81fe9f5f4 100644
--- a/system/vagrant/vagrant.SlackBuild
+++ b/system/vagrant/vagrant.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for vagrant
 
-# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=vagrant
-VERSION=${VERSION:-2.2.10}
+VERSION=${VERSION:-2.2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/vagrant/vagrant.info b/system/vagrant/vagrant.info
index 1cf02f1cb9..a9f104a145 100644
--- a/system/vagrant/vagrant.info
+++ b/system/vagrant/vagrant.info
@@ -1,10 +1,10 @@
 PRGNAM="vagrant"
-VERSION="2.2.10"
+VERSION="2.2.15"
 HOMEPAGE="https://www.vagrantup.com"
-DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_i686.rpm"
-MD5SUM="7c725e387d8d34b1f4f36e3c5724f15e"
-DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm"
-MD5SUM_x86_64="4cb6a372e3f8a8dfc797d9d5d1464905"
+DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_i686.rpm"
+MD5SUM="ae0d97049ecc03275b12eea6e92c6c91"
+DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm"
+MD5SUM_x86_64="68f7629a4fb363031cc95e00f4c17980"
 REQUIRES=""
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/system/victor-mono-fonts/README b/system/victor-mono-fonts/README
new file mode 100644
index 0000000000..d4a382def6
--- /dev/null
+++ b/system/victor-mono-fonts/README
@@ -0,0 +1,9 @@
+Victor Mono is an open-source monospaced font with optional
+semi-connected cursive italics and programming symbol ligatures.
+
+The typeface is clean, crisp and narrow, with a large x-height and clear
+punctuation, making it legible and ideal for code. It comes in seven
+weights and Roman, Italic and Oblique styles.
+
+Learn more and optionally support the creator at:
+https://rubjo.github.io/victor-mono/
diff --git a/system/victor-mono-fonts/doinst.sh b/system/victor-mono-fonts/doinst.sh
new file mode 100644
index 0000000000..887f9240a8
--- /dev/null
+++ b/system/victor-mono-fonts/doinst.sh
@@ -0,0 +1,14 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+  ( cd usr/share/fonts/OTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/victor-mono-fonts/slack-desc b/system/victor-mono-fonts/slack-desc
new file mode 100644
index 0000000000..0c60d80a90
--- /dev/null
+++ b/system/victor-mono-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+victor-mono-fonts: victor-mono-fonts (monospaced font with programming ligatures)
+victor-mono-fonts:
+victor-mono-fonts: Victor Mono is an open-source monospaced font with optional
+victor-mono-fonts: semi-connected cursive italics and programming symbol ligatures.
+victor-mono-fonts:
+victor-mono-fonts: The typeface is clean, crisp and arow, with a large x-height and
+victor-mono-fonts: clear punctuation, making it legible and ideal for code. It comes
+victor-mono-fonts: in seven weights and Roman, Italic and Oblique styles.
+victor-mono-fonts:
+victor-mono-fonts: https://rubjo.github.io/victor-mono/
+victor-mono-fonts:
diff --git a/system/victor-mono-fonts/victor-mono-fonts.SlackBuild b/system/victor-mono-fonts/victor-mono-fonts.SlackBuild
new file mode 100644
index 0000000000..ba30348900
--- /dev/null
+++ b/system/victor-mono-fonts/victor-mono-fonts.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Slackware build script for victor-mono-fonts
+
+# Copyright 2021 Justin Teague <arcadellama@posteo.net>
+# 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=victor-mono-fonts
+SRCNAM=VictorMonoAll
+VERSION=${VERSION:-1.4.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf ${PRGNAM%-fonts}-$VERSION
+tar xvf $CWD/${PRGNAM%-fonts}-$VERSION.tar.gz
+cd ${PRGNAM%-fonts}-$VERSION
+unzip public/$SRCNAM
+chown -R root:root .
+find -L . \
+  \( -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 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+mv TTF/*.ttf $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/share/fonts/OTF
+mv OTF/*.otf $PKG/usr/share/fonts/OTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -p LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+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}
diff --git a/system/victor-mono-fonts/victor-mono-fonts.info b/system/victor-mono-fonts/victor-mono-fonts.info
new file mode 100644
index 0000000000..538ced8141
--- /dev/null
+++ b/system/victor-mono-fonts/victor-mono-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="victor-mono-fonts"
+VERSION="1.4.2"
+HOMEPAGE="https://rubjo.github.io/victor-mono/"
+DOWNLOAD="https://github.com/rubjo/victor-mono/archive/v1.4.2/victor-mono-1.4.2.tar.gz"
+MD5SUM="b1ddcb2711be3f696fe443d41386e02b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Justin Teague"
+EMAIL="arcadellama@posteo.net"
diff --git a/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz b/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz
new file mode 100644
index 0000000000..45129dff9e
--- /dev/null
+++ b/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz
diff --git a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch
deleted file mode 100644
index ef76ea2ef7..0000000000
--- a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9dda18921a25f64e0a0da06e3417ce99f8bf9b41 Mon Sep 17 00:00:00 2001
-From: Andrew Clemons <andrew.clemons@gmail.com>
-Date: Wed, 25 Oct 2017 21:35:14 +1300
-Subject: [PATCH] Silence warning for missing path for `vtcol` binary
-
-vtcol.rs should probably be main.rs, but explicitly setting the
-non-standard path also silences the warning. (src/bin would also work)
----
- Cargo.lock | 2 +-
- Cargo.toml | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 16590af..0833d44 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -14,6 +14,7 @@ license     = "GPL-3.0"
- 
- [[bin]]
- name        = "vtcol"
-+path        = "src/vtcol.rs"
- test        = false
- doc         = false
- 
diff --git a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz
new file mode 100644
index 0000000000..e6f330efc0
--- /dev/null
+++ b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz
diff --git a/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz b/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz
new file mode 100644
index 0000000000..2716a62ed8
--- /dev/null
+++ b/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz
diff --git a/system/vtcol/vtcol.SlackBuild b/system/vtcol/vtcol.SlackBuild
index d71e8d72e7..b32862aeef 100644
--- a/system/vtcol/vtcol.SlackBuild
+++ b/system/vtcol/vtcol.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vtcol
 
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=vtcol
 VERSION=${VERSION:-0.42.2}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,11 +65,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
 
-patch -p1 < $CWD/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch
+zcat $CWD/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz | patch -p1
+zcat $CWD/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz | patch -p1
+zcat $CWD/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz | patch -p1
 
 # build offline
 # configuration tells cargo to use the configured directory
diff --git a/system/vtcol/vtcol.info b/system/vtcol/vtcol.info
index 9f3fc65672..e55ba739e6 100644
--- a/system/vtcol/vtcol.info
+++ b/system/vtcol/vtcol.info
@@ -1,12 +1,14 @@
 PRGNAM="vtcol"
 VERSION="0.42.2"
 HOMEPAGE="https://gitlab.com/phgsng/vtcol"
-DOWNLOAD="https://github.com/phi-gamma/vtcol/archive/v0.42.2/vtcol-0.42.2.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate"
-MD5SUM="80091d0507aff4fe8bfb8d82e70a020c \
-        6d59f4fa29cab7bcc7ea7e0c8f96e27d \
-        604a2edfd52c6e87d8903ef2795da387"
+DOWNLOAD="https://gitlab.com/phgsng/vtcol/-/archive/v0.42.2/vtcol-v0.42.2.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate"
+MD5SUM="94ec72b7b2cc7d1a2ed80d2a08a70761 \
+        c3ec5977ecc0f6244ef3be87f5325e72 \
+        604a2edfd52c6e87d8903ef2795da387 \
+        4272c279b06b88f8b0ffce7109348e27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild
index b1e79da020..3889b03612 100644
--- a/system/webmin/webmin.SlackBuild
+++ b/system/webmin/webmin.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=webmin
-VERSION=${VERSION:-1.955}
+VERSION=${VERSION:-1.973}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info
index 238ca2651f..e51856347c 100644
--- a/system/webmin/webmin.info
+++ b/system/webmin/webmin.info
@@ -1,8 +1,8 @@
 PRGNAM="webmin"
-VERSION="1.955"
-HOMEPAGE="http://www.webmin.com/"
-DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.955/webmin-1.955.tar.gz"
-MD5SUM="67187dfc4ee811806a79eb933c8abad8"
+VERSION="1.973"
+HOMEPAGE="https://www.webmin.com/"
+DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.973/webmin-1.973.tar.gz"
+MD5SUM="6d38a589e4b721a5ae584767713a230a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 408c82bf59..da0da96bc8 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -32,8 +32,8 @@
 # Now maintained by Dave Woodfall <dave@slackbuilds.org>
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-5.19}
-WINEVERSION=$VERSION
+VERSION=${VERSION:-6.5}
+WINEVERSION=${WINEVERSION:-6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,12 +65,12 @@ if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
 fi
 
 # These should work for anything not specified below
-BUILD_ARCH=$ARCH"-slackware-linux"
+BUILD_ARCH="$ARCH-slackware-linux"
 SLKCFLAGS="-O2"
 
 case "$ARCH" in
   arm)
-    BUILD_ARCH=$ARCH"-slackware-linux-gnueabi"
+    BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
     ;;
   i?86)
     # -Os was -O2, fix for:
@@ -118,11 +118,6 @@ patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
 # fix path of opencl headers.
 sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 
-# Remove -fPIC for i?86 or the build will hang.
-if [ "$ARCH" == "i?86" ]; then
-  patch -p1 --verbose < $CWD/x86_remove_fpic.patch
-fi
-
 if [ "$WIN64" = "yes" ]; then
   wine64="--with-wine64=../wine64"
   mkdir wine64
@@ -214,6 +209,8 @@ cp $CWD/*.desktop $PKG/usr/share/applications/
 DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION"
 FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times"
 
+VERSION=$( printf %s $VERSION | tr - _ )
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $DOCS $FONTS_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index 8c6f38f115..520f7c2dfb 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,10 +1,10 @@
 PRGNAM="wine-staging"
-VERSION="5.19"
+VERSION="6.5"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v5.19/wine-staging-5.19.tar.gz"
-MD5SUM="a68ecdf2a8d91cb2ed337bdb8579f0c6 \
-        56f32f979f2c4929b22987c9a0560715"
+DOWNLOAD="https://dl.winehq.org/wine/source/6.x/wine-6.5.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v6.5/wine-staging-6.5.tar.gz"
+MD5SUM="ff2e13ce3cfce10ab801bbe89261d76b \
+        34ee330a274bec7ad5cb7ab840f424fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/wine-staging/x86_remove_fpic.patch b/system/wine-staging/x86_remove_fpic.patch
deleted file mode 100644
index ac949dc86d..0000000000
--- a/system/wine-staging/x86_remove_fpic.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Naur a/configure b/configure
---- a/configure	2018-01-02 20:58:13.000000000 +0000
-+++ b/configure	2018-01-08 18:31:55.480995247 +0000
-@@ -8072,7 +8072,7 @@
- done
- 
-     LIBEXT="dylib"
--    DLLFLAGS="$DLLFLAGS -fPIC"
-+    DLLFLAGS="$DLLFLAGS "
-     LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-     LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine"
-         COREFOUNDATION_LIBS="-framework CoreFoundation"
-@@ -8304,14 +8304,14 @@
-     ;;
- 
-   linux-android*)
--    DLLFLAGS="$DLLFLAGS -fPIC"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
-+    DLLFLAGS="$DLLFLAGS "
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--export-dynamic" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--export-dynamic... " >&6; }
- if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
-+CFLAGS="$CFLAGS  -Wl,--export-dynamic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8330,14 +8330,14 @@
- if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then :
-   LDEXECFLAGS="-Wl,--export-dynamic"
- fi
--    as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+    as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,--rpath,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8358,14 +8358,14 @@
-   LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-                      LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,-R,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8448,7 +8448,7 @@
-     ;;
- 
-   *)
--    DLLFLAGS="$DLLFLAGS -fPIC"
-+    DLLFLAGS="$DLLFLAGS "
-     LDEXECFLAGS=""
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5
- $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; }
-@@ -8456,7 +8456,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic"
-+CFLAGS="$CFLAGS  -shared -Wl,-Bsymbolic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- void myfunc() {}
-@@ -8475,13 +8475,13 @@
-     if test "$ac_cv_c_dll_gnuelf" = "yes"
-     then
-       LIBWINE_LDFLAGS="-shared"
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,-soname,confest.so.1" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,-soname,confest.so.1... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1"
-+CFLAGS="$CFLAGS  -shared -Wl,-soname,confest.so.1"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8500,13 +8500,13 @@
- if test "x$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" = xyes; then :
-   LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,-h,confest.so.1" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,-h,confest.so.1... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1"
-+CFLAGS="$CFLAGS  -shared -Wl,-h,confest.so.1"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8528,13 +8528,13 @@
- fi
- 
-       echo '{ global: *; };' >conftest.map
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,--version-script=conftest.map" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,--version-script=conftest.map... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map"
-+CFLAGS="$CFLAGS  -shared -Wl,--version-script=conftest.map"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8555,13 +8555,13 @@
- fi
-       rm -f conftest.map
- 
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--export-dynamic" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--export-dynamic... " >&6; }
- if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
-+CFLAGS="$CFLAGS  -Wl,--export-dynamic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8581,14 +8581,14 @@
-   LDEXECFLAGS="-Wl,--export-dynamic"
- fi
- 
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+      as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,--rpath,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8609,14 +8609,14 @@
-   LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-                        LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,-R,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8804,7 +8804,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
-+CFLAGS="$CFLAGS  -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- void myfunc() {}
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 69f93edf23..64ae4f4275 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine
-VERSION=${VERSION:-5.0.2}
+VERSION=${VERSION:-6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
@@ -56,12 +56,12 @@ if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
 fi
 
 # These should work for anything not specified below
-BUILD_ARCH=$ARCH"-slackware-linux"
+BUILD_ARCH="$ARCH-slackware-linux"
 SLKCFLAGS="-O2"
 
 case "$ARCH" in
 	arm)
-		BUILD_ARCH=$ARCH"-slackware-linux-gnueabi"
+		BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
 		;;
 	i?86)
 		# -Os was -O2, fix for:
@@ -94,11 +94,6 @@ find -L . \
 # Fix for flex
 patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
 
-# Remove -fPIC for i?86 or the build will hang
-if [ "$ARCH" == "i?86" ]; then
-	patch -p1 --verbose < $CWD/x86_remove_fpic.patch
-fi
-
 if [ "$WIN64" = "yes" ]; then
 	wine64="--with-wine64=../wine64"
 	mkdir wine64
@@ -165,8 +160,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
+VERSION=$( printf %s $VERSION | tr - _ )
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/wine/wine.info b/system/wine/wine.info
index 9a8dbbec47..44d7b362ae 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,8 +1,8 @@
 PRGNAM="wine"
-VERSION="5.0.2"
+VERSION="6.0"
 HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="https://dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz"
-MD5SUM="28355e3d34f10df8aa53a69cc4036ee9"
+DOWNLOAD="https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz"
+MD5SUM="1c8b7e1642a9e532106b88a7b1932ef3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/wine/x86_remove_fpic.patch b/system/wine/x86_remove_fpic.patch
deleted file mode 100644
index ac949dc86d..0000000000
--- a/system/wine/x86_remove_fpic.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Naur a/configure b/configure
---- a/configure	2018-01-02 20:58:13.000000000 +0000
-+++ b/configure	2018-01-08 18:31:55.480995247 +0000
-@@ -8072,7 +8072,7 @@
- done
- 
-     LIBEXT="dylib"
--    DLLFLAGS="$DLLFLAGS -fPIC"
-+    DLLFLAGS="$DLLFLAGS "
-     LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-     LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine"
-         COREFOUNDATION_LIBS="-framework CoreFoundation"
-@@ -8304,14 +8304,14 @@
-     ;;
- 
-   linux-android*)
--    DLLFLAGS="$DLLFLAGS -fPIC"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
-+    DLLFLAGS="$DLLFLAGS "
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--export-dynamic" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--export-dynamic... " >&6; }
- if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
-+CFLAGS="$CFLAGS  -Wl,--export-dynamic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8330,14 +8330,14 @@
- if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then :
-   LDEXECFLAGS="-Wl,--export-dynamic"
- fi
--    as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+    as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,--rpath,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8358,14 +8358,14 @@
-   LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-                      LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,-R,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8448,7 +8448,7 @@
-     ;;
- 
-   *)
--    DLLFLAGS="$DLLFLAGS -fPIC"
-+    DLLFLAGS="$DLLFLAGS "
-     LDEXECFLAGS=""
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5
- $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; }
-@@ -8456,7 +8456,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic"
-+CFLAGS="$CFLAGS  -shared -Wl,-Bsymbolic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- void myfunc() {}
-@@ -8475,13 +8475,13 @@
-     if test "$ac_cv_c_dll_gnuelf" = "yes"
-     then
-       LIBWINE_LDFLAGS="-shared"
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,-soname,confest.so.1" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,-soname,confest.so.1... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1"
-+CFLAGS="$CFLAGS  -shared -Wl,-soname,confest.so.1"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8500,13 +8500,13 @@
- if test "x$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" = xyes; then :
-   LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,-h,confest.so.1" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,-h,confest.so.1... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1"
-+CFLAGS="$CFLAGS  -shared -Wl,-h,confest.so.1"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8528,13 +8528,13 @@
- fi
- 
-       echo '{ global: *; };' >conftest.map
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -shared -Wl,--version-script=conftest.map" >&5
-+$as_echo_n "checking whether the compiler supports  -shared -Wl,--version-script=conftest.map... " >&6; }
- if ${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map"
-+CFLAGS="$CFLAGS  -shared -Wl,--version-script=conftest.map"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8555,13 +8555,13 @@
- fi
-       rm -f conftest.map
- 
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--export-dynamic" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--export-dynamic... " >&6; }
- if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
-+CFLAGS="$CFLAGS  -Wl,--export-dynamic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8581,14 +8581,14 @@
-   LDEXECFLAGS="-Wl,--export-dynamic"
- fi
- 
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+      as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,--rpath,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8609,14 +8609,14 @@
-   LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-                        LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib" >&5
-+$as_echo_n "checking whether the compiler supports  -Wl,-R,\$ORIGIN/../lib... " >&6; }
- if eval \${$as_ac_var+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS  -Wl,-R,\$ORIGIN/../lib"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -8804,7 +8804,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
-+CFLAGS="$CFLAGS  -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- void myfunc() {}
diff --git a/system/worker/worker.SlackBuild b/system/worker/worker.SlackBuild
index fe729e1479..543fc06525 100644
--- a/system/worker/worker.SlackBuild
+++ b/system/worker/worker.SlackBuild
@@ -27,7 +27,7 @@
 # Modified by Eugene M., <damagedone at gmx dot com
 
 PRGNAM=worker
-VERSION=${VERSION:-4.5.1}
+VERSION=${VERSION:-4.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/worker/worker.info b/system/worker/worker.info
index 16e324fb8e..f2e68e7085 100644
--- a/system/worker/worker.info
+++ b/system/worker/worker.info
@@ -1,8 +1,8 @@
 PRGNAM="worker"
-VERSION="4.5.1"
+VERSION="4.8.0"
 HOMEPAGE="http://www.boomerangsworld.de/worker/"
-DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-4.5.1.tar.bz2"
-MD5SUM="8bf1cb582416f1d79d8edf349b3bdf04"
+DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-4.8.0.tar.bz2"
+MD5SUM="a5319b60723a0a489b7c0426d6aac446"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="avfs"
diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild
index 613fcc6c09..e7837ae2f9 100644
--- a/system/xarchiver/xarchiver.SlackBuild
+++ b/system/xarchiver/xarchiver.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xarchiver
-VERSION=${VERSION:-0.5.4.15}
+VERSION=${VERSION:-0.5.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info
index a81ceaa1f8..bdf73f4d96 100644
--- a/system/xarchiver/xarchiver.info
+++ b/system/xarchiver/xarchiver.info
@@ -1,8 +1,8 @@
 PRGNAM="xarchiver"
-VERSION="0.5.4.15"
+VERSION="0.5.4.17"
 HOMEPAGE="https://github.com/ib/xarchiver"
-DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.15/xarchiver-0.5.4.15.tar.gz"
-MD5SUM="1dd87416d53f3f19df606e272e5e66d1"
+DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.17/xarchiver-0.5.4.17.tar.gz"
+MD5SUM="f09d266775347f2ebccd94b01cf23c65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xbattmon/README b/system/xbattmon/README
index 3125528794..209c062390 100644
--- a/system/xbattmon/README
+++ b/system/xbattmon/README
@@ -10,5 +10,6 @@ COLOR_LEFT2CHARGE=<color> (default: grey)
 COLOR_DRAINED=<color> (default: red)
 COLOR_LEFT2DRAIN=<color> (default: blue)
 RAISE=yes|no (default: no), the bar to be raised on top of other windows
-CRITICAL=<number> (default: 5), the charge level at which starts blinking
+CRITICAL=<number> (default: 5), the charge level at which it starts
+blinking
 TRANSPARENT=yes|no (default: no)
diff --git a/system/xbattmon/slack-desc b/system/xbattmon/slack-desc
index bee69cf587..25be2d7718 100644
--- a/system/xbattmon/slack-desc
+++ b/system/xbattmon/slack-desc
@@ -12,8 +12,8 @@ xbattmon: xbattmon is a simple battery status bar for X. It draws a 2 pixels
 xbattmon: bar at the edge of your screen, which shows battery status with
 xbattmon: different colors.
 xbattmon:
+xbattmon: Homepage: https://git.2f30.org/xbattmon/log.html
 xbattmon:
-xbattmon: Homepage: http://git.2f30.org/xbattmon/
 xbattmon:
 xbattmon:
 xbattmon:
diff --git a/system/xbattmon/xbattmon.info b/system/xbattmon/xbattmon.info
index 0177707fd0..8dd02097bc 100644
--- a/system/xbattmon/xbattmon.info
+++ b/system/xbattmon/xbattmon.info
@@ -1,7 +1,7 @@
 PRGNAM="xbattmon"
 VERSION="1.1"
-HOMEPAGE="http://git.2f30.org/xbattmon/"
-DOWNLOAD="http://dl.2f30.org/releases/xbattmon-1.1.tar.gz"
+HOMEPAGE="https://git.2f30.org/xbattmon/"
+DOWNLOAD="https://dl.2f30.org/releases/xbattmon-1.1.tar.gz"
 MD5SUM="e2110af877e7bcfcb30201fcc2ad69f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
index 3a17678fbc..3c62fb1969 100644
--- a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
+++ b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=xboxdrv-linux
 VERSION=${VERSION:-0.8.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -61,7 +61,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz --strip-components 1 -C $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/xboxdrv-linux/xboxdrv-linux.info b/system/xboxdrv-linux/xboxdrv-linux.info
index eef98e33fd..467f0b7a1d 100644
--- a/system/xboxdrv-linux/xboxdrv-linux.info
+++ b/system/xboxdrv-linux/xboxdrv-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="xboxdrv-linux"
 VERSION="0.8.8"
 HOMEPAGE="https://pingus.seul.org/~grumbel/xboxdrv/"
-DOWNLOAD="https://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2"
-MD5SUM="a62703eda7d59393538b2f22d5b0c791"
+DOWNLOAD="https://github.com/chewi/xboxdrv/archive/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz"
+MD5SUM="f0cfa15f509a3858ccae94a0d0da3d6a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Zach Lewis"
+EMAIL="koni@archlinux.us"
diff --git a/system/xcdroast/README b/system/xcdroast/README
index b62f6406ea..72bb5a0d7d 100644
--- a/system/xcdroast/README
+++ b/system/xcdroast/README
@@ -1,6 +1,6 @@
 xcdroast (Graphical frontend for cdrtools)
 
-X-CD-Roast tries to be the most flexible CD and DVD burning software 
-ever. It allows even the unexperienced user to create or copy a CD or  
-a DVD with a few mouse clicks in a intuitive and nice looking   
-graphical user interface. 
+X-CD-Roast tries to be the most flexible CD and DVD burning software
+ever. It allows even the unexperienced user to create or copy a CD or a
+DVD with a few mouse clicks in a intuitive and nice looking graphical
+user interface.
diff --git a/system/xcdroast/io_compile.patch b/system/xcdroast/io_compile.patch
deleted file mode 100644
index 7285bd335d..0000000000
--- a/system/xcdroast/io_compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/io.c.org	2009-02-24 09:38:27.000000000 +0100
-+++ src/io.c	2009-02-24 09:45:18.000000000 +0100
-@@ -1903,7 +1903,8 @@
- 	}
- 
- 	strcpy(str,"");
--	fgets(str,MAXLINE,fpin); 
-+	if (fgets(str,MAXLINE,fpin) == NULL)
-+                g_error("fgets error\n");
- 
-         if (pclose(fpin) == -1) {
-                 g_error("pclose error\n");
-@@ -4720,7 +4721,7 @@
- 	dolog(3, "Saving extended output to %s\n", fname);
- 
- 	/* write to file */
--	fd = open(fname,O_WRONLY | O_CREAT);
-+	fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
- 	if (fd < 0) {
- 		g_warning("Can't open file %s for writing\n",fname);
- 		return 1;
diff --git a/system/xcdroast/xcdroast.SlackBuild b/system/xcdroast/xcdroast.SlackBuild
index 22fcc90522..c0feb67938 100644
--- a/system/xcdroast/xcdroast.SlackBuild
+++ b/system/xcdroast/xcdroast.SlackBuild
@@ -1,12 +1,35 @@
 #!/bin/sh
 
 # Slackware build script for xcdroast
+# GUI frontend for optical disc authoring.
 
+# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# All rights reserved.
+#
 # Written by Georgios Efstathiou gefst@yahoo.com
 # Heavily based on original slackware script.
+#
+# 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.
+
+# Revision date: 2020/Nov/22
 
 PRGNAM=xcdroast
-VERSION=${VERSION:-0.98alpha16}
+VERSION=${VERSION:-1.19}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -52,14 +75,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p0 < $CWD/io_compile.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-gtk2 \
   --build=$ARCH-slackware-linux
 
@@ -72,17 +96,15 @@ cat $CWD/xcdroast.desktop > $PKG/usr/share/applications/xcdroast.desktop
   ln -s ../../lib${LIBDIRSUFFIX}/xcdroast/icons/xcdricon.png xcdroast.png
 )
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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 ChangeLog INSTALL README AUTHORS \
+  COPYING ChangeLog INSTALL README AUTHORS NEWS \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/xcdroast/xcdroast.info b/system/xcdroast/xcdroast.info
index e0f2ce67ee..3d9e65081c 100644
--- a/system/xcdroast/xcdroast.info
+++ b/system/xcdroast/xcdroast.info
@@ -1,10 +1,10 @@
 PRGNAM="xcdroast"
-VERSION="0.98alpha16"
+VERSION="1.19"
 HOMEPAGE="http://www.xcdroast.org/"
-DOWNLOAD="http://downloads.sourceforge.net/xcdroast/xcdroast-0.98alpha16.tar.gz"
-MD5SUM="bc3d335a30f292067eaaf1ea03ebaf17"
+DOWNLOAD="http://downloads.sourceforge.net/xcdroast/xcdroast-1.19.tar.gz"
+MD5SUM="435f178db53e14452e923cba6afbb687"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Georgios Efstathiou"
-EMAIL="gefst@yahoo.com"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/xen/dom0/config-4.4.217-xen.i686 b/system/xen/dom0/config-4.4.240-xen.i686
index d60d6d7425..4bc001ee58 100644
--- a/system/xen/dom0/config-4.4.217-xen.i686
+++ b/system/xen/dom0/config-4.4.240-xen.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.217 Kernel Configuration
+# Linux/x86 4.4.240 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -5127,8 +5127,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
diff --git a/system/xen/dom0/config-4.4.217-xen.x86_64 b/system/xen/dom0/config-4.4.240-xen.x86_64
index df9403f2df..ea3a34d322 100644
--- a/system/xen/dom0/config-4.4.217-xen.x86_64
+++ b/system/xen/dom0/config-4.4.240-xen.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.217 Kernel Configuration
+# Linux/x86 4.4.240 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -4971,8 +4971,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh
index 754cf6fcf5..ce4c95e783 100644
--- a/system/xen/dom0/kernel-xen.sh
+++ b/system/xen/dom0/kernel-xen.sh
@@ -5,7 +5,7 @@
 # Written by Chris Abela <chris.abela@maltats.com>, 20100515
 # Modified by Mario Preksavec <mario@slackware.hr>
 
-KERNEL=${KERNEL:-4.4.217}
+KERNEL=${KERNEL:-4.4.240}
 XEN=${XEN:-4.13.1}
 BOOTLOADER=${BOOTLOADER:-lilo}
 
diff --git a/system/xen/domU/domU.sh b/system/xen/domU/domU.sh
index 4056208f5a..e49e3d58b9 100644
--- a/system/xen/domU/domU.sh
+++ b/system/xen/domU/domU.sh
@@ -7,7 +7,7 @@
 
 set -e
 
-KERNEL=${KERNEL:-4.4.217}
+KERNEL=${KERNEL:-4.4.240}
 
 # Build an image for the root file system and another for the swap
 # Default values : 8GB and 500MB resepectively.
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index f8437c7903..5c90056af9 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=xen
 VERSION=${VERSION:-4.13.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 SEABIOS=${SEABIOS:-1.12.1}
diff --git a/system/xen/xsa/xsa333.patch b/system/xen/xsa/xsa333.patch
new file mode 100644
index 0000000000..6b86c942fa
--- /dev/null
+++ b/system/xen/xsa/xsa333.patch
@@ -0,0 +1,39 @@
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Subject: x86/pv: Handle the Intel-specific MSR_MISC_ENABLE correctly
+
+This MSR doesn't exist on AMD hardware, and switching away from the safe
+functions in the common MSR path was an erroneous change.
+
+Partially revert the change.
+
+This is XSA-333.
+
+Fixes: 4fdc932b3cc ("x86/Intel: drop another 32-bit leftover")
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Wei Liu <wl@xen.org>
+
+diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c
+index efeb2a727e..6332c74b80 100644
+--- a/xen/arch/x86/pv/emul-priv-op.c
++++ b/xen/arch/x86/pv/emul-priv-op.c
+@@ -924,7 +924,8 @@ static int read_msr(unsigned int reg, uint64_t *val,
+         return X86EMUL_OKAY;
+ 
+     case MSR_IA32_MISC_ENABLE:
+-        rdmsrl(reg, *val);
++        if ( rdmsr_safe(reg, *val) )
++            break;
+         *val = guest_misc_enable(*val);
+         return X86EMUL_OKAY;
+ 
+@@ -1059,7 +1060,8 @@ static int write_msr(unsigned int reg, uint64_t val,
+         break;
+ 
+     case MSR_IA32_MISC_ENABLE:
+-        rdmsrl(reg, temp);
++        if ( rdmsr_safe(reg, temp) )
++            break;
+         if ( val != guest_misc_enable(temp) )
+             goto invalid;
+         return X86EMUL_OKAY;
diff --git a/system/xen/xsa/xsa334.patch b/system/xen/xsa/xsa334.patch
new file mode 100644
index 0000000000..4260cdb2b2
--- /dev/null
+++ b/system/xen/xsa/xsa334.patch
@@ -0,0 +1,51 @@
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Subject: xen/memory: Don't skip the RCU unlock path in acquire_resource()
+
+In the case that an HVM Stubdomain makes an XENMEM_acquire_resource hypercall,
+the FIXME path will bypass rcu_unlock_domain() on the way out of the function.
+
+Move the check to the start of the function.  This does change the behaviour
+of the get-size path for HVM Stubdomains, but that functionality is currently
+broken and unused anyway, as well as being quite useless to entities which
+can't actually map the resource anyway.
+
+This is XSA-334.
+
+Fixes: 83fa6552ce ("common: add a new mappable resource type: XENMEM_resource_grant_table")
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+diff --git a/xen/common/memory.c b/xen/common/memory.c
+index 1a3c9ffb30..29741d8904 100644
+--- a/xen/common/memory.c
++++ b/xen/common/memory.c
+@@ -1058,6 +1058,14 @@ static int acquire_resource(
+     xen_pfn_t mfn_list[32];
+     int rc;
+ 
++    /*
++     * FIXME: Until foreign pages inserted into the P2M are properly
++     *        reference counted, it is unsafe to allow mapping of
++     *        resource pages unless the caller is the hardware domain.
++     */
++    if ( paging_mode_translate(currd) && !is_hardware_domain(currd) )
++        return -EACCES;
++
+     if ( copy_from_guest(&xmar, arg, 1) )
+         return -EFAULT;
+ 
+@@ -1114,14 +1122,6 @@ static int acquire_resource(
+         xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)];
+         unsigned int i;
+ 
+-        /*
+-         * FIXME: Until foreign pages inserted into the P2M are properly
+-         *        reference counted, it is unsafe to allow mapping of
+-         *        resource pages unless the caller is the hardware domain.
+-         */
+-        if ( !is_hardware_domain(currd) )
+-            return -EACCES;
+-
+         if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) )
+             rc = -EFAULT;
+ 
diff --git a/system/xen/xsa/xsa335-qemu.patch b/system/xen/xsa/xsa335-qemu.patch
new file mode 100644
index 0000000000..5617502359
--- /dev/null
+++ b/system/xen/xsa/xsa335-qemu.patch
@@ -0,0 +1,84 @@
+From c5bd2924c6d6a5bcbffb8b5e7798a88970131c07 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 17 Aug 2020 08:34:22 +0200
+Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364)
+
+Store calculated setup_len in a local variable, verify it, and only
+write it to the struct (USBDevice->setup_len) in case it passed the
+sanity checks.
+
+This prevents other code (do_token_{in,out} functions specifically)
+from working with invalid USBDevice->setup_len values and overrunning
+the USBDevice->setup_buf[] buffer.
+
+Fixes: CVE-2020-14364
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ hw/usb/core.c | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/hw/usb/core.c b/hw/usb/core.c
+index 5abd128b6bc5..5234dcc73fea 100644
+--- a/hw/usb/core.c
++++ b/hw/usb/core.c
+@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream)
+ static void do_token_setup(USBDevice *s, USBPacket *p)
+ {
+     int request, value, index;
++    unsigned int setup_len;
+ 
+     if (p->iov.size != 8) {
+         p->status = USB_RET_STALL;
+@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p)
+     usb_packet_copy(p, s->setup_buf, p->iov.size);
+     s->setup_index = 0;
+     p->actual_length = 0;
+-    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
+-    if (s->setup_len > sizeof(s->data_buf)) {
++    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
++    if (setup_len > sizeof(s->data_buf)) {
+         fprintf(stderr,
+                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
+-                s->setup_len, sizeof(s->data_buf));
++                setup_len, sizeof(s->data_buf));
+         p->status = USB_RET_STALL;
+         return;
+     }
++    s->setup_len = setup_len;
+ 
+     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
+     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
+@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p)
+ static void do_parameter(USBDevice *s, USBPacket *p)
+ {
+     int i, request, value, index;
++    unsigned int setup_len;
+ 
+     for (i = 0; i < 8; i++) {
+         s->setup_buf[i] = p->parameter >> (i*8);
+     }
+ 
+     s->setup_state = SETUP_STATE_PARAM;
+-    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
+     s->setup_index = 0;
+ 
+     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
+     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
+     index   = (s->setup_buf[5] << 8) | s->setup_buf[4];
+ 
+-    if (s->setup_len > sizeof(s->data_buf)) {
++    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
++    if (setup_len > sizeof(s->data_buf)) {
+         fprintf(stderr,
+                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
+-                s->setup_len, sizeof(s->data_buf));
++                setup_len, sizeof(s->data_buf));
+         p->status = USB_RET_STALL;
+         return;
+     }
++    s->setup_len = setup_len;
+ 
+     if (p->pid == USB_TOKEN_OUT) {
+         usb_packet_copy(p, s->data_buf, s->setup_len);
+-- 
+2.18.4
diff --git a/system/xen/xsa/xsa336.patch b/system/xen/xsa/xsa336.patch
new file mode 100644
index 0000000000..b44c298b70
--- /dev/null
+++ b/system/xen/xsa/xsa336.patch
@@ -0,0 +1,283 @@
+From: Roger Pau Monné <roger.pau@citrix.com>
+Subject: x86/vpt: fix race when migrating timers between vCPUs
+
+The current vPT code will migrate the emulated timers between vCPUs
+(change the pt->vcpu field) while just holding the destination lock,
+either from create_periodic_time or pt_adjust_global_vcpu_target if
+the global target is adjusted. Changing the periodic_timer vCPU field
+in this way creates a race where a third party could grab the lock in
+the unlocked region of pt_adjust_global_vcpu_target (or before
+create_periodic_time performs the vcpu change) and then release the
+lock from a different vCPU, creating a locking imbalance.
+
+Introduce a per-domain rwlock in order to protect periodic_time
+migration between vCPU lists. Taking the lock in read mode prevents
+any timer from being migrated to a different vCPU, while taking it in
+write mode allows performing migration of timers across vCPUs. The
+per-vcpu locks are still used to protect all the other fields from the
+periodic_timer struct.
+
+Note that such migration shouldn't happen frequently, and hence
+there's no performance drop as a result of such locking.
+
+This is XSA-336.
+
+Reported-by: Igor Druzhinin <igor.druzhinin@citrix.com>
+Tested-by: Igor Druzhinin <igor.druzhinin@citrix.com>
+Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+---
+Changes since v2:
+ - Re-order pt_adjust_vcpu to remove one if.
+ - Fix pt_lock to not call pt_vcpu_lock, as we might end up using a
+   stale value of pt->vcpu when taking the per-vcpu lock.
+
+Changes since v1:
+ - Use a per-domain rwlock to protect timer vCPU migration.
+
+--- a/xen/arch/x86/hvm/hvm.c
++++ b/xen/arch/x86/hvm/hvm.c
+@@ -658,6 +658,8 @@ int hvm_domain_initialise(struct domain
+     /* need link to containing domain */
+     d->arch.hvm.pl_time->domain = d;
+ 
++    rwlock_init(&d->arch.hvm.pl_time->pt_migrate);
++
+     /* Set the default IO Bitmap. */
+     if ( is_hardware_domain(d) )
+     {
+--- a/xen/arch/x86/hvm/vpt.c
++++ b/xen/arch/x86/hvm/vpt.c
+@@ -153,23 +153,32 @@ static int pt_irq_masked(struct periodic
+     return 1;
+ }
+ 
+-static void pt_lock(struct periodic_time *pt)
++static void pt_vcpu_lock(struct vcpu *v)
+ {
+-    struct vcpu *v;
++    read_lock(&v->domain->arch.hvm.pl_time->pt_migrate);
++    spin_lock(&v->arch.hvm.tm_lock);
++}
+ 
+-    for ( ; ; )
+-    {
+-        v = pt->vcpu;
+-        spin_lock(&v->arch.hvm.tm_lock);
+-        if ( likely(pt->vcpu == v) )
+-            break;
+-        spin_unlock(&v->arch.hvm.tm_lock);
+-    }
++static void pt_vcpu_unlock(struct vcpu *v)
++{
++    spin_unlock(&v->arch.hvm.tm_lock);
++    read_unlock(&v->domain->arch.hvm.pl_time->pt_migrate);
++}
++
++static void pt_lock(struct periodic_time *pt)
++{
++    /*
++     * We cannot use pt_vcpu_lock here, because we need to acquire the
++     * per-domain lock first and then (re-)fetch the value of pt->vcpu, or
++     * else we might be using a stale value of pt->vcpu.
++     */
++    read_lock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate);
++    spin_lock(&pt->vcpu->arch.hvm.tm_lock);
+ }
+ 
+ static void pt_unlock(struct periodic_time *pt)
+ {
+-    spin_unlock(&pt->vcpu->arch.hvm.tm_lock);
++    pt_vcpu_unlock(pt->vcpu);
+ }
+ 
+ static void pt_process_missed_ticks(struct periodic_time *pt)
+@@ -219,7 +228,7 @@ void pt_save_timer(struct vcpu *v)
+     if ( v->pause_flags & VPF_blocked )
+         return;
+ 
+-    spin_lock(&v->arch.hvm.tm_lock);
++    pt_vcpu_lock(v);
+ 
+     list_for_each_entry ( pt, head, list )
+         if ( !pt->do_not_freeze )
+@@ -227,7 +236,7 @@ void pt_save_timer(struct vcpu *v)
+ 
+     pt_freeze_time(v);
+ 
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    pt_vcpu_unlock(v);
+ }
+ 
+ void pt_restore_timer(struct vcpu *v)
+@@ -235,7 +244,7 @@ void pt_restore_timer(struct vcpu *v)
+     struct list_head *head = &v->arch.hvm.tm_list;
+     struct periodic_time *pt;
+ 
+-    spin_lock(&v->arch.hvm.tm_lock);
++    pt_vcpu_lock(v);
+ 
+     list_for_each_entry ( pt, head, list )
+     {
+@@ -248,7 +257,7 @@ void pt_restore_timer(struct vcpu *v)
+ 
+     pt_thaw_time(v);
+ 
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    pt_vcpu_unlock(v);
+ }
+ 
+ static void pt_timer_fn(void *data)
+@@ -309,7 +318,7 @@ int pt_update_irq(struct vcpu *v)
+     int irq, pt_vector = -1;
+     bool level;
+ 
+-    spin_lock(&v->arch.hvm.tm_lock);
++    pt_vcpu_lock(v);
+ 
+     earliest_pt = NULL;
+     max_lag = -1ULL;
+@@ -339,7 +348,7 @@ int pt_update_irq(struct vcpu *v)
+ 
+     if ( earliest_pt == NULL )
+     {
+-        spin_unlock(&v->arch.hvm.tm_lock);
++        pt_vcpu_unlock(v);
+         return -1;
+     }
+ 
+@@ -347,7 +356,7 @@ int pt_update_irq(struct vcpu *v)
+     irq = earliest_pt->irq;
+     level = earliest_pt->level;
+ 
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    pt_vcpu_unlock(v);
+ 
+     switch ( earliest_pt->source )
+     {
+@@ -394,7 +403,7 @@ int pt_update_irq(struct vcpu *v)
+                 time_cb *cb = NULL;
+                 void *cb_priv;
+ 
+-                spin_lock(&v->arch.hvm.tm_lock);
++                pt_vcpu_lock(v);
+                 /* Make sure the timer is still on the list. */
+                 list_for_each_entry ( pt, &v->arch.hvm.tm_list, list )
+                     if ( pt == earliest_pt )
+@@ -404,7 +413,7 @@ int pt_update_irq(struct vcpu *v)
+                         cb_priv = pt->priv;
+                         break;
+                     }
+-                spin_unlock(&v->arch.hvm.tm_lock);
++                pt_vcpu_unlock(v);
+ 
+                 if ( cb != NULL )
+                     cb(v, cb_priv);
+@@ -441,12 +450,12 @@ void pt_intr_post(struct vcpu *v, struct
+     if ( intack.source == hvm_intsrc_vector )
+         return;
+ 
+-    spin_lock(&v->arch.hvm.tm_lock);
++    pt_vcpu_lock(v);
+ 
+     pt = is_pt_irq(v, intack);
+     if ( pt == NULL )
+     {
+-        spin_unlock(&v->arch.hvm.tm_lock);
++        pt_vcpu_unlock(v);
+         return;
+     }
+ 
+@@ -455,7 +464,7 @@ void pt_intr_post(struct vcpu *v, struct
+     cb = pt->cb;
+     cb_priv = pt->priv;
+ 
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    pt_vcpu_unlock(v);
+ 
+     if ( cb != NULL )
+         cb(v, cb_priv);
+@@ -466,12 +475,12 @@ void pt_migrate(struct vcpu *v)
+     struct list_head *head = &v->arch.hvm.tm_list;
+     struct periodic_time *pt;
+ 
+-    spin_lock(&v->arch.hvm.tm_lock);
++    pt_vcpu_lock(v);
+ 
+     list_for_each_entry ( pt, head, list )
+         migrate_timer(&pt->timer, v->processor);
+ 
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    pt_vcpu_unlock(v);
+ }
+ 
+ void create_periodic_time(
+@@ -490,7 +499,7 @@ void create_periodic_time(
+ 
+     destroy_periodic_time(pt);
+ 
+-    spin_lock(&v->arch.hvm.tm_lock);
++    write_lock(&v->domain->arch.hvm.pl_time->pt_migrate);
+ 
+     pt->pending_intr_nr = 0;
+     pt->do_not_freeze = 0;
+@@ -540,7 +549,7 @@ void create_periodic_time(
+     init_timer(&pt->timer, pt_timer_fn, pt, v->processor);
+     set_timer(&pt->timer, pt->scheduled);
+ 
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    write_unlock(&v->domain->arch.hvm.pl_time->pt_migrate);
+ }
+ 
+ void destroy_periodic_time(struct periodic_time *pt)
+@@ -565,30 +574,20 @@ void destroy_periodic_time(struct period
+ 
+ static void pt_adjust_vcpu(struct periodic_time *pt, struct vcpu *v)
+ {
+-    int on_list;
+-
+     ASSERT(pt->source == PTSRC_isa || pt->source == PTSRC_ioapic);
+ 
+     if ( pt->vcpu == NULL )
+         return;
+ 
+-    pt_lock(pt);
+-    on_list = pt->on_list;
+-    if ( pt->on_list )
+-        list_del(&pt->list);
+-    pt->on_list = 0;
+-    pt_unlock(pt);
+-
+-    spin_lock(&v->arch.hvm.tm_lock);
++    write_lock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate);
+     pt->vcpu = v;
+-    if ( on_list )
++    if ( pt->on_list )
+     {
+-        pt->on_list = 1;
++        list_del(&pt->list);
+         list_add(&pt->list, &v->arch.hvm.tm_list);
+-
+         migrate_timer(&pt->timer, v->processor);
+     }
+-    spin_unlock(&v->arch.hvm.tm_lock);
++    write_unlock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate);
+ }
+ 
+ void pt_adjust_global_vcpu_target(struct vcpu *v)
+--- a/xen/include/asm-x86/hvm/vpt.h
++++ b/xen/include/asm-x86/hvm/vpt.h
+@@ -128,6 +128,13 @@ struct pl_time {    /* platform time */
+     struct RTCState  vrtc;
+     struct HPETState vhpet;
+     struct PMTState  vpmt;
++    /*
++     * rwlock to prevent periodic_time vCPU migration. Take the lock in read
++     * mode in order to prevent the vcpu field of periodic_time from changing.
++     * Lock must be taken in write mode when changes to the vcpu field are
++     * performed, as it allows exclusive access to all the timers of a domain.
++     */
++    rwlock_t pt_migrate;
+     /* guest_time = Xen sys time + stime_offset */
+     int64_t stime_offset;
+     /* Ensures monotonicity in appropriate timer modes. */
diff --git a/system/xen/xsa/xsa337-4.13-1.patch b/system/xen/xsa/xsa337-4.13-1.patch
new file mode 100644
index 0000000000..2091626f4f
--- /dev/null
+++ b/system/xen/xsa/xsa337-4.13-1.patch
@@ -0,0 +1,87 @@
+From: Roger Pau Monné <roger.pau@citrix.com>
+Subject: x86/msi: get rid of read_msi_msg
+
+It's safer and faster to just use the cached last written
+(untranslated) MSI message stored in msi_desc for the single user that
+calls read_msi_msg.
+
+This also prevents relying on the data read from the device MSI
+registers in order to figure out the index into the IOMMU interrupt
+remapping table, which is not safe.
+
+This is part of XSA-337.
+
+Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Requested-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/arch/x86/msi.c
++++ b/xen/arch/x86/msi.c
+@@ -183,54 +183,6 @@ void msi_compose_msg(unsigned vector, co
+                 MSI_DATA_VECTOR(vector);
+ }
+
+-static bool read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
+-{
+-    switch ( entry->msi_attrib.type )
+-    {
+-    case PCI_CAP_ID_MSI:
+-    {
+-        struct pci_dev *dev = entry->dev;
+-        int pos = entry->msi_attrib.pos;
+-        uint16_t data;
+-
+-        msg->address_lo = pci_conf_read32(dev->sbdf,
+-                                          msi_lower_address_reg(pos));
+-        if ( entry->msi_attrib.is_64 )
+-        {
+-            msg->address_hi = pci_conf_read32(dev->sbdf,
+-                                              msi_upper_address_reg(pos));
+-            data = pci_conf_read16(dev->sbdf, msi_data_reg(pos, 1));
+-        }
+-        else
+-        {
+-            msg->address_hi = 0;
+-            data = pci_conf_read16(dev->sbdf, msi_data_reg(pos, 0));
+-        }
+-        msg->data = data;
+-        break;
+-    }
+-    case PCI_CAP_ID_MSIX:
+-    {
+-        void __iomem *base = entry->mask_base;
+-
+-        if ( unlikely(!msix_memory_decoded(entry->dev,
+-                                           entry->msi_attrib.pos)) )
+-            return false;
+-        msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
+-        msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
+-        msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET);
+-        break;
+-    }
+-    default:
+-        BUG();
+-    }
+-
+-    if ( iommu_intremap )
+-        iommu_read_msi_from_ire(entry, msg);
+-
+-    return true;
+-}
+-
+ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
+ {
+     entry->msg = *msg;
+@@ -302,10 +254,7 @@ void set_msi_affinity(struct irq_desc *d
+
+     ASSERT(spin_is_locked(&desc->lock));
+
+-    memset(&msg, 0, sizeof(msg));
+-    if ( !read_msi_msg(msi_desc, &msg) )
+-        return;
+-
++    msg = msi_desc->msg;
+     msg.data &= ~MSI_DATA_VECTOR_MASK;
+     msg.data |= MSI_DATA_VECTOR(desc->arch.vector);
+     msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
diff --git a/system/xen/xsa/xsa337-4.13-2.patch b/system/xen/xsa/xsa337-4.13-2.patch
new file mode 100644
index 0000000000..bdefd37cdc
--- /dev/null
+++ b/system/xen/xsa/xsa337-4.13-2.patch
@@ -0,0 +1,181 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: x86/MSI-X: restrict reading of table/PBA bases from BARs
+
+When assigned to less trusted or un-trusted guests, devices may change
+state behind our backs (they may e.g. get reset by means we may not know
+about). Therefore we should avoid reading BARs from hardware once a
+device is no longer owned by Dom0. Furthermore when we can't read a BAR,
+or when we read zero, we shouldn't instead use the caller provided
+address unless that caller can be trusted.
+
+Re-arrange the logic in msix_capability_init() such that only Dom0 (and
+only if the device isn't DomU-owned yet) or calls through
+PHYSDEVOP_prepare_msix will actually result in the reading of the
+respective BAR register(s). Additionally do so only as long as in-use
+table entries are known (note that invocation of PHYSDEVOP_prepare_msix
+counts as a "pseudo" entry). In all other uses the value already
+recorded will get used instead.
+
+Clear the recorded values in _pci_cleanup_msix() as well as on the one
+affected error path. (Adjust this error path to also avoid blindly
+disabling MSI-X when it was enabled on entry to the function.)
+
+While moving around variable declarations (in many cases to reduce their
+scopes), also adjust some of their types.
+
+This is part of XSA-337.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
+
+--- a/xen/arch/x86/msi.c
++++ b/xen/arch/x86/msi.c
+@@ -769,16 +769,14 @@ static int msix_capability_init(struct p
+ {
+     struct arch_msix *msix = dev->msix;
+     struct msi_desc *entry = NULL;
+-    int vf;
+     u16 control;
+     u64 table_paddr;
+     u32 table_offset;
+-    u8 bir, pbus, pslot, pfunc;
+     u16 seg = dev->seg;
+     u8 bus = dev->bus;
+     u8 slot = PCI_SLOT(dev->devfn);
+     u8 func = PCI_FUNC(dev->devfn);
+-    bool maskall = msix->host_maskall;
++    bool maskall = msix->host_maskall, zap_on_error = false;
+     unsigned int pos = pci_find_cap_offset(seg, bus, slot, func,
+                                            PCI_CAP_ID_MSIX);
+ 
+@@ -820,43 +818,45 @@ static int msix_capability_init(struct p
+ 
+     /* Locate MSI-X table region */
+     table_offset = pci_conf_read32(dev->sbdf, msix_table_offset_reg(pos));
+-    bir = (u8)(table_offset & PCI_MSIX_BIRMASK);
+-    table_offset &= ~PCI_MSIX_BIRMASK;
++    if ( !msix->used_entries &&
++         (!msi ||
++          (is_hardware_domain(current->domain) &&
++           (dev->domain == current->domain || dev->domain == dom_io))) )
++    {
++        unsigned int bir = table_offset & PCI_MSIX_BIRMASK, pbus, pslot, pfunc;
++        int vf;
++        paddr_t pba_paddr;
++        unsigned int pba_offset;
+ 
+-    if ( !dev->info.is_virtfn )
+-    {
+-        pbus = bus;
+-        pslot = slot;
+-        pfunc = func;
+-        vf = -1;
+-    }
+-    else
+-    {
+-        pbus = dev->info.physfn.bus;
+-        pslot = PCI_SLOT(dev->info.physfn.devfn);
+-        pfunc = PCI_FUNC(dev->info.physfn.devfn);
+-        vf = PCI_BDF2(dev->bus, dev->devfn);
+-    }
+-
+-    table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf);
+-    WARN_ON(msi && msi->table_base != table_paddr);
+-    if ( !table_paddr )
+-    {
+-        if ( !msi || !msi->table_base )
++        if ( !dev->info.is_virtfn )
+         {
+-            pci_conf_write16(dev->sbdf, msix_control_reg(pos),
+-                             control & ~PCI_MSIX_FLAGS_ENABLE);
+-            xfree(entry);
+-            return -ENXIO;
++            pbus = bus;
++            pslot = slot;
++            pfunc = func;
++            vf = -1;
++        }
++        else
++        {
++            pbus = dev->info.physfn.bus;
++            pslot = PCI_SLOT(dev->info.physfn.devfn);
++            pfunc = PCI_FUNC(dev->info.physfn.devfn);
++            vf = PCI_BDF2(dev->bus, dev->devfn);
+         }
+-        table_paddr = msi->table_base;
+-    }
+-    table_paddr += table_offset;
+ 
+-    if ( !msix->used_entries )
+-    {
+-        u64 pba_paddr;
+-        u32 pba_offset;
++        table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf);
++        WARN_ON(msi && msi->table_base != table_paddr);
++        if ( !table_paddr )
++        {
++            if ( !msi || !msi->table_base )
++            {
++                pci_conf_write16(dev->sbdf, msix_control_reg(pos),
++                                 control & ~PCI_MSIX_FLAGS_ENABLE);
++                xfree(entry);
++                return -ENXIO;
++            }
++            table_paddr = msi->table_base;
++        }
++        table_paddr += table_offset & ~PCI_MSIX_BIRMASK;
+ 
+         msix->table.first = PFN_DOWN(table_paddr);
+         msix->table.last = PFN_DOWN(table_paddr +
+@@ -875,7 +875,18 @@ static int msix_capability_init(struct p
+                                   BITS_TO_LONGS(msix->nr_entries) - 1);
+         WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, msix->pba.first,
+                                         msix->pba.last));
++
++        zap_on_error = true;
++    }
++    else if ( !msix->table.first )
++    {
++        pci_conf_write16(dev->sbdf, msix_control_reg(pos), control);
++        xfree(entry);
++        return -ENODATA;
+     }
++    else
++        table_paddr = (msix->table.first << PAGE_SHIFT) +
++                      (table_offset & ~PCI_MSIX_BIRMASK & ~PAGE_MASK);
+ 
+     if ( entry )
+     {
+@@ -886,8 +897,15 @@ static int msix_capability_init(struct p
+ 
+         if ( idx < 0 )
+         {
+-            pci_conf_write16(dev->sbdf, msix_control_reg(pos),
+-                             control & ~PCI_MSIX_FLAGS_ENABLE);
++            if ( zap_on_error )
++            {
++                msix->table.first = 0;
++                msix->pba.first = 0;
++
++                control &= ~PCI_MSIX_FLAGS_ENABLE;
++            }
++
++            pci_conf_write16(dev->sbdf, msix_control_reg(pos), control);
+             xfree(entry);
+             return idx;
+         }
+@@ -1076,9 +1094,14 @@ static void _pci_cleanup_msix(struct arc
+         if ( rangeset_remove_range(mmio_ro_ranges, msix->table.first,
+                                    msix->table.last) )
+             WARN();
++        msix->table.first = 0;
++        msix->table.last = 0;
++
+         if ( rangeset_remove_range(mmio_ro_ranges, msix->pba.first,
+                                    msix->pba.last) )
+             WARN();
++        msix->pba.first = 0;
++        msix->pba.last = 0;
+     }
+ }
+ 
diff --git a/system/xen/xsa/xsa338.patch b/system/xen/xsa/xsa338.patch
new file mode 100644
index 0000000000..776521990e
--- /dev/null
+++ b/system/xen/xsa/xsa338.patch
@@ -0,0 +1,42 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn: relax port_is_valid()
+
+To avoid ports potentially becoming invalid behind the back of certain
+other functions (due to ->max_evtchn shrinking) because of
+- a guest invoking evtchn_reset() and from a 2nd vCPU opening new
+  channels in parallel (see also XSA-343),
+- alloc_unbound_xen_event_channel() produced channels living above the
+  2-level range (see also XSA-342),
+drop the max_evtchns check from port_is_valid(). For a port for which
+the function once returned "true", the returned value may not turn into
+"false" later on. The function's result may only depend on bounds which
+can only ever grow (which is the case for d->valid_evtchns).
+
+This also eliminates a false sense of safety, utilized by some of the
+users (see again XSA-343): Without a suitable lock held, d->max_evtchns
+may change at any time, and hence deducing that certain other operations
+are safe when port_is_valid() returned true is not legitimate. The
+opportunities to abuse this may get widened by the change here
+(depending on guest and host configuration), but will be taken care of
+by the other XSA.
+
+This is XSA-338.
+
+Fixes: 48974e6ce52e ("evtchn: use a per-domain variable for the max number of event channels")
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Reviewed-by: Julien Grall <jgrall@amazon.com>
+---
+v5: New, split from larger patch.
+
+--- a/xen/include/xen/event.h
++++ b/xen/include/xen/event.h
+@@ -107,8 +107,6 @@ void notify_via_xen_event_channel(struct
+ 
+ static inline bool_t port_is_valid(struct domain *d, unsigned int p)
+ {
+-    if ( p >= d->max_evtchns )
+-        return 0;
+     return p < read_atomic(&d->valid_evtchns);
+ }
+ 
diff --git a/system/xen/xsa/xsa339.patch b/system/xen/xsa/xsa339.patch
new file mode 100644
index 0000000000..3311ae093f
--- /dev/null
+++ b/system/xen/xsa/xsa339.patch
@@ -0,0 +1,76 @@
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Subject: x86/pv: Avoid double exception injection
+
+There is at least one path (SYSENTER with NT set, Xen converts to #GP) which
+ends up injecting the #GP fault twice, first in compat_sysenter(), and then a
+second time in compat_test_all_events(), due to the stale TBF_EXCEPTION left
+in TRAPBOUNCE_flags.
+
+The guest kernel sees the second fault first, which is a kernel level #GP
+pointing at the head of the #GP handler, and is therefore a userspace
+trigger-able DoS.
+
+This particular bug has bitten us several times before, so rearrange
+{compat_,}create_bounce_frame() to clobber TRAPBOUNCE on success, rather than
+leaving this task to one area of code which isn't used uniformly.
+
+Other scenarios which might result in a double injection (e.g. two calls
+directly to compat_create_bounce_frame) will now crash the guest, which is far
+more obvious than letting the kernel run with corrupt state.
+
+This is XSA-339
+
+Fixes: fdac9515607b ("x86: clear EFLAGS.NT in SYSENTER entry path")
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
+index c3e62f8734..73619f57ca 100644
+--- a/xen/arch/x86/x86_64/compat/entry.S
++++ b/xen/arch/x86/x86_64/compat/entry.S
+@@ -78,7 +78,6 @@ compat_process_softirqs:
+         sti
+ .Lcompat_bounce_exception:
+         call  compat_create_bounce_frame
+-        movb  $0, TRAPBOUNCE_flags(%rdx)
+         jmp   compat_test_all_events
+ 
+ 	ALIGN
+@@ -352,7 +351,13 @@ __UNLIKELY_END(compat_bounce_null_selector)
+         movl  %eax,UREGS_cs+8(%rsp)
+         movl  TRAPBOUNCE_eip(%rdx),%eax
+         movl  %eax,UREGS_rip+8(%rsp)
++
++        /* Trapbounce complete.  Clobber state to avoid an erroneous second injection. */
++        xor   %eax, %eax
++        mov   %ax,  TRAPBOUNCE_cs(%rdx)
++        mov   %al,  TRAPBOUNCE_flags(%rdx)
+         ret
++
+ .section .fixup,"ax"
+ .Lfx13:
+         xorl  %edi,%edi
+diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
+index 1e880eb9f6..71a00e846b 100644
+--- a/xen/arch/x86/x86_64/entry.S
++++ b/xen/arch/x86/x86_64/entry.S
+@@ -90,7 +90,6 @@ process_softirqs:
+         sti
+ .Lbounce_exception:
+         call  create_bounce_frame
+-        movb  $0, TRAPBOUNCE_flags(%rdx)
+         jmp   test_all_events
+ 
+         ALIGN
+@@ -512,6 +511,11 @@ UNLIKELY_START(z, create_bounce_frame_bad_bounce_ip)
+         jmp   asm_domain_crash_synchronous  /* Does not return */
+ __UNLIKELY_END(create_bounce_frame_bad_bounce_ip)
+         movq  %rax,UREGS_rip+8(%rsp)
++
++        /* Trapbounce complete.  Clobber state to avoid an erroneous second injection. */
++        xor   %eax, %eax
++        mov   %rax, TRAPBOUNCE_eip(%rdx)
++        mov   %al,  TRAPBOUNCE_flags(%rdx)
+         ret
+ 
+         .pushsection .fixup, "ax", @progbits
diff --git a/system/xen/xsa/xsa340.patch b/system/xen/xsa/xsa340.patch
new file mode 100644
index 0000000000..38d04da465
--- /dev/null
+++ b/system/xen/xsa/xsa340.patch
@@ -0,0 +1,65 @@
+From: Julien Grall <jgrall@amazon.com>
+Subject: xen/evtchn: Add missing barriers when accessing/allocating an event channel
+
+While the allocation of a bucket is always performed with the per-domain
+lock, the bucket may be accessed without the lock taken (for instance, see
+evtchn_send()).
+
+Instead such sites relies on port_is_valid() to return a non-zero value
+when the port has a struct evtchn associated to it. The function will
+mostly check whether the port is less than d->valid_evtchns as all the
+buckets/event channels should be allocated up to that point.
+
+Unfortunately a compiler is free to re-order the assignment in
+evtchn_allocate_port() so it would be possible to have d->valid_evtchns
+updated before the new bucket has finish to allocate.
+
+Additionally on Arm, even if this was compiled "correctly", the
+processor can still re-order the memory access.
+
+Add a write memory barrier in the allocation side and a read memory
+barrier when the port is valid to prevent any re-ordering issue.
+
+This is XSA-340.
+
+Reported-by: Julien Grall <jgrall@amazon.com>
+Signed-off-by: Julien Grall <jgrall@amazon.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -178,6 +178,13 @@ int evtchn_allocate_port(struct domain *
+             return -ENOMEM;
+         bucket_from_port(d, port) = chn;
+
++        /*
++         * d->valid_evtchns is used to check whether the bucket can be
++         * accessed without the per-domain lock. Therefore,
++         * d->valid_evtchns should be seen *after* the new bucket has
++         * been setup.
++         */
++        smp_wmb();
+         write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET);
+     }
+
+--- a/xen/include/xen/event.h
++++ b/xen/include/xen/event.h
+@@ -107,7 +107,17 @@ void notify_via_xen_event_channel(struct
+
+ static inline bool_t port_is_valid(struct domain *d, unsigned int p)
+ {
+-    return p < read_atomic(&d->valid_evtchns);
++    if ( p >= read_atomic(&d->valid_evtchns) )
++        return false;
++
++    /*
++     * The caller will usually access the event channel afterwards and
++     * may be done without taking the per-domain lock. The barrier is
++     * going in pair the smp_wmb() barrier in evtchn_allocate_port().
++     */
++    smp_rmb();
++
++    return true;
+ }
+
+ static inline struct evtchn *evtchn_from_port(struct domain *d, unsigned int p)
diff --git a/system/xen/xsa/xsa342-4.13.patch b/system/xen/xsa/xsa342-4.13.patch
new file mode 100644
index 0000000000..334baf1b69
--- /dev/null
+++ b/system/xen/xsa/xsa342-4.13.patch
@@ -0,0 +1,145 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn/x86: enforce correct upper limit for 32-bit guests
+
+The recording of d->max_evtchns in evtchn_2l_init(), in particular with
+the limited set of callers of the function, is insufficient. Neither for
+PV nor for HVM guests the bitness is known at domain_create() time, yet
+the upper bound in 2-level mode depends upon guest bitness. Recording
+too high a limit "allows" x86 32-bit domains to open not properly usable
+event channels, management of which (inside Xen) would then result in
+corruption of the shared info and vCPU info structures.
+
+Keep the upper limit dynamic for the 2-level case, introducing a helper
+function to retrieve the effective limit. This helper is now supposed to
+be private to the event channel code. The used in do_poll() and
+domain_dump_evtchn_info() weren't consistent with port uses elsewhere
+and hence get switched to port_is_valid().
+
+Furthermore FIFO mode's setup_ports() gets adjusted to loop only up to
+the prior ABI limit, rather than all the way up to the new one.
+
+Finally a word on the change to do_poll(): Accessing ->max_evtchns
+without holding a suitable lock was never safe, as it as well as
+->evtchn_port_ops may change behind do_poll()'s back. Using
+port_is_valid() instead widens some the window for potential abuse,
+until we've dealt with the race altogether (see XSA-343).
+
+This is XSA-342.
+
+Reported-by: Julien Grall <jgrall@amazon.com>
+Fixes: 48974e6ce52e ("evtchn: use a per-domain variable for the max number of event channels")
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Reviewed-by: Julien Grall <jgrall@amazon.com>
+
+--- a/xen/common/event_2l.c
++++ b/xen/common/event_2l.c
+@@ -103,7 +103,6 @@ static const struct evtchn_port_ops evtc
+ void evtchn_2l_init(struct domain *d)
+ {
+     d->evtchn_port_ops = &evtchn_port_ops_2l;
+-    d->max_evtchns = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
+ }
+ 
+ /*
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -151,7 +151,7 @@ static void free_evtchn_bucket(struct do
+ 
+ int evtchn_allocate_port(struct domain *d, evtchn_port_t port)
+ {
+-    if ( port > d->max_evtchn_port || port >= d->max_evtchns )
++    if ( port > d->max_evtchn_port || port >= max_evtchns(d) )
+         return -ENOSPC;
+ 
+     if ( port_is_valid(d, port) )
+@@ -1396,13 +1396,11 @@ static void domain_dump_evtchn_info(stru
+ 
+     spin_lock(&d->event_lock);
+ 
+-    for ( port = 1; port < d->max_evtchns; ++port )
++    for ( port = 1; port_is_valid(d, port); ++port )
+     {
+         const struct evtchn *chn;
+         char *ssid;
+ 
+-        if ( !port_is_valid(d, port) )
+-            continue;
+         chn = evtchn_from_port(d, port);
+         if ( chn->state == ECS_FREE )
+             continue;
+--- a/xen/common/event_fifo.c
++++ b/xen/common/event_fifo.c
+@@ -478,7 +478,7 @@ static void cleanup_event_array(struct d
+     d->evtchn_fifo = NULL;
+ }
+ 
+-static void setup_ports(struct domain *d)
++static void setup_ports(struct domain *d, unsigned int prev_evtchns)
+ {
+     unsigned int port;
+ 
+@@ -488,7 +488,7 @@ static void setup_ports(struct domain *d
+      * - save its pending state.
+      * - set default priority.
+      */
+-    for ( port = 1; port < d->max_evtchns; port++ )
++    for ( port = 1; port < prev_evtchns; port++ )
+     {
+         struct evtchn *evtchn;
+ 
+@@ -546,6 +546,8 @@ int evtchn_fifo_init_control(struct evtc
+     if ( !d->evtchn_fifo )
+     {
+         struct vcpu *vcb;
++        /* Latch the value before it changes during setup_event_array(). */
++        unsigned int prev_evtchns = max_evtchns(d);
+ 
+         for_each_vcpu ( d, vcb ) {
+             rc = setup_control_block(vcb);
+@@ -562,8 +564,7 @@ int evtchn_fifo_init_control(struct evtc
+             goto error;
+ 
+         d->evtchn_port_ops = &evtchn_port_ops_fifo;
+-        d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS;
+-        setup_ports(d);
++        setup_ports(d, prev_evtchns);
+     }
+     else
+         rc = map_control_block(v, gfn, offset);
+--- a/xen/common/schedule.c
++++ b/xen/common/schedule.c
+@@ -1434,7 +1434,7 @@ static long do_poll(struct sched_poll *s
+             goto out;
+ 
+         rc = -EINVAL;
+-        if ( port >= d->max_evtchns )
++        if ( !port_is_valid(d, port) )
+             goto out;
+ 
+         rc = 0;
+--- a/xen/include/xen/event.h
++++ b/xen/include/xen/event.h
+@@ -105,6 +105,12 @@ void notify_via_xen_event_channel(struct
+ #define bucket_from_port(d, p) \
+     ((group_from_port(d, p))[((p) % EVTCHNS_PER_GROUP) / EVTCHNS_PER_BUCKET])
+ 
++static inline unsigned int max_evtchns(const struct domain *d)
++{
++    return d->evtchn_fifo ? EVTCHN_FIFO_NR_CHANNELS
++                          : BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
++}
++
+ static inline bool_t port_is_valid(struct domain *d, unsigned int p)
+ {
+     if ( p >= read_atomic(&d->valid_evtchns) )
+--- a/xen/include/xen/sched.h
++++ b/xen/include/xen/sched.h
+@@ -382,7 +382,6 @@ struct domain
+     /* Event channel information. */
+     struct evtchn   *evtchn;                         /* first bucket only */
+     struct evtchn  **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */
+-    unsigned int     max_evtchns;     /* number supported by ABI */
+     unsigned int     max_evtchn_port; /* max permitted port number */
+     unsigned int     valid_evtchns;   /* number of allocated event channels */
+     spinlock_t       event_lock;
diff --git a/system/xen/xsa/xsa343-1.patch b/system/xen/xsa/xsa343-1.patch
new file mode 100644
index 0000000000..0abbc03e8d
--- /dev/null
+++ b/system/xen/xsa/xsa343-1.patch
@@ -0,0 +1,199 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn: evtchn_reset() shouldn't succeed with still-open ports
+
+While the function closes all ports, it does so without holding any
+lock, and hence racing requests may be issued causing new ports to get
+opened. This would have been problematic in particular if such a newly
+opened port had a port number above the new implementation limit (i.e.
+when switching from FIFO to 2-level) after the reset, as prior to
+"evtchn: relax port_is_valid()" this could have led to e.g.
+evtchn_close()'s "BUG_ON(!port_is_valid(d2, port2))" to trigger.
+
+Introduce a counter of active ports and check that it's (still) no
+larger then the number of Xen internally used ones after obtaining the
+necessary lock in evtchn_reset().
+
+As to the access model of the new {active,xen}_evtchns fields - while
+all writes get done using write_atomic(), reads ought to use
+read_atomic() only when outside of a suitably locked region.
+
+Note that as of now evtchn_bind_virq() and evtchn_bind_ipi() don't have
+a need to call check_free_port().
+
+This is part of XSA-343.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Reviewed-by: Julien Grall <jgrall@amazon.com>
+---
+v7: Drop optimization from evtchn_reset().
+v6: Fix loop exit condition in evtchn_reset(). Use {read,write}_atomic()
+    also for xen_evtchns.
+v5: Move increment in alloc_unbound_xen_event_channel() out of the inner
+    locked region.
+v4: Account for Xen internal ports.
+v3: Document intended access next to new struct field.
+v2: Add comment to check_free_port(). Drop commented out calls.
+
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -188,6 +188,8 @@ int evtchn_allocate_port(struct domain *
+         write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET);
+     }
+ 
++    write_atomic(&d->active_evtchns, d->active_evtchns + 1);
++
+     return 0;
+ }
+ 
+@@ -211,11 +213,26 @@ static int get_free_port(struct domain *
+     return -ENOSPC;
+ }
+ 
++/*
++ * Check whether a port is still marked free, and if so update the domain
++ * counter accordingly.  To be used on function exit paths.
++ */
++static void check_free_port(struct domain *d, evtchn_port_t port)
++{
++    if ( port_is_valid(d, port) &&
++         evtchn_from_port(d, port)->state == ECS_FREE )
++        write_atomic(&d->active_evtchns, d->active_evtchns - 1);
++}
++
+ void evtchn_free(struct domain *d, struct evtchn *chn)
+ {
+     /* Clear pending event to avoid unexpected behavior on re-bind. */
+     evtchn_port_clear_pending(d, chn);
+ 
++    if ( consumer_is_xen(chn) )
++        write_atomic(&d->xen_evtchns, d->xen_evtchns - 1);
++    write_atomic(&d->active_evtchns, d->active_evtchns - 1);
++
+     /* Reset binding to vcpu0 when the channel is freed. */
+     chn->state          = ECS_FREE;
+     chn->notify_vcpu_id = 0;
+@@ -258,6 +275,7 @@ static long evtchn_alloc_unbound(evtchn_
+     alloc->port = port;
+ 
+  out:
++    check_free_port(d, port);
+     spin_unlock(&d->event_lock);
+     rcu_unlock_domain(d);
+ 
+@@ -351,6 +369,7 @@ static long evtchn_bind_interdomain(evtc
+     bind->local_port = lport;
+ 
+  out:
++    check_free_port(ld, lport);
+     spin_unlock(&ld->event_lock);
+     if ( ld != rd )
+         spin_unlock(&rd->event_lock);
+@@ -488,7 +507,7 @@ static long evtchn_bind_pirq(evtchn_bind
+     struct domain *d = current->domain;
+     struct vcpu   *v = d->vcpu[0];
+     struct pirq   *info;
+-    int            port, pirq = bind->pirq;
++    int            port = 0, pirq = bind->pirq;
+     long           rc;
+ 
+     if ( (pirq < 0) || (pirq >= d->nr_pirqs) )
+@@ -536,6 +555,7 @@ static long evtchn_bind_pirq(evtchn_bind
+     arch_evtchn_bind_pirq(d, pirq);
+ 
+  out:
++    check_free_port(d, port);
+     spin_unlock(&d->event_lock);
+ 
+     return rc;
+@@ -1011,10 +1031,10 @@ int evtchn_unmask(unsigned int port)
+     return 0;
+ }
+ 
+-
+ int evtchn_reset(struct domain *d)
+ {
+     unsigned int i;
++    int rc = 0;
+ 
+     if ( d != current->domain && !d->controller_pause_count )
+         return -EINVAL;
+@@ -1024,7 +1044,9 @@ int evtchn_reset(struct domain *d)
+ 
+     spin_lock(&d->event_lock);
+ 
+-    if ( d->evtchn_fifo )
++    if ( d->active_evtchns > d->xen_evtchns )
++        rc = -EAGAIN;
++    else if ( d->evtchn_fifo )
+     {
+         /* Switching back to 2-level ABI. */
+         evtchn_fifo_destroy(d);
+@@ -1033,7 +1055,7 @@ int evtchn_reset(struct domain *d)
+ 
+     spin_unlock(&d->event_lock);
+ 
+-    return 0;
++    return rc;
+ }
+ 
+ static long evtchn_set_priority(const struct evtchn_set_priority *set_priority)
+@@ -1219,10 +1241,9 @@ int alloc_unbound_xen_event_channel(
+ 
+     spin_lock(&ld->event_lock);
+ 
+-    rc = get_free_port(ld);
++    port = rc = get_free_port(ld);
+     if ( rc < 0 )
+         goto out;
+-    port = rc;
+     chn = evtchn_from_port(ld, port);
+ 
+     rc = xsm_evtchn_unbound(XSM_TARGET, ld, chn, remote_domid);
+@@ -1238,7 +1259,10 @@ int alloc_unbound_xen_event_channel(
+ 
+     spin_unlock(&chn->lock);
+ 
++    write_atomic(&ld->xen_evtchns, ld->xen_evtchns + 1);
++
+  out:
++    check_free_port(ld, port);
+     spin_unlock(&ld->event_lock);
+ 
+     return rc < 0 ? rc : port;
+@@ -1314,6 +1338,7 @@ int evtchn_init(struct domain *d, unsign
+         return -EINVAL;
+     }
+     evtchn_from_port(d, 0)->state = ECS_RESERVED;
++    write_atomic(&d->active_evtchns, 0);
+ 
+ #if MAX_VIRT_CPUS > BITS_PER_LONG
+     d->poll_mask = xzalloc_array(unsigned long, BITS_TO_LONGS(d->max_vcpus));
+@@ -1340,6 +1365,8 @@ void evtchn_destroy(struct domain *d)
+     for ( i = 0; port_is_valid(d, i); i++ )
+         evtchn_close(d, i, 0);
+ 
++    ASSERT(!d->active_evtchns);
++
+     clear_global_virq_handlers(d);
+ 
+     evtchn_fifo_destroy(d);
+--- a/xen/include/xen/sched.h
++++ b/xen/include/xen/sched.h
+@@ -361,6 +361,16 @@ struct domain
+     struct evtchn  **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */
+     unsigned int     max_evtchn_port; /* max permitted port number */
+     unsigned int     valid_evtchns;   /* number of allocated event channels */
++    /*
++     * Number of in-use event channels.  Writers should use write_atomic().
++     * Readers need to use read_atomic() only when not holding event_lock.
++     */
++    unsigned int     active_evtchns;
++    /*
++     * Number of event channels used internally by Xen (not subject to
++     * EVTCHNOP_reset).  Read/write access like for active_evtchns.
++     */
++    unsigned int     xen_evtchns;
+     spinlock_t       event_lock;
+     const struct evtchn_port_ops *evtchn_port_ops;
+     struct evtchn_fifo_domain *evtchn_fifo;
diff --git a/system/xen/xsa/xsa343-2.patch b/system/xen/xsa/xsa343-2.patch
new file mode 100644
index 0000000000..b8eb4998f1
--- /dev/null
+++ b/system/xen/xsa/xsa343-2.patch
@@ -0,0 +1,295 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn: convert per-channel lock to be IRQ-safe
+
+... in order for send_guest_{global,vcpu}_virq() to be able to make use
+of it.
+
+This is part of XSA-343.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+---
+v6: New.
+---
+TBD: This is the "dumb" conversion variant. In a couple of cases the
+     slightly simpler spin_{,un}lock_irq() could apparently be used.
+
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -248,6 +248,7 @@ static long evtchn_alloc_unbound(evtchn_
+     int            port;
+     domid_t        dom = alloc->dom;
+     long           rc;
++    unsigned long  flags;
+ 
+     d = rcu_lock_domain_by_any_id(dom);
+     if ( d == NULL )
+@@ -263,14 +264,14 @@ static long evtchn_alloc_unbound(evtchn_
+     if ( rc )
+         goto out;
+ 
+-    spin_lock(&chn->lock);
++    spin_lock_irqsave(&chn->lock, flags);
+ 
+     chn->state = ECS_UNBOUND;
+     if ( (chn->u.unbound.remote_domid = alloc->remote_dom) == DOMID_SELF )
+         chn->u.unbound.remote_domid = current->domain->domain_id;
+     evtchn_port_init(d, chn);
+ 
+-    spin_unlock(&chn->lock);
++    spin_unlock_irqrestore(&chn->lock, flags);
+ 
+     alloc->port = port;
+ 
+@@ -283,26 +284,32 @@ static long evtchn_alloc_unbound(evtchn_
+ }
+ 
+ 
+-static void double_evtchn_lock(struct evtchn *lchn, struct evtchn *rchn)
++static unsigned long double_evtchn_lock(struct evtchn *lchn,
++                                        struct evtchn *rchn)
+ {
+-    if ( lchn < rchn )
++    unsigned long flags;
++
++    if ( lchn <= rchn )
+     {
+-        spin_lock(&lchn->lock);
+-        spin_lock(&rchn->lock);
++        spin_lock_irqsave(&lchn->lock, flags);
++        if ( lchn != rchn )
++            spin_lock(&rchn->lock);
+     }
+     else
+     {
+-        if ( lchn != rchn )
+-            spin_lock(&rchn->lock);
++        spin_lock_irqsave(&rchn->lock, flags);
+         spin_lock(&lchn->lock);
+     }
++
++    return flags;
+ }
+ 
+-static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn)
++static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn,
++                                 unsigned long flags)
+ {
+-    spin_unlock(&lchn->lock);
+     if ( lchn != rchn )
+-        spin_unlock(&rchn->lock);
++        spin_unlock(&lchn->lock);
++    spin_unlock_irqrestore(&rchn->lock, flags);
+ }
+ 
+ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind)
+@@ -312,6 +319,7 @@ static long evtchn_bind_interdomain(evtc
+     int            lport, rport = bind->remote_port;
+     domid_t        rdom = bind->remote_dom;
+     long           rc;
++    unsigned long  flags;
+ 
+     if ( rdom == DOMID_SELF )
+         rdom = current->domain->domain_id;
+@@ -347,7 +355,7 @@ static long evtchn_bind_interdomain(evtc
+     if ( rc )
+         goto out;
+ 
+-    double_evtchn_lock(lchn, rchn);
++    flags = double_evtchn_lock(lchn, rchn);
+ 
+     lchn->u.interdomain.remote_dom  = rd;
+     lchn->u.interdomain.remote_port = rport;
+@@ -364,7 +372,7 @@ static long evtchn_bind_interdomain(evtc
+      */
+     evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn);
+ 
+-    double_evtchn_unlock(lchn, rchn);
++    double_evtchn_unlock(lchn, rchn, flags);
+ 
+     bind->local_port = lport;
+ 
+@@ -387,6 +395,7 @@ int evtchn_bind_virq(evtchn_bind_virq_t
+     struct domain *d = current->domain;
+     int            virq = bind->virq, vcpu = bind->vcpu;
+     int            rc = 0;
++    unsigned long  flags;
+ 
+     if ( (virq < 0) || (virq >= ARRAY_SIZE(v->virq_to_evtchn)) )
+         return -EINVAL;
+@@ -424,14 +433,14 @@ int evtchn_bind_virq(evtchn_bind_virq_t
+ 
+     chn = evtchn_from_port(d, port);
+ 
+-    spin_lock(&chn->lock);
++    spin_lock_irqsave(&chn->lock, flags);
+ 
+     chn->state          = ECS_VIRQ;
+     chn->notify_vcpu_id = vcpu;
+     chn->u.virq         = virq;
+     evtchn_port_init(d, chn);
+ 
+-    spin_unlock(&chn->lock);
++    spin_unlock_irqrestore(&chn->lock, flags);
+ 
+     v->virq_to_evtchn[virq] = bind->port = port;
+ 
+@@ -448,6 +457,7 @@ static long evtchn_bind_ipi(evtchn_bind_
+     struct domain *d = current->domain;
+     int            port, vcpu = bind->vcpu;
+     long           rc = 0;
++    unsigned long  flags;
+ 
+     if ( domain_vcpu(d, vcpu) == NULL )
+         return -ENOENT;
+@@ -459,13 +469,13 @@ static long evtchn_bind_ipi(evtchn_bind_
+ 
+     chn = evtchn_from_port(d, port);
+ 
+-    spin_lock(&chn->lock);
++    spin_lock_irqsave(&chn->lock, flags);
+ 
+     chn->state          = ECS_IPI;
+     chn->notify_vcpu_id = vcpu;
+     evtchn_port_init(d, chn);
+ 
+-    spin_unlock(&chn->lock);
++    spin_unlock_irqrestore(&chn->lock, flags);
+ 
+     bind->port = port;
+ 
+@@ -509,6 +519,7 @@ static long evtchn_bind_pirq(evtchn_bind
+     struct pirq   *info;
+     int            port = 0, pirq = bind->pirq;
+     long           rc;
++    unsigned long  flags;
+ 
+     if ( (pirq < 0) || (pirq >= d->nr_pirqs) )
+         return -EINVAL;
+@@ -541,14 +552,14 @@ static long evtchn_bind_pirq(evtchn_bind
+         goto out;
+     }
+ 
+-    spin_lock(&chn->lock);
++    spin_lock_irqsave(&chn->lock, flags);
+ 
+     chn->state  = ECS_PIRQ;
+     chn->u.pirq.irq = pirq;
+     link_pirq_port(port, chn, v);
+     evtchn_port_init(d, chn);
+ 
+-    spin_unlock(&chn->lock);
++    spin_unlock_irqrestore(&chn->lock, flags);
+ 
+     bind->port = port;
+ 
+@@ -569,6 +580,7 @@ int evtchn_close(struct domain *d1, int
+     struct evtchn *chn1, *chn2;
+     int            port2;
+     long           rc = 0;
++    unsigned long  flags;
+ 
+  again:
+     spin_lock(&d1->event_lock);
+@@ -668,14 +680,14 @@ int evtchn_close(struct domain *d1, int
+         BUG_ON(chn2->state != ECS_INTERDOMAIN);
+         BUG_ON(chn2->u.interdomain.remote_dom != d1);
+ 
+-        double_evtchn_lock(chn1, chn2);
++        flags = double_evtchn_lock(chn1, chn2);
+ 
+         evtchn_free(d1, chn1);
+ 
+         chn2->state = ECS_UNBOUND;
+         chn2->u.unbound.remote_domid = d1->domain_id;
+ 
+-        double_evtchn_unlock(chn1, chn2);
++        double_evtchn_unlock(chn1, chn2, flags);
+ 
+         goto out;
+ 
+@@ -683,9 +695,9 @@ int evtchn_close(struct domain *d1, int
+         BUG();
+     }
+ 
+-    spin_lock(&chn1->lock);
++    spin_lock_irqsave(&chn1->lock, flags);
+     evtchn_free(d1, chn1);
+-    spin_unlock(&chn1->lock);
++    spin_unlock_irqrestore(&chn1->lock, flags);
+ 
+  out:
+     if ( d2 != NULL )
+@@ -705,13 +717,14 @@ int evtchn_send(struct domain *ld, unsig
+     struct evtchn *lchn, *rchn;
+     struct domain *rd;
+     int            rport, ret = 0;
++    unsigned long  flags;
+ 
+     if ( !port_is_valid(ld, lport) )
+         return -EINVAL;
+ 
+     lchn = evtchn_from_port(ld, lport);
+ 
+-    spin_lock(&lchn->lock);
++    spin_lock_irqsave(&lchn->lock, flags);
+ 
+     /* Guest cannot send via a Xen-attached event channel. */
+     if ( unlikely(consumer_is_xen(lchn)) )
+@@ -746,7 +759,7 @@ int evtchn_send(struct domain *ld, unsig
+     }
+ 
+ out:
+-    spin_unlock(&lchn->lock);
++    spin_unlock_irqrestore(&lchn->lock, flags);
+ 
+     return ret;
+ }
+@@ -1238,6 +1251,7 @@ int alloc_unbound_xen_event_channel(
+ {
+     struct evtchn *chn;
+     int            port, rc;
++    unsigned long  flags;
+ 
+     spin_lock(&ld->event_lock);
+ 
+@@ -1250,14 +1264,14 @@ int alloc_unbound_xen_event_channel(
+     if ( rc )
+         goto out;
+ 
+-    spin_lock(&chn->lock);
++    spin_lock_irqsave(&chn->lock, flags);
+ 
+     chn->state = ECS_UNBOUND;
+     chn->xen_consumer = get_xen_consumer(notification_fn);
+     chn->notify_vcpu_id = lvcpu;
+     chn->u.unbound.remote_domid = remote_domid;
+ 
+-    spin_unlock(&chn->lock);
++    spin_unlock_irqrestore(&chn->lock, flags);
+ 
+     write_atomic(&ld->xen_evtchns, ld->xen_evtchns + 1);
+ 
+@@ -1280,11 +1294,12 @@ void notify_via_xen_event_channel(struct
+ {
+     struct evtchn *lchn, *rchn;
+     struct domain *rd;
++    unsigned long flags;
+ 
+     ASSERT(port_is_valid(ld, lport));
+     lchn = evtchn_from_port(ld, lport);
+ 
+-    spin_lock(&lchn->lock);
++    spin_lock_irqsave(&lchn->lock, flags);
+ 
+     if ( likely(lchn->state == ECS_INTERDOMAIN) )
+     {
+@@ -1294,7 +1309,7 @@ void notify_via_xen_event_channel(struct
+         evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn);
+     }
+ 
+-    spin_unlock(&lchn->lock);
++    spin_unlock_irqrestore(&lchn->lock, flags);
+ }
+ 
+ void evtchn_check_pollers(struct domain *d, unsigned int port)
diff --git a/system/xen/xsa/xsa343-3.patch b/system/xen/xsa/xsa343-3.patch
new file mode 100644
index 0000000000..e513e308eb
--- /dev/null
+++ b/system/xen/xsa/xsa343-3.patch
@@ -0,0 +1,392 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn: address races with evtchn_reset()
+
+Neither d->evtchn_port_ops nor max_evtchns(d) may be used in an entirely
+lock-less manner, as both may change by a racing evtchn_reset(). In the
+common case, at least one of the domain's event lock or the per-channel
+lock needs to be held. In the specific case of the inter-domain sending
+by evtchn_send() and notify_via_xen_event_channel() holding the other
+side's per-channel lock is sufficient, as the channel can't change state
+without both per-channel locks held. Without such a channel changing
+state, evtchn_reset() can't complete successfully.
+
+Lock-free accesses continue to be permitted for the shim (calling some
+otherwise internal event channel functions), as this happens while the
+domain is in effectively single-threaded mode. Special care also needs
+taking for the shim's marking of in-use ports as ECS_RESERVED (allowing
+use of such ports in the shim case is okay because switching into and
+hence also out of FIFO mode is impossihble there).
+
+As a side effect, certain operations on Xen bound event channels which
+were mistakenly permitted so far (e.g. unmask or poll) will be refused
+now.
+
+This is part of XSA-343.
+
+Reported-by: Julien Grall <jgrall@amazon.com>
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+---
+v9: Add arch_evtchn_is_special() to fix PV shim.
+v8: Add BUILD_BUG_ON() in evtchn_usable().
+v7: Add locking related comment ahead of struct evtchn_port_ops.
+v6: New.
+---
+TBD: I've been considering to move some of the wrappers from xen/event.h
+     into event_channel.c (or even drop them altogether), when they
+     require external locking (e.g. evtchn_port_init() or
+     evtchn_port_set_priority()). Does anyone have a strong opinion
+     either way?
+
+--- a/xen/arch/x86/irq.c
++++ b/xen/arch/x86/irq.c
+@@ -2488,14 +2488,24 @@ static void dump_irqs(unsigned char key)
+ 
+             for ( i = 0; i < action->nr_guests; )
+             {
++                struct evtchn *evtchn;
++                unsigned int pending = 2, masked = 2;
++
+                 d = action->guest[i++];
+                 pirq = domain_irq_to_pirq(d, irq);
+                 info = pirq_info(d, pirq);
++                evtchn = evtchn_from_port(d, info->evtchn);
++                local_irq_disable();
++                if ( spin_trylock(&evtchn->lock) )
++                {
++                    pending = evtchn_is_pending(d, evtchn);
++                    masked = evtchn_is_masked(d, evtchn);
++                    spin_unlock(&evtchn->lock);
++                }
++                local_irq_enable();
+                 printk("d%d:%3d(%c%c%c)%c",
+-                       d->domain_id, pirq,
+-                       evtchn_port_is_pending(d, info->evtchn) ? 'P' : '-',
+-                       evtchn_port_is_masked(d, info->evtchn) ? 'M' : '-',
+-                       info->masked ? 'M' : '-',
++                       d->domain_id, pirq, "-P?"[pending],
++                       "-M?"[masked], info->masked ? 'M' : '-',
+                        i < action->nr_guests ? ',' : '\n');
+             }
+         }
+--- a/xen/arch/x86/pv/shim.c
++++ b/xen/arch/x86/pv/shim.c
+@@ -660,8 +660,11 @@ void pv_shim_inject_evtchn(unsigned int
+     if ( port_is_valid(guest, port) )
+     {
+         struct evtchn *chn = evtchn_from_port(guest, port);
++        unsigned long flags;
+ 
++        spin_lock_irqsave(&chn->lock, flags);
+         evtchn_port_set_pending(guest, chn->notify_vcpu_id, chn);
++        spin_unlock_irqrestore(&chn->lock, flags);
+     }
+ }
+ 
+--- a/xen/common/event_2l.c
++++ b/xen/common/event_2l.c
+@@ -63,8 +63,10 @@ static void evtchn_2l_unmask(struct doma
+     }
+ }
+ 
+-static bool evtchn_2l_is_pending(const struct domain *d, evtchn_port_t port)
++static bool evtchn_2l_is_pending(const struct domain *d,
++                                 const struct evtchn *evtchn)
+ {
++    evtchn_port_t port = evtchn->port;
+     unsigned int max_ports = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
+ 
+     ASSERT(port < max_ports);
+@@ -72,8 +74,10 @@ static bool evtchn_2l_is_pending(const s
+             guest_test_bit(d, port, &shared_info(d, evtchn_pending)));
+ }
+ 
+-static bool evtchn_2l_is_masked(const struct domain *d, evtchn_port_t port)
++static bool evtchn_2l_is_masked(const struct domain *d,
++                                const struct evtchn *evtchn)
+ {
++    evtchn_port_t port = evtchn->port;
+     unsigned int max_ports = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
+ 
+     ASSERT(port < max_ports);
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -156,8 +156,9 @@ int evtchn_allocate_port(struct domain *
+ 
+     if ( port_is_valid(d, port) )
+     {
+-        if ( evtchn_from_port(d, port)->state != ECS_FREE ||
+-             evtchn_port_is_busy(d, port) )
++        const struct evtchn *chn = evtchn_from_port(d, port);
++
++        if ( chn->state != ECS_FREE || evtchn_is_busy(d, chn) )
+             return -EBUSY;
+     }
+     else
+@@ -774,6 +775,7 @@ void send_guest_vcpu_virq(struct vcpu *v
+     unsigned long flags;
+     int port;
+     struct domain *d;
++    struct evtchn *chn;
+ 
+     ASSERT(!virq_is_global(virq));
+ 
+@@ -784,7 +786,10 @@ void send_guest_vcpu_virq(struct vcpu *v
+         goto out;
+ 
+     d = v->domain;
+-    evtchn_port_set_pending(d, v->vcpu_id, evtchn_from_port(d, port));
++    chn = evtchn_from_port(d, port);
++    spin_lock(&chn->lock);
++    evtchn_port_set_pending(d, v->vcpu_id, chn);
++    spin_unlock(&chn->lock);
+ 
+  out:
+     spin_unlock_irqrestore(&v->virq_lock, flags);
+@@ -813,7 +818,9 @@ void send_guest_global_virq(struct domai
+         goto out;
+ 
+     chn = evtchn_from_port(d, port);
++    spin_lock(&chn->lock);
+     evtchn_port_set_pending(d, chn->notify_vcpu_id, chn);
++    spin_unlock(&chn->lock);
+ 
+  out:
+     spin_unlock_irqrestore(&v->virq_lock, flags);
+@@ -823,6 +830,7 @@ void send_guest_pirq(struct domain *d, c
+ {
+     int port;
+     struct evtchn *chn;
++    unsigned long flags;
+ 
+     /*
+      * PV guests: It should not be possible to race with __evtchn_close(). The
+@@ -837,7 +845,9 @@ void send_guest_pirq(struct domain *d, c
+     }
+ 
+     chn = evtchn_from_port(d, port);
++    spin_lock_irqsave(&chn->lock, flags);
+     evtchn_port_set_pending(d, chn->notify_vcpu_id, chn);
++    spin_unlock_irqrestore(&chn->lock, flags);
+ }
+ 
+ static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly;
+@@ -1034,12 +1044,15 @@ int evtchn_unmask(unsigned int port)
+ {
+     struct domain *d = current->domain;
+     struct evtchn *evtchn;
++    unsigned long flags;
+ 
+     if ( unlikely(!port_is_valid(d, port)) )
+         return -EINVAL;
+ 
+     evtchn = evtchn_from_port(d, port);
++    spin_lock_irqsave(&evtchn->lock, flags);
+     evtchn_port_unmask(d, evtchn);
++    spin_unlock_irqrestore(&evtchn->lock, flags);
+ 
+     return 0;
+ }
+@@ -1449,8 +1462,8 @@ static void domain_dump_evtchn_info(stru
+ 
+         printk("    %4u [%d/%d/",
+                port,
+-               evtchn_port_is_pending(d, port),
+-               evtchn_port_is_masked(d, port));
++               evtchn_is_pending(d, chn),
++               evtchn_is_masked(d, chn));
+         evtchn_port_print_state(d, chn);
+         printk("]: s=%d n=%d x=%d",
+                chn->state, chn->notify_vcpu_id, chn->xen_consumer);
+--- a/xen/common/event_fifo.c
++++ b/xen/common/event_fifo.c
+@@ -296,23 +296,26 @@ static void evtchn_fifo_unmask(struct do
+         evtchn_fifo_set_pending(v, evtchn);
+ }
+ 
+-static bool evtchn_fifo_is_pending(const struct domain *d, evtchn_port_t port)
++static bool evtchn_fifo_is_pending(const struct domain *d,
++                                   const struct evtchn *evtchn)
+ {
+-    const event_word_t *word = evtchn_fifo_word_from_port(d, port);
++    const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port);
+ 
+     return word && guest_test_bit(d, EVTCHN_FIFO_PENDING, word);
+ }
+ 
+-static bool_t evtchn_fifo_is_masked(const struct domain *d, evtchn_port_t port)
++static bool_t evtchn_fifo_is_masked(const struct domain *d,
++                                    const struct evtchn *evtchn)
+ {
+-    const event_word_t *word = evtchn_fifo_word_from_port(d, port);
++    const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port);
+ 
+     return !word || guest_test_bit(d, EVTCHN_FIFO_MASKED, word);
+ }
+ 
+-static bool_t evtchn_fifo_is_busy(const struct domain *d, evtchn_port_t port)
++static bool_t evtchn_fifo_is_busy(const struct domain *d,
++                                  const struct evtchn *evtchn)
+ {
+-    const event_word_t *word = evtchn_fifo_word_from_port(d, port);
++    const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port);
+ 
+     return word && guest_test_bit(d, EVTCHN_FIFO_LINKED, word);
+ }
+--- a/xen/include/asm-x86/event.h
++++ b/xen/include/asm-x86/event.h
+@@ -47,4 +47,10 @@ static inline bool arch_virq_is_global(u
+     return true;
+ }
+ 
++#ifdef CONFIG_PV_SHIM
++# include <asm/pv/shim.h>
++# define arch_evtchn_is_special(chn) \
++             (pv_shim && (chn)->port && (chn)->state == ECS_RESERVED)
++#endif
++
+ #endif
+--- a/xen/include/xen/event.h
++++ b/xen/include/xen/event.h
+@@ -133,6 +133,24 @@ static inline struct evtchn *evtchn_from
+     return bucket_from_port(d, p) + (p % EVTCHNS_PER_BUCKET);
+ }
+ 
++/*
++ * "usable" as in "by a guest", i.e. Xen consumed channels are assumed to be
++ * taken care of separately where used for Xen's internal purposes.
++ */
++static bool evtchn_usable(const struct evtchn *evtchn)
++{
++    if ( evtchn->xen_consumer )
++        return false;
++
++#ifdef arch_evtchn_is_special
++    if ( arch_evtchn_is_special(evtchn) )
++        return true;
++#endif
++
++    BUILD_BUG_ON(ECS_FREE > ECS_RESERVED);
++    return evtchn->state > ECS_RESERVED;
++}
++
+ /* Wait on a Xen-attached event channel. */
+ #define wait_on_xen_event_channel(port, condition)                      \
+     do {                                                                \
+@@ -165,19 +183,24 @@ int evtchn_reset(struct domain *d);
+ 
+ /*
+  * Low-level event channel port ops.
++ *
++ * All hooks have to be called with a lock held which prevents the channel
++ * from changing state. This may be the domain event lock, the per-channel
++ * lock, or in the case of sending interdomain events also the other side's
++ * per-channel lock. Exceptions apply in certain cases for the PV shim.
+  */
+ struct evtchn_port_ops {
+     void (*init)(struct domain *d, struct evtchn *evtchn);
+     void (*set_pending)(struct vcpu *v, struct evtchn *evtchn);
+     void (*clear_pending)(struct domain *d, struct evtchn *evtchn);
+     void (*unmask)(struct domain *d, struct evtchn *evtchn);
+-    bool (*is_pending)(const struct domain *d, evtchn_port_t port);
+-    bool (*is_masked)(const struct domain *d, evtchn_port_t port);
++    bool (*is_pending)(const struct domain *d, const struct evtchn *evtchn);
++    bool (*is_masked)(const struct domain *d, const struct evtchn *evtchn);
+     /*
+      * Is the port unavailable because it's still being cleaned up
+      * after being closed?
+      */
+-    bool (*is_busy)(const struct domain *d, evtchn_port_t port);
++    bool (*is_busy)(const struct domain *d, const struct evtchn *evtchn);
+     int (*set_priority)(struct domain *d, struct evtchn *evtchn,
+                         unsigned int priority);
+     void (*print_state)(struct domain *d, const struct evtchn *evtchn);
+@@ -193,38 +216,67 @@ static inline void evtchn_port_set_pendi
+                                            unsigned int vcpu_id,
+                                            struct evtchn *evtchn)
+ {
+-    d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn);
++    if ( evtchn_usable(evtchn) )
++        d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn);
+ }
+ 
+ static inline void evtchn_port_clear_pending(struct domain *d,
+                                              struct evtchn *evtchn)
+ {
+-    d->evtchn_port_ops->clear_pending(d, evtchn);
++    if ( evtchn_usable(evtchn) )
++        d->evtchn_port_ops->clear_pending(d, evtchn);
+ }
+ 
+ static inline void evtchn_port_unmask(struct domain *d,
+                                       struct evtchn *evtchn)
+ {
+-    d->evtchn_port_ops->unmask(d, evtchn);
++    if ( evtchn_usable(evtchn) )
++        d->evtchn_port_ops->unmask(d, evtchn);
+ }
+ 
+-static inline bool evtchn_port_is_pending(const struct domain *d,
+-                                          evtchn_port_t port)
++static inline bool evtchn_is_pending(const struct domain *d,
++                                     const struct evtchn *evtchn)
+ {
+-    return d->evtchn_port_ops->is_pending(d, port);
++    return evtchn_usable(evtchn) && d->evtchn_port_ops->is_pending(d, evtchn);
+ }
+ 
+-static inline bool evtchn_port_is_masked(const struct domain *d,
+-                                         evtchn_port_t port)
++static inline bool evtchn_port_is_pending(struct domain *d, evtchn_port_t port)
+ {
+-    return d->evtchn_port_ops->is_masked(d, port);
++    struct evtchn *evtchn = evtchn_from_port(d, port);
++    bool rc;
++    unsigned long flags;
++
++    spin_lock_irqsave(&evtchn->lock, flags);
++    rc = evtchn_is_pending(d, evtchn);
++    spin_unlock_irqrestore(&evtchn->lock, flags);
++
++    return rc;
++}
++
++static inline bool evtchn_is_masked(const struct domain *d,
++                                    const struct evtchn *evtchn)
++{
++    return !evtchn_usable(evtchn) || d->evtchn_port_ops->is_masked(d, evtchn);
++}
++
++static inline bool evtchn_port_is_masked(struct domain *d, evtchn_port_t port)
++{
++    struct evtchn *evtchn = evtchn_from_port(d, port);
++    bool rc;
++    unsigned long flags;
++
++    spin_lock_irqsave(&evtchn->lock, flags);
++    rc = evtchn_is_masked(d, evtchn);
++    spin_unlock_irqrestore(&evtchn->lock, flags);
++
++    return rc;
+ }
+ 
+-static inline bool evtchn_port_is_busy(const struct domain *d,
+-                                       evtchn_port_t port)
++static inline bool evtchn_is_busy(const struct domain *d,
++                                  const struct evtchn *evtchn)
+ {
+     return d->evtchn_port_ops->is_busy &&
+-           d->evtchn_port_ops->is_busy(d, port);
++           d->evtchn_port_ops->is_busy(d, evtchn);
+ }
+ 
+ static inline int evtchn_port_set_priority(struct domain *d,
+@@ -233,6 +285,8 @@ static inline int evtchn_port_set_priori
+ {
+     if ( !d->evtchn_port_ops->set_priority )
+         return -ENOSYS;
++    if ( !evtchn_usable(evtchn) )
++        return -EACCES;
+     return d->evtchn_port_ops->set_priority(d, evtchn, priority);
+ }
+ 
diff --git a/system/xen/xsa/xsa344-4.13-1.patch b/system/xen/xsa/xsa344-4.13-1.patch
new file mode 100644
index 0000000000..d8e9b3f43f
--- /dev/null
+++ b/system/xen/xsa/xsa344-4.13-1.patch
@@ -0,0 +1,130 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn: arrange for preemption in evtchn_destroy()
+
+Especially closing of fully established interdomain channels can take
+quite some time, due to the locking involved. Therefore we shouldn't
+assume we can clean up still active ports all in one go. Besides adding
+the necessary preemption check, also avoid pointlessly starting from
+(or now really ending at) 0; 1 is the lowest numbered port which may
+need closing.
+
+Since we're now reducing ->valid_evtchns, free_xen_event_channel(),
+and (at least to be on the safe side) notify_via_xen_event_channel()
+need to cope with attempts to close / unbind from / send through already
+closed (and no longer valid, as per port_is_valid()) ports.
+
+This is part of XSA-344.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+
+--- a/xen/common/domain.c
++++ b/xen/common/domain.c
+@@ -770,12 +770,14 @@ int domain_kill(struct domain *d)
+             return domain_kill(d);
+         d->is_dying = DOMDYING_dying;
+         argo_destroy(d);
+-        evtchn_destroy(d);
+         gnttab_release_mappings(d);
+         vnuma_destroy(d->vnuma);
+         domain_set_outstanding_pages(d, 0);
+         /* fallthrough */
+     case DOMDYING_dying:
++        rc = evtchn_destroy(d);
++        if ( rc )
++            break;
+         rc = domain_relinquish_resources(d);
+         if ( rc != 0 )
+             break;
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -1297,7 +1297,16 @@ int alloc_unbound_xen_event_channel(
+ 
+ void free_xen_event_channel(struct domain *d, int port)
+ {
+-    BUG_ON(!port_is_valid(d, port));
++    if ( !port_is_valid(d, port) )
++    {
++        /*
++         * Make sure ->is_dying is read /after/ ->valid_evtchns, pairing
++         * with the spin_barrier() and BUG_ON() in evtchn_destroy().
++         */
++        smp_rmb();
++        BUG_ON(!d->is_dying);
++        return;
++    }
+ 
+     evtchn_close(d, port, 0);
+ }
+@@ -1309,7 +1318,17 @@ void notify_via_xen_event_channel(struct
+     struct domain *rd;
+     unsigned long flags;
+ 
+-    ASSERT(port_is_valid(ld, lport));
++    if ( !port_is_valid(ld, lport) )
++    {
++        /*
++         * Make sure ->is_dying is read /after/ ->valid_evtchns, pairing
++         * with the spin_barrier() and BUG_ON() in evtchn_destroy().
++         */
++        smp_rmb();
++        ASSERT(ld->is_dying);
++        return;
++    }
++
+     lchn = evtchn_from_port(ld, lport);
+ 
+     spin_lock_irqsave(&lchn->lock, flags);
+@@ -1380,8 +1399,7 @@ int evtchn_init(struct domain *d, unsign
+     return 0;
+ }
+ 
+-
+-void evtchn_destroy(struct domain *d)
++int evtchn_destroy(struct domain *d)
+ {
+     unsigned int i;
+ 
+@@ -1390,14 +1408,29 @@ void evtchn_destroy(struct domain *d)
+     spin_barrier(&d->event_lock);
+ 
+     /* Close all existing event channels. */
+-    for ( i = 0; port_is_valid(d, i); i++ )
++    for ( i = d->valid_evtchns; --i; )
++    {
+         evtchn_close(d, i, 0);
+ 
++        /*
++         * Avoid preempting when called from domain_create()'s error path,
++         * and don't check too often (choice of frequency is arbitrary).
++         */
++        if ( i && !(i & 0x3f) && d->is_dying != DOMDYING_dead &&
++             hypercall_preempt_check() )
++        {
++            write_atomic(&d->valid_evtchns, i);
++            return -ERESTART;
++        }
++    }
++
+     ASSERT(!d->active_evtchns);
+ 
+     clear_global_virq_handlers(d);
+ 
+     evtchn_fifo_destroy(d);
++
++    return 0;
+ }
+ 
+ 
+--- a/xen/include/xen/sched.h
++++ b/xen/include/xen/sched.h
+@@ -136,7 +136,7 @@ struct evtchn
+ } __attribute__((aligned(64)));
+ 
+ int  evtchn_init(struct domain *d, unsigned int max_port);
+-void evtchn_destroy(struct domain *d); /* from domain_kill */
++int  evtchn_destroy(struct domain *d); /* from domain_kill */
+ void evtchn_destroy_final(struct domain *d); /* from complete_domain_destroy */
+ 
+ struct waitqueue_vcpu;
diff --git a/system/xen/xsa/xsa344-4.13-2.patch b/system/xen/xsa/xsa344-4.13-2.patch
new file mode 100644
index 0000000000..3f0339498f
--- /dev/null
+++ b/system/xen/xsa/xsa344-4.13-2.patch
@@ -0,0 +1,203 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: evtchn: arrange for preemption in evtchn_reset()
+
+Like for evtchn_destroy() looping over all possible event channels to
+close them can take a significant amount of time. Unlike done there, we
+can't alter domain properties (i.e. d->valid_evtchns) here. Borrow, in a
+lightweight form, the paging domctl continuation concept, redirecting
+the continuations to different sub-ops. Just like there this is to be
+able to allow for predictable overall results of the involved sub-ops:
+Racing requests should either complete or be refused.
+
+Note that a domain can't interfere with an already started (by a remote
+domain) reset, due to being paused. It can prevent a remote reset from
+happening by leaving a reset unfinished, but that's only going to affect
+itself.
+
+This is part of XSA-344.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+
+--- a/xen/common/domain.c
++++ b/xen/common/domain.c
+@@ -1214,7 +1214,7 @@ void domain_unpause_except_self(struct d
+         domain_unpause(d);
+ }
+ 
+-int domain_soft_reset(struct domain *d)
++int domain_soft_reset(struct domain *d, bool resuming)
+ {
+     struct vcpu *v;
+     int rc;
+@@ -1228,7 +1228,7 @@ int domain_soft_reset(struct domain *d)
+         }
+     spin_unlock(&d->shutdown_lock);
+ 
+-    rc = evtchn_reset(d);
++    rc = evtchn_reset(d, resuming);
+     if ( rc )
+         return rc;
+ 
+--- a/xen/common/domctl.c
++++ b/xen/common/domctl.c
+@@ -572,12 +572,22 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xe
+     }
+ 
+     case XEN_DOMCTL_soft_reset:
++    case XEN_DOMCTL_soft_reset_cont:
+         if ( d == current->domain ) /* no domain_pause() */
+         {
+             ret = -EINVAL;
+             break;
+         }
+-        ret = domain_soft_reset(d);
++        ret = domain_soft_reset(d, op->cmd == XEN_DOMCTL_soft_reset_cont);
++        if ( ret == -ERESTART )
++        {
++            op->cmd = XEN_DOMCTL_soft_reset_cont;
++            if ( !__copy_field_to_guest(u_domctl, op, cmd) )
++                ret = hypercall_create_continuation(__HYPERVISOR_domctl,
++                                                    "h", u_domctl);
++            else
++                ret = -EFAULT;
++        }
+         break;
+ 
+     case XEN_DOMCTL_destroydomain:
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -1057,7 +1057,7 @@ int evtchn_unmask(unsigned int port)
+     return 0;
+ }
+ 
+-int evtchn_reset(struct domain *d)
++int evtchn_reset(struct domain *d, bool resuming)
+ {
+     unsigned int i;
+     int rc = 0;
+@@ -1065,11 +1065,40 @@ int evtchn_reset(struct domain *d)
+     if ( d != current->domain && !d->controller_pause_count )
+         return -EINVAL;
+ 
+-    for ( i = 0; port_is_valid(d, i); i++ )
++    spin_lock(&d->event_lock);
++
++    /*
++     * If we are resuming, then start where we stopped. Otherwise, check
++     * that a reset operation is not already in progress, and if none is,
++     * record that this is now the case.
++     */
++    i = resuming ? d->next_evtchn : !d->next_evtchn;
++    if ( i > d->next_evtchn )
++        d->next_evtchn = i;
++
++    spin_unlock(&d->event_lock);
++
++    if ( !i )
++        return -EBUSY;
++
++    for ( ; port_is_valid(d, i); i++ )
++    {
+         evtchn_close(d, i, 1);
+ 
++        /* NB: Choice of frequency is arbitrary. */
++        if ( !(i & 0x3f) && hypercall_preempt_check() )
++        {
++            spin_lock(&d->event_lock);
++            d->next_evtchn = i;
++            spin_unlock(&d->event_lock);
++            return -ERESTART;
++        }
++    }
++
+     spin_lock(&d->event_lock);
+ 
++    d->next_evtchn = 0;
++
+     if ( d->active_evtchns > d->xen_evtchns )
+         rc = -EAGAIN;
+     else if ( d->evtchn_fifo )
+@@ -1204,7 +1233,8 @@ long do_event_channel_op(int cmd, XEN_GU
+         break;
+     }
+ 
+-    case EVTCHNOP_reset: {
++    case EVTCHNOP_reset:
++    case EVTCHNOP_reset_cont: {
+         struct evtchn_reset reset;
+         struct domain *d;
+ 
+@@ -1217,9 +1247,13 @@ long do_event_channel_op(int cmd, XEN_GU
+ 
+         rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d);
+         if ( !rc )
+-            rc = evtchn_reset(d);
++            rc = evtchn_reset(d, cmd == EVTCHNOP_reset_cont);
+ 
+         rcu_unlock_domain(d);
++
++        if ( rc == -ERESTART )
++            rc = hypercall_create_continuation(__HYPERVISOR_event_channel_op,
++                                               "ih", EVTCHNOP_reset_cont, arg);
+         break;
+     }
+ 
+--- a/xen/include/public/domctl.h
++++ b/xen/include/public/domctl.h
+@@ -1152,7 +1152,10 @@ struct xen_domctl {
+ #define XEN_DOMCTL_iomem_permission              20
+ #define XEN_DOMCTL_ioport_permission             21
+ #define XEN_DOMCTL_hypercall_init                22
+-#define XEN_DOMCTL_arch_setup                    23 /* Obsolete IA64 only */
++#ifdef __XEN__
++/* #define XEN_DOMCTL_arch_setup                 23 Obsolete IA64 only */
++#define XEN_DOMCTL_soft_reset_cont               23
++#endif
+ #define XEN_DOMCTL_settimeoffset                 24
+ #define XEN_DOMCTL_getvcpuaffinity               25
+ #define XEN_DOMCTL_real_mode_area                26 /* Obsolete PPC only */
+--- a/xen/include/public/event_channel.h
++++ b/xen/include/public/event_channel.h
+@@ -74,6 +74,9 @@
+ #define EVTCHNOP_init_control    11
+ #define EVTCHNOP_expand_array    12
+ #define EVTCHNOP_set_priority    13
++#ifdef __XEN__
++#define EVTCHNOP_reset_cont      14
++#endif
+ /* ` } */
+ 
+ typedef uint32_t evtchn_port_t;
+--- a/xen/include/xen/event.h
++++ b/xen/include/xen/event.h
+@@ -171,7 +171,7 @@ void evtchn_check_pollers(struct domain
+ void evtchn_2l_init(struct domain *d);
+ 
+ /* Close all event channels and reset to 2-level ABI. */
+-int evtchn_reset(struct domain *d);
++int evtchn_reset(struct domain *d, bool resuming);
+ 
+ /*
+  * Low-level event channel port ops.
+--- a/xen/include/xen/sched.h
++++ b/xen/include/xen/sched.h
+@@ -394,6 +394,8 @@ struct domain
+      * EVTCHNOP_reset).  Read/write access like for active_evtchns.
+      */
+     unsigned int     xen_evtchns;
++    /* Port to resume from in evtchn_reset(), when in a continuation. */
++    unsigned int     next_evtchn;
+     spinlock_t       event_lock;
+     const struct evtchn_port_ops *evtchn_port_ops;
+     struct evtchn_fifo_domain *evtchn_fifo;
+@@ -663,7 +665,7 @@ int domain_shutdown(struct domain *d, u8
+ void domain_resume(struct domain *d);
+ void domain_pause_for_debugger(void);
+ 
+-int domain_soft_reset(struct domain *d);
++int domain_soft_reset(struct domain *d, bool resuming);
+ 
+ int vcpu_start_shutdown_deferral(struct vcpu *v);
+ void vcpu_end_shutdown_deferral(struct vcpu *v);
diff --git a/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch b/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch
new file mode 100644
index 0000000000..d325385a56
--- /dev/null
+++ b/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch
@@ -0,0 +1,94 @@
+From b3e0d4e37b7902533a463812374947d4d6d2e463 Mon Sep 17 00:00:00 2001
+From: Wei Liu <wei.liu2@citrix.com>
+Date: Sat, 11 Jan 2020 21:57:41 +0000
+Subject: [PATCH 1/3] x86/mm: Refactor map_pages_to_xen to have only a single
+ exit path
+
+We will soon need to perform clean-ups before returning.
+
+No functional change.
+
+This is part of XSA-345.
+
+Reported-by: Hongyan Xia <hongyxia@amazon.com>
+Signed-off-by: Wei Liu <wei.liu2@citrix.com>
+Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
+Signed-off-by: George Dunlap <george.dunlap@citrix.com>
+Acked-by: Jan Beulich <jbeulich@suse.com>
+---
+ xen/arch/x86/mm.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
+index 30dffb68e8..133a393875 100644
+--- a/xen/arch/x86/mm.c
++++ b/xen/arch/x86/mm.c
+@@ -5187,6 +5187,7 @@ int map_pages_to_xen(
+     l2_pgentry_t *pl2e, ol2e;
+     l1_pgentry_t *pl1e, ol1e;
+     unsigned int  i;
++    int rc = -ENOMEM;
+ 
+ #define flush_flags(oldf) do {                 \
+     unsigned int o_ = (oldf);                  \
+@@ -5207,7 +5208,8 @@ int map_pages_to_xen(
+         l3_pgentry_t ol3e, *pl3e = virt_to_xen_l3e(virt);
+ 
+         if ( !pl3e )
+-            return -ENOMEM;
++            goto out;
++
+         ol3e = *pl3e;
+ 
+         if ( cpu_has_page1gb &&
+@@ -5295,7 +5297,7 @@ int map_pages_to_xen(
+ 
+             pl2e = alloc_xen_pagetable();
+             if ( pl2e == NULL )
+-                return -ENOMEM;
++                goto out;
+ 
+             for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ )
+                 l2e_write(pl2e + i,
+@@ -5324,7 +5326,7 @@ int map_pages_to_xen(
+ 
+         pl2e = virt_to_xen_l2e(virt);
+         if ( !pl2e )
+-            return -ENOMEM;
++            goto out;
+ 
+         if ( ((((virt >> PAGE_SHIFT) | mfn_x(mfn)) &
+                ((1u << PAGETABLE_ORDER) - 1)) == 0) &&
+@@ -5367,7 +5369,7 @@ int map_pages_to_xen(
+             {
+                 pl1e = virt_to_xen_l1e(virt);
+                 if ( pl1e == NULL )
+-                    return -ENOMEM;
++                    goto out;
+             }
+             else if ( l2e_get_flags(*pl2e) & _PAGE_PSE )
+             {
+@@ -5394,7 +5396,7 @@ int map_pages_to_xen(
+ 
+                 pl1e = alloc_xen_pagetable();
+                 if ( pl1e == NULL )
+-                    return -ENOMEM;
++                    goto out;
+ 
+                 for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ )
+                     l1e_write(&pl1e[i],
+@@ -5538,7 +5540,10 @@ int map_pages_to_xen(
+ 
+ #undef flush_flags
+ 
+-    return 0;
++    rc = 0;
++
++ out:
++    return rc;
+ }
+ 
+ int populate_pt_range(unsigned long virt, unsigned long nr_mfns)
+-- 
+2.25.1
+
diff --git a/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch b/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch
new file mode 100644
index 0000000000..836bed681a
--- /dev/null
+++ b/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch
@@ -0,0 +1,68 @@
+From 9f6f35b833d295acaaa2d8ff8cf309bf688cfd50 Mon Sep 17 00:00:00 2001
+From: Wei Liu <wei.liu2@citrix.com>
+Date: Sat, 11 Jan 2020 21:57:42 +0000
+Subject: [PATCH 2/3] x86/mm: Refactor modify_xen_mappings to have one exit
+ path
+
+We will soon need to perform clean-ups before returning.
+
+No functional change.
+
+This is part of XSA-345.
+
+Reported-by: Hongyan Xia <hongyxia@amazon.com>
+Signed-off-by: Wei Liu <wei.liu2@citrix.com>
+Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
+Signed-off-by: George Dunlap <george.dunlap@citrix.com>
+Acked-by: Jan Beulich <jbeulich@suse.com>
+---
+ xen/arch/x86/mm.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
+index 133a393875..af726d3274 100644
+--- a/xen/arch/x86/mm.c
++++ b/xen/arch/x86/mm.c
+@@ -5570,6 +5570,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+     l1_pgentry_t *pl1e;
+     unsigned int  i;
+     unsigned long v = s;
++    int rc = -ENOMEM;
+ 
+     /* Set of valid PTE bits which may be altered. */
+ #define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT)
+@@ -5611,7 +5612,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+             /* PAGE1GB: shatter the superpage and fall through. */
+             pl2e = alloc_xen_pagetable();
+             if ( !pl2e )
+-                return -ENOMEM;
++                goto out;
++
+             for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ )
+                 l2e_write(pl2e + i,
+                           l2e_from_pfn(l3e_get_pfn(*pl3e) +
+@@ -5666,7 +5668,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+                 /* PSE: shatter the superpage and try again. */
+                 pl1e = alloc_xen_pagetable();
+                 if ( !pl1e )
+-                    return -ENOMEM;
++                    goto out;
++
+                 for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ )
+                     l1e_write(&pl1e[i],
+                               l1e_from_pfn(l2e_get_pfn(*pl2e) + i,
+@@ -5795,7 +5798,10 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+     flush_area(NULL, FLUSH_TLB_GLOBAL);
+ 
+ #undef FLAGS_MASK
+-    return 0;
++    rc = 0;
++
++ out:
++    return rc;
+ }
+ 
+ #undef flush_area
+-- 
+2.25.1
+
diff --git a/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch b/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch
new file mode 100644
index 0000000000..db407416b9
--- /dev/null
+++ b/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch
@@ -0,0 +1,249 @@
+From 0ff9a8453dc47cd47eee9659d5916afb5094e871 Mon Sep 17 00:00:00 2001
+From: Hongyan Xia <hongyxia@amazon.com>
+Date: Sat, 11 Jan 2020 21:57:43 +0000
+Subject: [PATCH 3/3] x86/mm: Prevent some races in hypervisor mapping updates
+
+map_pages_to_xen will attempt to coalesce mappings into 2MiB and 1GiB
+superpages if possible, to maximize TLB efficiency.  This means both
+replacing superpage entries with smaller entries, and replacing
+smaller entries with superpages.
+
+Unfortunately, while some potential races are handled correctly,
+others are not.  These include:
+
+1. When one processor modifies a sub-superpage mapping while another
+processor replaces the entire range with a superpage.
+
+Take the following example:
+
+Suppose L3[N] points to L2.  And suppose we have two processors, A and
+B.
+
+* A walks the pagetables, get a pointer to L2.
+* B replaces L3[N] with a 1GiB mapping.
+* B Frees L2
+* A writes L2[M] #
+
+This is race exacerbated by the fact that virt_to_xen_l[21]e doesn't
+handle higher-level superpages properly: If you call virt_xen_to_l2e
+on a virtual address within an L3 superpage, you'll either hit a BUG()
+(most likely), or get a pointer into the middle of a data page; same
+with virt_xen_to_l1 on a virtual address within either an L3 or L2
+superpage.
+
+So take the following example:
+
+* A reads pl3e and discovers it to point to an L2.
+* B replaces L3[N] with a 1GiB mapping
+* A calls virt_to_xen_l2e() and hits the BUG_ON() #
+
+2. When two processors simultaneously try to replace a sub-superpage
+mapping with a superpage mapping.
+
+Take the following example:
+
+Suppose L3[N] points to L2.  And suppose we have two processors, A and B,
+both trying to replace L3[N] with a superpage.
+
+* A walks the pagetables, get a pointer to pl3e, and takes a copy ol3e pointing to L2.
+* B walks the pagetables, gets a pointre to pl3e, and takes a copy ol3e pointing to L2.
+* A writes the new value into L3[N]
+* B writes the new value into L3[N]
+* A recursively frees all the L1's under L2, then frees L2
+* B recursively double-frees all the L1's under L2, then double-frees L2 #
+
+Fix this by grabbing a lock for the entirety of the mapping update
+operation.
+
+Rather than grabbing map_pgdir_lock for the entire operation, however,
+repurpose the PGT_locked bit from L3's page->type_info as a lock.
+This means that rather than locking the entire address space, we
+"only" lock a single 512GiB chunk of hypervisor address space at a
+time.
+
+There was a proposal for a lock-and-reverify approach, where we walk
+the pagetables to the point where we decide what to do; then grab the
+map_pgdir_lock, re-verify the information we collected without the
+lock, and finally make the change (starting over again if anything had
+changed).  Without being able to guarantee that the L2 table wasn't
+freed, however, that means every read would need to be considered
+potentially unsafe.  Thinking carefully about that is probably
+something that wants to be done on public, not under time pressure.
+
+This is part of XSA-345.
+
+Reported-by: Hongyan Xia <hongyxia@amazon.com>
+Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
+Signed-off-by: George Dunlap <george.dunlap@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+---
+ xen/arch/x86/mm.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 89 insertions(+), 3 deletions(-)
+
+diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
+index af726d3274..d6a0761f43 100644
+--- a/xen/arch/x86/mm.c
++++ b/xen/arch/x86/mm.c
+@@ -2167,6 +2167,50 @@ void page_unlock(struct page_info *page)
+     current_locked_page_set(NULL);
+ }
+ 
++/*
++ * L3 table locks:
++ *
++ * Used for serialization in map_pages_to_xen() and modify_xen_mappings().
++ *
++ * For Xen PT pages, the page->u.inuse.type_info is unused and it is safe to
++ * reuse the PGT_locked flag. This lock is taken only when we move down to L3
++ * tables and below, since L4 (and above, for 5-level paging) is still globally
++ * protected by map_pgdir_lock.
++ *
++ * PV MMU update hypercalls call map_pages_to_xen while holding a page's page_lock().
++ * This has two implications:
++ * - We cannot reuse reuse current_locked_page_* for debugging
++ * - To avoid the chance of deadlock, even for different pages, we
++ *   must never grab page_lock() after grabbing l3t_lock().  This
++ *   includes any page_lock()-based locks, such as
++ *   mem_sharing_page_lock().
++ *
++ * Also note that we grab the map_pgdir_lock while holding the
++ * l3t_lock(), so to avoid deadlock we must avoid grabbing them in
++ * reverse order.
++ */
++static void l3t_lock(struct page_info *page)
++{
++    unsigned long x, nx;
++
++    do {
++        while ( (x = page->u.inuse.type_info) & PGT_locked )
++            cpu_relax();
++        nx = x | PGT_locked;
++    } while ( cmpxchg(&page->u.inuse.type_info, x, nx) != x );
++}
++
++static void l3t_unlock(struct page_info *page)
++{
++    unsigned long x, nx, y = page->u.inuse.type_info;
++
++    do {
++        x = y;
++        BUG_ON(!(x & PGT_locked));
++        nx = x & ~PGT_locked;
++    } while ( (y = cmpxchg(&page->u.inuse.type_info, x, nx)) != x );
++}
++
+ #ifdef CONFIG_PV
+ /*
+  * PTE flags that a guest may change without re-validating the PTE.
+@@ -5177,6 +5221,23 @@ l1_pgentry_t *virt_to_xen_l1e(unsigned long v)
+                          flush_area_local((const void *)v, f) : \
+                          flush_area_all((const void *)v, f))
+ 
++#define L3T_INIT(page) (page) = ZERO_BLOCK_PTR
++
++#define L3T_LOCK(page)        \
++    do {                      \
++        if ( locking )        \
++            l3t_lock(page);   \
++    } while ( false )
++
++#define L3T_UNLOCK(page)                           \
++    do {                                           \
++        if ( locking && (page) != ZERO_BLOCK_PTR ) \
++        {                                          \
++            l3t_unlock(page);                      \
++            (page) = ZERO_BLOCK_PTR;               \
++        }                                          \
++    } while ( false )
++
+ int map_pages_to_xen(
+     unsigned long virt,
+     mfn_t mfn,
+@@ -5188,6 +5249,7 @@ int map_pages_to_xen(
+     l1_pgentry_t *pl1e, ol1e;
+     unsigned int  i;
+     int rc = -ENOMEM;
++    struct page_info *current_l3page;
+ 
+ #define flush_flags(oldf) do {                 \
+     unsigned int o_ = (oldf);                  \
+@@ -5203,13 +5265,20 @@ int map_pages_to_xen(
+     }                                          \
+ } while (0)
+ 
++    L3T_INIT(current_l3page);
++
+     while ( nr_mfns != 0 )
+     {
+-        l3_pgentry_t ol3e, *pl3e = virt_to_xen_l3e(virt);
++        l3_pgentry_t *pl3e, ol3e;
+ 
++        L3T_UNLOCK(current_l3page);
++
++        pl3e = virt_to_xen_l3e(virt);
+         if ( !pl3e )
+             goto out;
+ 
++        current_l3page = virt_to_page(pl3e);
++        L3T_LOCK(current_l3page);
+         ol3e = *pl3e;
+ 
+         if ( cpu_has_page1gb &&
+@@ -5543,6 +5612,7 @@ int map_pages_to_xen(
+     rc = 0;
+ 
+  out:
++    L3T_UNLOCK(current_l3page);
+     return rc;
+ }
+ 
+@@ -5571,6 +5641,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+     unsigned int  i;
+     unsigned long v = s;
+     int rc = -ENOMEM;
++    struct page_info *current_l3page;
+ 
+     /* Set of valid PTE bits which may be altered. */
+ #define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT)
+@@ -5579,11 +5650,22 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+     ASSERT(IS_ALIGNED(s, PAGE_SIZE));
+     ASSERT(IS_ALIGNED(e, PAGE_SIZE));
+ 
++    L3T_INIT(current_l3page);
++
+     while ( v < e )
+     {
+-        l3_pgentry_t *pl3e = virt_to_xen_l3e(v);
++        l3_pgentry_t *pl3e;
++
++        L3T_UNLOCK(current_l3page);
+ 
+-        if ( !pl3e || !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) )
++        pl3e = virt_to_xen_l3e(v);
++        if ( !pl3e )
++            goto out;
++
++        current_l3page = virt_to_page(pl3e);
++        L3T_LOCK(current_l3page);
++
++        if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) )
+         {
+             /* Confirm the caller isn't trying to create new mappings. */
+             ASSERT(!(nf & _PAGE_PRESENT));
+@@ -5801,9 +5883,13 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
+     rc = 0;
+ 
+  out:
++    L3T_UNLOCK(current_l3page);
+     return rc;
+ }
+ 
++#undef L3T_LOCK
++#undef L3T_UNLOCK
++
+ #undef flush_area
+ 
+ int destroy_xen_mappings(unsigned long s, unsigned long e)
+-- 
+2.25.1
+
diff --git a/system/xen/xsa/xsa346-4.13-1.patch b/system/xen/xsa/xsa346-4.13-1.patch
new file mode 100644
index 0000000000..a32e658e80
--- /dev/null
+++ b/system/xen/xsa/xsa346-4.13-1.patch
@@ -0,0 +1,50 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: IOMMU: suppress "iommu_dont_flush_iotlb" when about to free a page
+
+Deferring flushes to a single, wide range one - as is done when
+handling XENMAPSPACE_gmfn_range - is okay only as long as
+pages don't get freed ahead of the eventual flush. While the only
+function setting the flag (xenmem_add_to_physmap()) suggests by its name
+that it's only mapping new entries, in reality the way
+xenmem_add_to_physmap_one() works means an unmap would happen not only
+for the page being moved (but not freed) but, if the destination GFN is
+populated, also for the page being displaced from that GFN. Collapsing
+the two flushes for this GFN into just one (end even more so deferring
+it to a batched invocation) is not correct.
+
+This is part of XSA-346.
+
+Fixes: cf95b2a9fd5a ("iommu: Introduce per cpu flag (iommu_dont_flush_iotlb) to avoid unnecessary iotlb... ")
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Paul Durrant <paul@xen.org>
+Acked-by: Julien Grall <jgrall@amazon.com>
+
+--- a/xen/common/memory.c
++++ b/xen/common/memory.c
+@@ -292,6 +292,7 @@ int guest_remove_page(struct domain *d,
+     p2m_type_t p2mt;
+ #endif
+     mfn_t mfn;
++    bool *dont_flush_p, dont_flush;
+     int rc;
+ 
+ #ifdef CONFIG_X86
+@@ -378,8 +379,18 @@ int guest_remove_page(struct domain *d,
+         return -ENXIO;
+     }
+ 
++    /*
++     * Since we're likely to free the page below, we need to suspend
++     * xenmem_add_to_physmap()'s suppressing of IOMMU TLB flushes.
++     */
++    dont_flush_p = &this_cpu(iommu_dont_flush_iotlb);
++    dont_flush = *dont_flush_p;
++    *dont_flush_p = false;
++
+     rc = guest_physmap_remove_page(d, _gfn(gmfn), mfn, 0);
+ 
++    *dont_flush_p = dont_flush;
++
+     /*
+      * With the lack of an IOMMU on some platforms, domains with DMA-capable
+      * device must retrieve the same pfn when the hypercall populate_physmap
diff --git a/system/xen/xsa/xsa346-4.13-2.patch b/system/xen/xsa/xsa346-4.13-2.patch
new file mode 100644
index 0000000000..6371b5c3db
--- /dev/null
+++ b/system/xen/xsa/xsa346-4.13-2.patch
@@ -0,0 +1,204 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: IOMMU: hold page ref until after deferred TLB flush
+
+When moving around a page via XENMAPSPACE_gmfn_range, deferring the TLB
+flush for the "from" GFN range requires that the page remains allocated
+to the guest until the TLB flush has actually occurred. Otherwise a
+parallel hypercall to remove the page would only flush the TLB for the
+GFN it has been moved to, but not the one is was mapped at originally.
+
+This is part of XSA-346.
+
+Fixes: cf95b2a9fd5a ("iommu: Introduce per cpu flag (iommu_dont_flush_iotlb) to avoid unnecessary iotlb... ")
+Reported-by: Julien Grall <jgrall@amazon.com>
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+
+--- a/xen/arch/arm/mm.c
++++ b/xen/arch/arm/mm.c
+@@ -1407,7 +1407,7 @@ void share_xen_page_with_guest(struct pa
+ int xenmem_add_to_physmap_one(
+     struct domain *d,
+     unsigned int space,
+-    union xen_add_to_physmap_batch_extra extra,
++    union add_to_physmap_extra extra,
+     unsigned long idx,
+     gfn_t gfn)
+ {
+@@ -1480,10 +1480,6 @@ int xenmem_add_to_physmap_one(
+         break;
+     }
+     case XENMAPSPACE_dev_mmio:
+-        /* extra should be 0. Reserved for future use. */
+-        if ( extra.res0 )
+-            return -EOPNOTSUPP;
+-
+         rc = map_dev_mmio_region(d, gfn, 1, _mfn(idx));
+         return rc;
+ 
+--- a/xen/arch/x86/mm.c
++++ b/xen/arch/x86/mm.c
+@@ -4617,7 +4617,7 @@ static int handle_iomem_range(unsigned l
+ int xenmem_add_to_physmap_one(
+     struct domain *d,
+     unsigned int space,
+-    union xen_add_to_physmap_batch_extra extra,
++    union add_to_physmap_extra extra,
+     unsigned long idx,
+     gfn_t gpfn)
+ {
+@@ -4701,9 +4701,20 @@ int xenmem_add_to_physmap_one(
+         rc = guest_physmap_add_page(d, gpfn, mfn, PAGE_ORDER_4K);
+ 
+  put_both:
+-    /* In the XENMAPSPACE_gmfn case, we took a ref of the gfn at the top. */
++    /*
++     * In the XENMAPSPACE_gmfn case, we took a ref of the gfn at the top.
++     * We also may need to transfer ownership of the page reference to our
++     * caller.
++     */
+     if ( space == XENMAPSPACE_gmfn )
++    {
+         put_gfn(d, gfn);
++        if ( !rc && extra.ppage )
++        {
++            *extra.ppage = page;
++            page = NULL;
++        }
++    }
+ 
+     if ( page )
+         put_page(page);
+--- a/xen/common/memory.c
++++ b/xen/common/memory.c
+@@ -814,13 +814,12 @@ int xenmem_add_to_physmap(struct domain
+ {
+     unsigned int done = 0;
+     long rc = 0;
+-    union xen_add_to_physmap_batch_extra extra;
++    union add_to_physmap_extra extra = {};
++    struct page_info *pages[16];
+ 
+     ASSERT(paging_mode_translate(d));
+ 
+-    if ( xatp->space != XENMAPSPACE_gmfn_foreign )
+-        extra.res0 = 0;
+-    else
++    if ( xatp->space == XENMAPSPACE_gmfn_foreign )
+         extra.foreign_domid = DOMID_INVALID;
+ 
+     if ( xatp->space != XENMAPSPACE_gmfn_range )
+@@ -835,7 +834,10 @@ int xenmem_add_to_physmap(struct domain
+     xatp->size -= start;
+ 
+     if ( is_iommu_enabled(d) )
++    {
+        this_cpu(iommu_dont_flush_iotlb) = 1;
++       extra.ppage = &pages[0];
++    }
+ 
+     while ( xatp->size > done )
+     {
+@@ -847,8 +849,12 @@ int xenmem_add_to_physmap(struct domain
+         xatp->idx++;
+         xatp->gpfn++;
+ 
++        if ( extra.ppage )
++            ++extra.ppage;
++
+         /* Check for continuation if it's not the last iteration. */
+-        if ( xatp->size > ++done && hypercall_preempt_check() )
++        if ( (++done > ARRAY_SIZE(pages) && extra.ppage) ||
++             (xatp->size > done && hypercall_preempt_check()) )
+         {
+             rc = start + done;
+             break;
+@@ -858,6 +864,7 @@ int xenmem_add_to_physmap(struct domain
+     if ( is_iommu_enabled(d) )
+     {
+         int ret;
++        unsigned int i;
+ 
+         this_cpu(iommu_dont_flush_iotlb) = 0;
+ 
+@@ -866,6 +873,15 @@ int xenmem_add_to_physmap(struct domain
+         if ( unlikely(ret) && rc >= 0 )
+             rc = ret;
+ 
++        /*
++         * Now that the IOMMU TLB flush was done for the original GFN, drop
++         * the page references. The 2nd flush below is fine to make later, as
++         * whoever removes the page again from its new GFN will have to do
++         * another flush anyway.
++         */
++        for ( i = 0; i < done; ++i )
++            put_page(pages[i]);
++
+         ret = iommu_iotlb_flush(d, _dfn(xatp->gpfn - done), done,
+                                 IOMMU_FLUSHF_added | IOMMU_FLUSHF_modified);
+         if ( unlikely(ret) && rc >= 0 )
+@@ -879,6 +895,8 @@ static int xenmem_add_to_physmap_batch(s
+                                        struct xen_add_to_physmap_batch *xatpb,
+                                        unsigned int extent)
+ {
++    union add_to_physmap_extra extra = {};
++
+     if ( unlikely(xatpb->size < extent) )
+         return -EILSEQ;
+ 
+@@ -890,6 +908,19 @@ static int xenmem_add_to_physmap_batch(s
+          !guest_handle_subrange_okay(xatpb->errs, extent, xatpb->size - 1) )
+         return -EFAULT;
+ 
++    switch ( xatpb->space )
++    {
++    case XENMAPSPACE_dev_mmio:
++        /* res0 is reserved for future use. */
++        if ( xatpb->u.res0 )
++            return -EOPNOTSUPP;
++        break;
++
++    case XENMAPSPACE_gmfn_foreign:
++        extra.foreign_domid = xatpb->u.foreign_domid;
++        break;
++    }
++
+     while ( xatpb->size > extent )
+     {
+         xen_ulong_t idx;
+@@ -902,8 +933,7 @@ static int xenmem_add_to_physmap_batch(s
+                                                extent, 1)) )
+             return -EFAULT;
+ 
+-        rc = xenmem_add_to_physmap_one(d, xatpb->space,
+-                                       xatpb->u,
++        rc = xenmem_add_to_physmap_one(d, xatpb->space, extra,
+                                        idx, _gfn(gpfn));
+ 
+         if ( unlikely(__copy_to_guest_offset(xatpb->errs, extent, &rc, 1)) )
+--- a/xen/include/xen/mm.h
++++ b/xen/include/xen/mm.h
+@@ -588,8 +588,22 @@ void scrub_one_page(struct page_info *);
+                       &(d)->xenpage_list : &(d)->page_list)
+ #endif
+ 
++union add_to_physmap_extra {
++    /*
++     * XENMAPSPACE_gmfn: When deferring TLB flushes, a page reference needs
++     * to be kept until after the flush, so the page can't get removed from
++     * the domain (and re-used for another purpose) beforehand. By passing
++     * non-NULL, the caller of xenmem_add_to_physmap_one() indicates it wants
++     * to have ownership of such a reference transferred in the success case.
++     */
++    struct page_info **ppage;
++
++    /* XENMAPSPACE_gmfn_foreign */
++    domid_t foreign_domid;
++};
++
+ int xenmem_add_to_physmap_one(struct domain *d, unsigned int space,
+-                              union xen_add_to_physmap_batch_extra extra,
++                              union add_to_physmap_extra extra,
+                               unsigned long idx, gfn_t gfn);
+ 
+ int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp,
diff --git a/system/xen/xsa/xsa347-4.13-1.patch b/system/xen/xsa/xsa347-4.13-1.patch
new file mode 100644
index 0000000000..e9f31a151f
--- /dev/null
+++ b/system/xen/xsa/xsa347-4.13-1.patch
@@ -0,0 +1,149 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: AMD/IOMMU: convert amd_iommu_pte from struct to union
+
+This is to add a "raw" counterpart to the bitfield equivalent. Take the
+opportunity and
+ - convert fields to bool / unsigned int,
+ - drop the naming of the reserved field,
+ - shorten the names of the ignored ones.
+
+This is part of XSA-347.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Paul Durrant <paul@xen.org>
+
+--- a/xen/drivers/passthrough/amd/iommu_map.c
++++ b/xen/drivers/passthrough/amd/iommu_map.c
+@@ -38,7 +38,7 @@ static unsigned int pfn_to_pde_idx(unsig
+ static unsigned int clear_iommu_pte_present(unsigned long l1_mfn,
+                                             unsigned long dfn)
+ {
+-    struct amd_iommu_pte *table, *pte;
++    union amd_iommu_pte *table, *pte;
+     unsigned int flush_flags;
+ 
+     table = map_domain_page(_mfn(l1_mfn));
+@@ -52,7 +52,7 @@ static unsigned int clear_iommu_pte_pres
+     return flush_flags;
+ }
+ 
+-static unsigned int set_iommu_pde_present(struct amd_iommu_pte *pte,
++static unsigned int set_iommu_pde_present(union amd_iommu_pte *pte,
+                                           unsigned long next_mfn,
+                                           unsigned int next_level, bool iw,
+                                           bool ir)
+@@ -87,7 +87,7 @@ static unsigned int set_iommu_pte_presen
+                                           int pde_level,
+                                           bool iw, bool ir)
+ {
+-    struct amd_iommu_pte *table, *pde;
++    union amd_iommu_pte *table, *pde;
+     unsigned int flush_flags;
+ 
+     table = map_domain_page(_mfn(pt_mfn));
+@@ -178,7 +178,7 @@ void iommu_dte_set_guest_cr3(struct amd_
+ static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn,
+                               unsigned long pt_mfn[], bool map)
+ {
+-    struct amd_iommu_pte *pde, *next_table_vaddr;
++    union amd_iommu_pte *pde, *next_table_vaddr;
+     unsigned long  next_table_mfn;
+     unsigned int level;
+     struct page_info *table;
+@@ -458,7 +458,7 @@ int __init amd_iommu_quarantine_init(str
+     unsigned long end_gfn =
+         1ul << (DEFAULT_DOMAIN_ADDRESS_WIDTH - PAGE_SHIFT);
+     unsigned int level = amd_iommu_get_paging_mode(end_gfn);
+-    struct amd_iommu_pte *table;
++    union amd_iommu_pte *table;
+ 
+     if ( hd->arch.root_table )
+     {
+@@ -489,7 +489,7 @@ int __init amd_iommu_quarantine_init(str
+ 
+         for ( i = 0; i < PTE_PER_TABLE_SIZE; i++ )
+         {
+-            struct amd_iommu_pte *pde = &table[i];
++            union amd_iommu_pte *pde = &table[i];
+ 
+             /*
+              * PDEs are essentially a subset of PTEs, so this function
+--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
++++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
+@@ -390,7 +390,7 @@ static void deallocate_next_page_table(s
+ 
+ static void deallocate_page_table(struct page_info *pg)
+ {
+-    struct amd_iommu_pte *table_vaddr;
++    union amd_iommu_pte *table_vaddr;
+     unsigned int index, level = PFN_ORDER(pg);
+ 
+     PFN_ORDER(pg) = 0;
+@@ -405,7 +405,7 @@ static void deallocate_page_table(struct
+ 
+     for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ )
+     {
+-        struct amd_iommu_pte *pde = &table_vaddr[index];
++        union amd_iommu_pte *pde = &table_vaddr[index];
+ 
+         if ( pde->mfn && pde->next_level && pde->pr )
+         {
+@@ -557,7 +557,7 @@ static void amd_dump_p2m_table_level(str
+                                      paddr_t gpa, int indent)
+ {
+     paddr_t address;
+-    struct amd_iommu_pte *table_vaddr;
++    const union amd_iommu_pte *table_vaddr;
+     int index;
+ 
+     if ( level < 1 )
+@@ -573,7 +573,7 @@ static void amd_dump_p2m_table_level(str
+ 
+     for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ )
+     {
+-        struct amd_iommu_pte *pde = &table_vaddr[index];
++        const union amd_iommu_pte *pde = &table_vaddr[index];
+ 
+         if ( !(index % 2) )
+             process_pending_softirqs();
+--- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h
++++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h
+@@ -465,20 +465,23 @@ union amd_iommu_x2apic_control {
+ #define IOMMU_PAGE_TABLE_U32_PER_ENTRY	(IOMMU_PAGE_TABLE_ENTRY_SIZE / 4)
+ #define IOMMU_PAGE_TABLE_ALIGNMENT	4096
+ 
+-struct amd_iommu_pte {
+-    uint64_t pr:1;
+-    uint64_t ignored0:4;
+-    uint64_t a:1;
+-    uint64_t d:1;
+-    uint64_t ignored1:2;
+-    uint64_t next_level:3;
+-    uint64_t mfn:40;
+-    uint64_t reserved:7;
+-    uint64_t u:1;
+-    uint64_t fc:1;
+-    uint64_t ir:1;
+-    uint64_t iw:1;
+-    uint64_t ignored2:1;
++union amd_iommu_pte {
++    uint64_t raw;
++    struct {
++        bool pr:1;
++        unsigned int ign0:4;
++        bool a:1;
++        bool d:1;
++        unsigned int ign1:2;
++        unsigned int next_level:3;
++        uint64_t mfn:40;
++        unsigned int :7;
++        bool u:1;
++        bool fc:1;
++        bool ir:1;
++        bool iw:1;
++        unsigned int ign2:1;
++    };
+ };
+ 
+ /* Paging modes */
diff --git a/system/xen/xsa/xsa347-4.13-2.patch b/system/xen/xsa/xsa347-4.13-2.patch
new file mode 100644
index 0000000000..fbe7461636
--- /dev/null
+++ b/system/xen/xsa/xsa347-4.13-2.patch
@@ -0,0 +1,72 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: AMD/IOMMU: update live PTEs atomically
+
+Updating a live PTE bitfield by bitfield risks the compiler re-ordering
+the individual updates as well as splitting individual updates into
+multiple memory writes. Construct the new entry fully in a local
+variable, do the check to determine the flushing needs on the thus
+established new entry, and then write the new entry by a single insn.
+
+Similarly using memset() to clear a PTE is unsafe, as the order of
+writes the function does is, at least in principle, undefined.
+
+This is part of XSA-347.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Paul Durrant <paul@xen.org>
+
+--- a/xen/drivers/passthrough/amd/iommu_map.c
++++ b/xen/drivers/passthrough/amd/iommu_map.c
+@@ -45,7 +45,7 @@ static unsigned int clear_iommu_pte_pres
+     pte = &table[pfn_to_pde_idx(dfn, 1)];
+ 
+     flush_flags = pte->pr ? IOMMU_FLUSHF_modified : 0;
+-    memset(pte, 0, sizeof(*pte));
++    write_atomic(&pte->raw, 0);
+ 
+     unmap_domain_page(table);
+ 
+@@ -57,26 +57,30 @@ static unsigned int set_iommu_pde_presen
+                                           unsigned int next_level, bool iw,
+                                           bool ir)
+ {
++    union amd_iommu_pte new = {}, old;
+     unsigned int flush_flags = IOMMU_FLUSHF_added;
+ 
+-    if ( pte->pr &&
+-         (pte->mfn != next_mfn ||
+-          pte->iw != iw ||
+-          pte->ir != ir ||
+-          pte->next_level != next_level) )
+-            flush_flags |= IOMMU_FLUSHF_modified;
+-
+     /*
+      * FC bit should be enabled in PTE, this helps to solve potential
+      * issues with ATS devices
+      */
+-    pte->fc = !next_level;
++    new.fc = !next_level;
++
++    new.mfn = next_mfn;
++    new.iw = iw;
++    new.ir = ir;
++    new.next_level = next_level;
++    new.pr = true;
++
++    old.raw = read_atomic(&pte->raw);
++    old.ign0 = 0;
++    old.ign1 = 0;
++    old.ign2 = 0;
++
++    if ( old.pr && old.raw != new.raw )
++        flush_flags |= IOMMU_FLUSHF_modified;
+ 
+-    pte->mfn = next_mfn;
+-    pte->iw = iw;
+-    pte->ir = ir;
+-    pte->next_level = next_level;
+-    pte->pr = 1;
++    write_atomic(&pte->raw, new.raw);
+ 
+     return flush_flags;
+ }
diff --git a/system/xen/xsa/xsa347-4.13-3.patch b/system/xen/xsa/xsa347-4.13-3.patch
new file mode 100644
index 0000000000..90c8e66020
--- /dev/null
+++ b/system/xen/xsa/xsa347-4.13-3.patch
@@ -0,0 +1,59 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: AMD/IOMMU: ensure suitable ordering of DTE modifications
+
+DMA and interrupt translation should be enabled only after other
+applicable DTE fields have been written. Similarly when disabling
+translation or when moving a device between domains, translation should
+first be disabled, before other entry fields get modified. Note however
+that the "moving" aspect doesn't apply to the interrupt remapping side,
+as domain specifics are maintained in the IRTEs here, not the DTE. We
+also never disable interrupt remapping once it got enabled for a device
+(the respective argument passed is always the immutable iommu_intremap).
+
+This is part of XSA-347.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Paul Durrant <paul@xen.org>
+
+--- a/xen/drivers/passthrough/amd/iommu_map.c
++++ b/xen/drivers/passthrough/amd/iommu_map.c
+@@ -107,11 +107,18 @@ void amd_iommu_set_root_page_table(struc
+                                    uint64_t root_ptr, uint16_t domain_id,
+                                    uint8_t paging_mode, bool valid)
+ {
++    if ( valid || dte->v )
++    {
++        dte->tv = false;
++        dte->v = true;
++        smp_wmb();
++    }
+     dte->domain_id = domain_id;
+     dte->pt_root = paddr_to_pfn(root_ptr);
+     dte->iw = true;
+     dte->ir = true;
+     dte->paging_mode = paging_mode;
++    smp_wmb();
+     dte->tv = true;
+     dte->v = valid;
+ }
+@@ -134,6 +141,7 @@ void amd_iommu_set_intremap_table(
+     }
+ 
+     dte->ig = false; /* unmapped interrupts result in i/o page faults */
++    smp_wmb();
+     dte->iv = valid;
+ }
+ 
+--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
++++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
+@@ -120,7 +120,10 @@ static void amd_iommu_setup_domain_devic
+         /* Undo what amd_iommu_disable_domain_device() may have done. */
+         ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id];
+         if ( dte->it_root )
++        {
+             dte->int_ctl = IOMMU_DEV_TABLE_INT_CONTROL_TRANSLATED;
++            smp_wmb();
++        }
+         dte->iv = iommu_intremap;
+         dte->ex = ivrs_dev->dte_allow_exclusion;
+         dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT);
diff --git a/system/xidel/README b/system/xidel/README
new file mode 100644
index 0000000000..34602c26d4
--- /dev/null
+++ b/system/xidel/README
@@ -0,0 +1,28 @@
+xidel (tool to extract data from HTML/XML/JSON files or pages)
+
+Xidel is a command line tool to query data from HTML/XML web pages,
+JSON-APIs and local files. It implements interpreters for XPath 2,
+XPath 3, XQuery 1, XQuery 3, JSONiq, CSS selectors and custom pattern
+matching.
+
+XPath and CSS selectors are the most efficient way to select certain
+elements from XML/HTML documents. JSONiq (with custom extensions)
+is an easy way to select data from JSON. XQuery is a Turing-complete
+superset of XPath and allows arbitrary data transformations and the
+creation of new documents.
+
+Pattern matching is for XML/HTML documents what regular expressions
+are for plaintext, i.e. pattern matching behaves like a regular
+expression over the space of tags, instead over the space of
+characters.
+
+Xidel implements a kind of internal pipes to pipe HTTP requests from
+one query to the next, so there is no need to distinguish selecting
+links and downloading the data referenced by them. Therefore arbitrary
+complex queries going over arbitrary many pages can be executed with a
+single call of Xidel.
+
+Xidel is a powerful and complex tool, with a steep learning
+curve. For examples, see the man page xidel(1), and also
+/usr/doc/xidel-$VERSION/examples/. The full documentation is available
+via "xidel --usage | less".
diff --git a/system/xidel/slack-desc b/system/xidel/slack-desc
new file mode 100644
index 0000000000..0b969a8317
--- /dev/null
+++ b/system/xidel/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xidel: xidel (tool to extract data from HTML/XML/JSON files or pages)
+xidel:
+xidel: Xidel is a command line tool to query data from HTML/XML web pages,
+xidel: JSON-APIs and local files. It implements interpreters for XPath 2,
+xidel: XPath 3, XQuery 1, XQuery 3, JSONiq, CSS selectors and custom pattern
+xidel: matching.
+xidel:
+xidel:
+xidel:
+xidel:
+xidel:
diff --git a/system/xidel/xidel.SlackBuild b/system/xidel/xidel.SlackBuild
new file mode 100644
index 0000000000..a13c4c6979
--- /dev/null
+++ b/system/xidel/xidel.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Slackware build script for xidel
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=xidel
+VERSION=${VERSION:-0.9.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# No CFLAGS (Pascal, not C), no need for LIBDIRSUFFIX. Upstream
+# uses fpc's -O3 option, for whatever that's worth.
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION-src
+tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz
+cd $PRGNAM-$VERSION-src
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Fairly weird build process, but simple enough. -s means strip. Tests
+# require internet access, so disabled by default.
+[ "${TESTS:-no}" = "yes" ] && T="-t"
+
+cd programs/internet/$PRGNAM
+./build.sh -s $T
+mkdir -p $PKG/usr/bin
+cp -a $PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/man/man1
+gzip -9c < meta/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* COPYING changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xidel/xidel.info b/system/xidel/xidel.info
new file mode 100644
index 0000000000..b07650eb41
--- /dev/null
+++ b/system/xidel/xidel.info
@@ -0,0 +1,10 @@
+PRGNAM="xidel"
+VERSION="0.9.8"
+HOMEPAGE="http://videlibri.sourceforge.net/xidel.html"
+DOWNLOAD="https://github.com/benibela/xidel/releases/download/Xidel_0.9.8/xidel-0.9.8.src.tar.gz"
+MD5SUM="bd82db9878784d2621b37baca914b777"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fpc"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/yash/yash.SlackBuild b/system/yash/yash.SlackBuild
index 5f41204fee..5a93ecb8d4 100644
--- a/system/yash/yash.SlackBuild
+++ b/system/yash/yash.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yash
-VERSION=${VERSION:-2.50}
+VERSION=${VERSION:-2.51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,7 +77,8 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man
 
 make
-make test
+# make test is problematic on 14.2
+#make test
 make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/bin
diff --git a/system/yash/yash.info b/system/yash/yash.info
index ddc9630359..1267972a88 100644
--- a/system/yash/yash.info
+++ b/system/yash/yash.info
@@ -1,8 +1,8 @@
 PRGNAM="yash"
-VERSION="2.50"
+VERSION="2.51"
 HOMEPAGE="https://yash.osdn.jp/index.html.en"
-DOWNLOAD="https://osdn.net/dl/yash/yash-2.50.tar.xz"
-MD5SUM="f9db1699252b107764fec07f501ddb79"
+DOWNLOAD="https://osdn.net/dl/yash/yash-2.51.tar.xz"
+MD5SUM="91d0c0fa548c9c9a081893f515b4f049"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild
index 50d36fed19..48027407a7 100644
--- a/system/zfs-on-linux/zfs-on-linux.SlackBuild
+++ b/system/zfs-on-linux/zfs-on-linux.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for zfs-on-linux
 
+# Copyright 2021 Markus Reichelt <slackbuilds@mareichelt.de>, Germany
 # Copyright 2017 Marcin Szychowski <szycha@gmail.com>, Poland
 # Copyright 2016 Kevin Paulus <goarilla@gmail.com>, Belgium
 # Copyright 2013-2014 Petr Hejl - Czech Republic
@@ -28,8 +29,8 @@
 
 PRGNAM=zfs-on-linux
 SRCNAM=zfs
-VERSION=${VERSION:-0.8.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 KERN=${KERN:-"$(uname -r)"}
@@ -100,6 +101,8 @@ env -u ARCH make install DESTDIR=$PKG
 
 # no such thing here
 rm -fr $PKG/usr/lib/dracut
+# no use to keep header files; the Module.symvers file would need the correct path anyway.
+rm -r $PKG/usr/src
 
 mkdir -p $PKG/etc/rc.d/init.d
 rm -fr $PKG/etc/init.d
diff --git a/system/zfs-on-linux/zfs-on-linux.info b/system/zfs-on-linux/zfs-on-linux.info
index 5cf6cbf2d1..ac5850c145 100644
--- a/system/zfs-on-linux/zfs-on-linux.info
+++ b/system/zfs-on-linux/zfs-on-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="zfs-on-linux"
-VERSION="0.8.5"
+VERSION="0.8.6"
 HOMEPAGE="https://zfsonlinux.org"
-DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz"
-MD5SUM="905cc25c252999bd2049165eea90c975"
+DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz"
+MD5SUM="e3ca8d66af6e2d7a214e92bf6c733082"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marcin Szychowski"
-EMAIL="szycha@gmail.com"
+MAINTAINER="Markus Reichelt"
+EMAIL="slackbuilds@mareichelt.de"